diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2005-10-28 23:02:35 +0000 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2005-10-28 23:02:35 +0000 |
commit | c01204ff7654227fb4ae66e1b8fae5509fb24271 (patch) | |
tree | 5292acec8965fb50d1066ac22522355108c31e13 /lib/savedir.c | |
parent | 253dda65ba289f58d77b01c8acaf8a8298669e8e (diff) | |
download | gnulib-c01204ff7654227fb4ae66e1b8fae5509fb24271.tar.gz |
* savedir.c (savedir): Don't assume that xrealloc etc. leave
errno alone. Problem reported by Frederic Jolliton.
Diffstat (limited to 'lib/savedir.c')
-rw-r--r-- | lib/savedir.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/lib/savedir.c b/lib/savedir.c index a2cf2f6787..86930eb569 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; |