X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fsavedir.c;h=3e8762ad2fad8d130bbb40b685c499751f920042;hb=6add58a9a1e2531ac96079cc063201ef3b3c2b98;hp=5a9c339d8cf4ff3a6ad2e7257d7c8ebc95b0e5bb;hpb=67f394c1d2be473276ccd5e071f986511a13e212;p=gnulib.git
diff --git a/lib/savedir.c b/lib/savedir.c
index 5a9c339d8..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 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,124 +14,132 @@
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
-#if HAVE_UNISTD_H
-# include
-#endif
+#include
-#if HAVE_DIRENT_H
-# include
-# define NAMLEN(dirent) strlen((dirent)->d_name)
-#else
-# define dirent direct
-# define NAMLEN(dirent) (dirent)->d_namlen
-# 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
-#else
-char *malloc ();
-char *realloc ();
-#endif
-#ifndef NULL
-# define NULL 0
-#endif
+#include "xalloc.h"
-#ifndef stpcpy
-char *stpcpy ();
+#ifndef NAME_SIZE_DEFAULT
+# define NAME_SIZE_DEFAULT 512
#endif
-#include "savedir.h"
-
-/* Return a freshly allocated string containing the filenames
- in directory DIR, separated by '\0' characters;
+/* 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.
- NAME_SIZE is the number of bytes to initially allocate
- for the string; it will be enlarged as needed.
- Return NULL if DIR cannot be opened or if out of memory. */
+ Return NULL (setting errno) if DIRP cannot be read.
+ If DIRP is NULL, return NULL without affecting errno. */
char *
-savedir (dir, name_size)
- const char *dir;
- unsigned int name_size;
+streamsavedir (DIR *dirp)
{
- DIR *dirp;
- struct dirent *dp;
char *name_space;
- char *namep;
+ size_t allocated = NAME_SIZE_DEFAULT;
+ size_t used = 0;
+ int save_errno;
- dirp = opendir (dir);
if (dirp == NULL)
return NULL;
- name_space = (char *) malloc (name_size);
- if (name_space == NULL)
+ name_space = xmalloc (allocated);
+
+ for (;;)
{
- closedir (dirp);
- return NULL;
+ 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 file systems. */
+ entry = dp->d_name;
+ if (entry[entry[0] != '.' ? 0 : entry[1] != '.' ? 1 : 2] != '\0')
+ {
+ 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;
+ }
}
- namep = name_space;
-
- while ((dp = readdir (dirp)) != NULL)
+ name_space[used] = '\0';
+ save_errno = errno;
+ if (save_errno != 0)
{
- /* Skip "." and ".." (some NFS filesystems' directories lack them). */
- if (dp->d_name[0] != '.'
- || (dp->d_name[1] != '\0'
- && (dp->d_name[1] != '.' || dp->d_name[2] != '\0')))
- {
- unsigned size_needed = (namep - name_space) + NAMLEN (dp) + 2;
-
- if (size_needed > name_size)
- {
- char *new_name_space;
-
- while (size_needed > name_size)
- name_size += 1024;
-
- new_name_space = realloc (name_space, name_size);
- if (new_name_space == NULL)
- {
- closedir (dirp);
- return NULL;
- }
- namep += new_name_space - name_space;
- name_space = new_name_space;
- }
- namep = stpcpy (namep, dp->d_name) + 1;
- }
+ free (name_space);
+ errno = save_errno;
+ return NULL;
}
- *namep = '\0';
- if (CLOSEDIR (dirp))
+ 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));
+}