diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2006-07-11 06:02:51 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2006-07-11 06:02:51 +0000 |
| commit | efc5123c9d851509aea5dd30f47c91e7e5a5c8dd (patch) | |
| tree | 4b87218de6bd386363db0d8bd4168a292b7243cc /lib/savedir.c | |
| parent | 1d3274d8b057713a741a872e35913a7aed34274d (diff) | |
| download | gnulib-efc5123c9d851509aea5dd30f47c91e7e5a5c8dd.tar.gz | |
* backupfile.c, dirfd.h, fts.c, getcwd.c, glob.c, glob_.h:
Ignore the obsolescent !HAVE_DIRENT_H case. Consolidate NAMLEN
macros into the GNU _D_EXACT_NAMLEN.
* savedir.c: Likewise.
(savedirstream): Use _D_EXACT_NAMLEN in preference to strlen.
* backupfile.m4, d-ino.m4, d-type.m4, dirfd.m4, fts.m4, getcwd.m4:
* savedir.m4:
Ignore the obsolescent !HAVE_DIRENT_H case. Consolidate NAMLEN
macros into the GNU _D_EXACT_NAMLEN.
Diffstat (limited to 'lib/savedir.c')
| -rw-r--r-- | lib/savedir.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/savedir.c b/lib/savedir.c index c68547054f..4b0702480d 100644 --- a/lib/savedir.c +++ b/lib/savedir.c @@ -29,11 +29,9 @@ #include <errno.h> -#if HAVE_DIRENT_H -# include <dirent.h> -#else -# define dirent direct -# include <ndir.h> +#include <dirent.h> +#ifndef _D_EXACT_NAMLEN +# define _D_EXACT_NAMLEN(dp) strlen ((dp)->d_name) #endif #include <stddef.h> @@ -81,7 +79,7 @@ savedirstream (DIR *dirp) entry = dp->d_name; if (entry[entry[0] != '.' ? 0 : entry[1] != '.' ? 1 : 2] != '\0') { - size_t entry_size = strlen (entry) + 1; + size_t entry_size = _D_EXACT_NAMLEN (dp) + 1; if (used + entry_size < used) xalloc_die (); if (allocated <= used + entry_size) |