X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fsavedir.c;h=4eeda01939fad542ff1d58687b18475a040c175e;hb=37b09d7dc2c5956fbd70c211ed164a9ee1f7e349;hp=9a5736451ce8955149350e250fe263378a4671ed;hpb=180239d459deeb88e364969a142ad19403e7b1b1;p=gnulib.git

diff --git a/lib/savedir.c b/lib/savedir.c
index 9a5736451..4eeda0193 100644
--- a/lib/savedir.c
+++ b/lib/savedir.c
@@ -1,5 +1,7 @@
 /* savedir.c -- save the list of files in a directory in a string
-   Copyright (C) 1990 Free Software Foundation, Inc.
+
+   Copyright 1990, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 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
@@ -12,27 +14,25 @@
    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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu>. */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
+#if HAVE_CONFIG_H
+# include <config.h>
 #endif
 
+#include "savedir.h"
+
 #include <sys/types.h>
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
+#include <errno.h>
 
 #if HAVE_DIRENT_H
 # include <dirent.h>
-# define NAMLEN(dirent) strlen((dirent)->d_name)
 #else
 # define dirent direct
-# define NAMLEN(dirent) (dirent)->d_namlen
 # if HAVE_SYS_NDIR_H
 #  include <sys/ndir.h>
 # endif
@@ -46,85 +46,77 @@
 
 #ifdef CLOSEDIR_VOID
 /* Fake a return value. */
-#define CLOSEDIR(d) (closedir (d), 0)
+# define CLOSEDIR(d) (closedir (d), 0)
 #else
-#define CLOSEDIR(d) closedir (d)
+# define CLOSEDIR(d) closedir (d)
 #endif
 
-#ifdef STDC_HEADERS
+#include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
-#else
-char *malloc ();
-char *realloc ();
-#ifndef NULL
-#define NULL 0
-#endif
-#endif
 
-char *stpcpy ();
+#include "xalloc.h"
 
-/* Return a freshly allocated string containing the filenames
+/* 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.
-   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 DIR cannot be opened, read, or closed.  */
+
+#ifndef NAME_SIZE_DEFAULT
+# define NAME_SIZE_DEFAULT 512
+#endif
 
 char *
-savedir (dir, name_size)
-     char *dir;
-     unsigned name_size;
+savedir (const char *dir)
 {
   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)
-    {
-      closedir (dirp);
-      return NULL;
-    }
-  namep = name_space;
+  name_space = xmalloc (allocated);
 
+  errno = 0;
   while ((dp = readdir (dirp)) != NULL)
     {
-      /* 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')))
+      /* Skip "", ".", and "..".  "" is returned by at least one buggy
+         implementation: Solaris 2.4 readdir on NFS file systems.  */
+      char const *entry = dp->d_name;
+      if (entry[entry[0] != '.' ? 0 : entry[1] != '.' ? 1 : 2] != '\0')
 	{
-	  unsigned size_needed = (namep - name_space) + NAMLEN (dp) + 2;
-
-	  if (size_needed > name_size)
+	  size_t entry_size = strlen (entry) + 1;
+	  if (used + entry_size < used)
+	    xalloc_die ();
+	  if (allocated <= used + entry_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)
+	      do
 		{
-		  closedir (dirp);
-		  return NULL;
+		  if (2 * allocated < allocated)
+		    xalloc_die ();
+		  allocated *= 2;
 		}
-	      namep += new_name_space - name_space;
-	      name_space = new_name_space;
+	      while (allocated <= used + entry_size);
+
+	      name_space = xrealloc (name_space, allocated);
 	    }
-	  namep = stpcpy (namep, dp->d_name) + 1;
+	  memcpy (name_space + used, entry, entry_size);
+	  used += entry_size;
 	}
     }
-  *namep = '\0';
-  if (CLOSEDIR (dirp))
+  name_space[used] = '\0';
+  save_errno = errno;
+  if (CLOSEDIR (dirp) != 0)
+    save_errno = errno;
+  if (save_errno != 0)
     {
       free (name_space);
+      errno = save_errno;
       return NULL;
     }
   return name_space;