From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 28 Oct 2005 23:02:35 +0000 (+0000)
Subject: * savedir.c (savedir): Don't assume that xrealloc etc. leave
X-Git-Tag: cvs-readonly~2749
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=c01204ff7654227fb4ae66e1b8fae5509fb24271;p=gnulib.git

* savedir.c (savedir): Don't assume that xrealloc etc. leave
errno alone.  Problem reported by Frederic Jolliton.
---

diff --git a/lib/ChangeLog b/lib/ChangeLog
index d6d8c9b70..9ad3c3886 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* savedir.c (savedir): Don't assume that xrealloc etc. leave
+	errno alone.  Problem reported by Frederic Jolliton.
+
 2005-10-28  Simon Josefsson  <jas@extundo.com>
 
 	* inet_ntop.h, inet_ntop.c: Make it work under mingw32: Add
@@ -97,7 +102,7 @@
 
 2005-10-19  Simon Josefsson  <jas@extundo.com>
 
-	* gc.h, gc-gnulib.c, gc-libgcrypt.c: Support MD4. 
+	* gc.h, gc-gnulib.c, gc-libgcrypt.c: Support MD4.
 
 2005-10-18  Simon Josefsson  <jas@extundo.com>
 
diff --git a/lib/savedir.c b/lib/savedir.c
index a2cf2f678..86930eb56 100644
--- a/lib/savedir.c
+++ b/lib/savedir.c
@@ -70,7 +70,6 @@ char *
 savedir (const char *dir)
 {
   DIR *dirp;
-  struct dirent *dp;
   char *name_space;
   size_t allocated = NAME_SIZE_DEFAULT;
   size_t used = 0;
@@ -82,12 +81,19 @@ savedir (const char *dir)
 
   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 file systems.  */
-      char const *entry = dp->d_name;
+      entry = dp->d_name;
       if (entry[entry[0] != '.' ? 0 : entry[1] != '.' ? 1 : 2] != '\0')
 	{
 	  size_t entry_size = strlen (entry) + 1;