X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fsavedir.c;h=3e8762ad2fad8d130bbb40b685c499751f920042;hb=372ef2a0e94ec6ee85b5fc4bab763154ec11420d;hp=5b7a6dd7f6787665d08e8f1c94dd19c14443578d;hpb=49c86fdb3d58fc15ae14f804e0f69b681ff4fb70;p=gnulib.git
diff --git a/lib/savedir.c b/lib/savedir.c
index 5b7a6dd7f..3e8762ad2 100644
--- a/lib/savedir.c
+++ b/lib/savedir.c
@@ -1,10 +1,12 @@
/* savedir.c -- save the list of files in a directory in a string
- Copyright (C) 1990, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ Copyright (C) 1990, 1997-2001, 2003-2006, 2009-2011 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
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,121 +14,88 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ along with this program. If not, see . */
/* Written by David MacKenzie . */
-#if HAVE_CONFIG_H
-# include
-#endif
+#include
+
+#include "savedir.h"
#include
#include
-#ifndef errno
-extern int errno;
-#endif
-#if HAVE_DIRENT_H
-# include
-#else
-# define dirent direct
-# if HAVE_SYS_NDIR_H
-# include
-# endif
-# if HAVE_SYS_DIR_H
-# include
-# endif
-# if HAVE_NDIR_H
-# include
-# endif
+#include "dirent--.h"
+#ifndef _D_EXACT_NAMLEN
+# define _D_EXACT_NAMLEN(dp) strlen ((dp)->d_name)
#endif
-#ifdef CLOSEDIR_VOID
-/* Fake a return value. */
-# define CLOSEDIR(d) (closedir (d), 0)
-#else
-# define CLOSEDIR(d) closedir (d)
-#endif
+#include
+#include
+#include
-#ifdef STDC_HEADERS
-# include
-# include
-#endif
-#ifndef NULL
-# define NULL 0
-#endif
-
-#include "savedir.h"
#include "xalloc.h"
-/* Return a freshly allocated string containing the filenames
- in directory DIR, separated by '\0' characters;
- the end is marked by two '\0' characters in a row.
- NAME_SIZE is the number of bytes to initially allocate
- for the string; it will be enlarged as needed.
- Use NAME_SIZE == -1 if you do not know the size.
- Return NULL (setting errno) if DIR cannot be opened, read, or closed. */
-
#ifndef NAME_SIZE_DEFAULT
# define NAME_SIZE_DEFAULT 512
#endif
+/* 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.
+ If DIRP is NULL, return NULL without affecting errno. */
+
char *
-savedir (const char *dir, off_t name_size)
+streamsavedir (DIR *dirp)
{
- DIR *dirp;
- struct dirent *dp;
char *name_space;
- size_t allocated = name_size; /* Overflow is checked indirectly below. */
+ size_t allocated = NAME_SIZE_DEFAULT;
size_t used = 0;
int save_errno;
- dirp = opendir (dir);
if (dirp == NULL)
return NULL;
- /* Use the default if the size is not known. Be sure "allocated"
- is at least `1' so there's room for the final NUL byte.
- Do not simply test name_size <= 0, because the initialization
- of "allocated" might have overflowed. */
- if (name_size < 0 || allocated == 0)
- allocated = NAME_SIZE_DEFAULT;
-
name_space = xmalloc (allocated);
- errno = 0;
- while ((dp = readdir (dirp)) != NULL)
+ for (;;)
{
+ struct dirent const *dp;
+ char const *entry;
+
+ errno = 0;
+ dp = readdir (dirp);
+ if (! dp)
+ break;
+
/* Skip "", ".", and "..". "" is returned by at least one buggy
- implementation: Solaris 2.4 readdir on NFS filesystems. */
- char const *entry = dp->d_name;
+ implementation: Solaris 2.4 readdir on NFS file systems. */
+ entry = dp->d_name;
if (entry[entry[0] != '.' ? 0 : entry[1] != '.' ? 1 : 2] != '\0')
- {
- size_t entry_size = strlen (entry) + 1;
- if (used + entry_size < used)
- xalloc_die ();
- if (allocated <= used + entry_size)
- {
- do
- {
- if (2 * allocated < allocated)
- xalloc_die ();
- allocated *= 2;
- }
- while (allocated <= used + entry_size);
-
- name_space = xrealloc (name_space, allocated);
- }
- memcpy (name_space + used, entry, entry_size);
- used += entry_size;
- }
+ {
+ size_t entry_size = _D_EXACT_NAMLEN (dp) + 1;
+ if (used + entry_size < used)
+ xalloc_die ();
+ if (allocated <= used + entry_size)
+ {
+ do
+ {
+ if (2 * allocated < allocated)
+ xalloc_die ();
+ allocated *= 2;
+ }
+ while (allocated <= used + entry_size);
+
+ name_space = xrealloc (name_space, allocated);
+ }
+ memcpy (name_space + used, entry, entry_size);
+ used += entry_size;
+ }
}
name_space[used] = '\0';
save_errno = errno;
- if (CLOSEDIR (dirp) != 0)
- save_errno = errno;
if (save_errno != 0)
{
free (name_space);
@@ -135,3 +104,42 @@ savedir (const char *dir, off_t name_size)
}
return name_space;
}
+
+/* Like savedirstreamp (DIRP), except also close DIRP. */
+
+static char *
+savedirstream (DIR *dirp)
+{
+ char *name_space = streamsavedir (dirp);
+ if (dirp && closedir (dirp) != 0)
+ {
+ int save_errno = errno;
+ free (name_space);
+ errno = save_errno;
+ return NULL;
+ }
+ 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. */
+
+/* deprecated */
+char *
+fdsavedir (int fd)
+{
+ return savedirstream (fdopendir (fd));
+}