* modules/savedir (Depends-on): Add openat.

* lib/savedir.h (fdsavedir): New decl.
* lib/savedir.c (fdsavedir, savedirstream): New functions; the latter
contains most of the former guts of savedir.
(savedir): Use savedirstream.
Include "openat.h".

diff --git a/ChangeLog b/ChangeLog
index 0a864f95f5b371162cf4af1933ffcd331c0e86c3..e8294a001d3715924b9266f20704ae082b8b13eb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-29  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * modules/savedir (Depends-on): Add openat.
+
 2005-11-25  Paul Eggert  <eggert@cs.ucla.edu>
 
        * modules/obstack (Files): Add m4/ulonglong.m4.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 5c8eb7a2941d268b7cf72f9ae5426e779cfb23d0..94df670f3b8f1167ce4ef3534b3e01907e5122e7 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,11 @@
+2005-11-29  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * savedir.h (fdsavedir): New decl.
+       * savedir.c (fdsavedir, savedirstream): New functions; the latter
+       contains most of the former guts of savedir.
+       (savedir): Use savedirstream.
+       Include "openat.h".
+
 2005-11-15  Paul Eggert  <eggert@cs.ucla.edu>
 
        * xstrtod.c: Don't bother with #pragma STDC FENV_ACCESS ON, as

diff --git a/lib/savedir.c b/lib/savedir.c
index 86930eb5698d891bd041166feb334226b3dad65b..b08f32b7916de07b3891e16d5fbedf0fc85c0a29 100644 (file)
--- a/lib/savedir.c
+++ b/lib/savedir.c
@@ -55,27 +55,27 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "openat.h"
 #include "xalloc.h"
 
-/* Return a freshly allocated string containing the file names
-   in directory DIR, separated by '\0' characters;
-   the end is marked by two '\0' characters in a row.
-   Return NULL (setting errno) if DIR cannot be opened, read, or closed.  */
-
 #ifndef NAME_SIZE_DEFAULT
 # define NAME_SIZE_DEFAULT 512
 #endif
 
-char *
-savedir (const char *dir)
+/* Return a freshly allocated string containing the file names
+   in directory DIRP, separated by '\0' characters;
+   the end is marked by two '\0' characters in a row.
+   Return NULL (setting errno) if DIRP cannot be read or closed.
+   If DIRP is NULL, return NULL without affecting errno.  */
+
+static char *
+savedirstream (DIR *dirp)
 {
-  DIR *dirp;
   char *name_space;
   size_t allocated = NAME_SIZE_DEFAULT;
   size_t used = 0;
   int save_errno;
 
-  dirp = opendir (dir);
   if (dirp == NULL)
     return NULL;
 
@@ -127,3 +127,25 @@ savedir (const char *dir)
     }
   return name_space;
 }
+
+/* Return a freshly allocated string containing the file names
+   in directory DIR, separated by '\0' characters;
+   the end is marked by two '\0' characters in a row.
+   Return NULL (setting errno) if DIR cannot be opened, read, or closed.  */
+
+char *
+savedir (char const *dir)
+{
+  return savedirstream (opendir (dir));
+}
+
+/* Return a freshly allocated string containing the file names
+   in directory FD, separated by '\0' characters;
+   the end is marked by two '\0' characters in a row.
+   Return NULL (setting errno) if FD cannot be read or closed.  */
+
+char *
+fdsavedir (int fd)
+{
+  return savedirstream (fdopendir (fd));
+}

diff --git a/lib/savedir.h b/lib/savedir.h
index 4828b1becbcaeacbbdb1f5d418906218778b74d0..7809d2392ef061cb0e892b6300ede464109c76c0 100644 (file)
--- a/lib/savedir.h
+++ b/lib/savedir.h
@@ -1,6 +1,6 @@
 /* Save the list of files in a directory in a string.
 
-   Copyright 1997, 1999, 2001, 2003 Free Software Foundation, Inc.
+   Copyright 1997, 1999, 2001, 2003, 2005 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@
 #if !defined SAVEDIR_H_
 # define SAVEDIR_H_
 
-char *savedir (const char *dir);
+char *savedir (char const *dir);
+char *fdsavedir (int fd);
 
 #endif

diff --git a/modules/savedir b/modules/savedir
index fe9a027fd113841e545a949dbdd7414df472e55c..e781af76b26806f9af3e4503ba048b11792d12f1 100644 (file)
--- a/modules/savedir
+++ b/modules/savedir
@@ -7,6 +7,7 @@ lib/savedir.c
 m4/savedir.m4
 
 Depends-on:
+openat
 xalloc
 
 configure.ac: