diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2006-07-11 17:19:48 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2006-07-11 17:19:48 +0000 |
| commit | 2b6236d156b394227e41b0d664cf600b69db9403 (patch) | |
| tree | 08467d898c62dfb113adbc671fdb9de956159792 /lib/backupfile.c | |
| parent | 888ee9b8d99f7ed10f04b387eaf6e1477369c0fa (diff) | |
| download | coreutils-2b6236d156b394227e41b0d664cf600b69db9403.tar.xz | |
Sync from gnulib.
Diffstat (limited to 'lib/backupfile.c')
| -rw-r--r-- | lib/backupfile.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/lib/backupfile.c b/lib/backupfile.c index 13c471583..c24325d8f 100644 --- a/lib/backupfile.c +++ b/lib/backupfile.c @@ -41,15 +41,10 @@ #include <unistd.h> -#if HAVE_DIRENT_H -# include <dirent.h> -# define NLENGTH(direct) strlen ((direct)->d_name) -#else -# define dirent direct -# define NLENGTH(direct) ((size_t) (direct)->d_namlen) -# include <ndir.h> +#include <dirent.h> +#ifndef _D_EXACT_NAMLEN +# define _D_EXACT_NAMLEN(dp) strlen ((dp)->d_name) #endif - #if D_INO_IN_DIRENT # define REAL_DIR_ENTRY(dp) ((dp)->d_ino != 0) #else @@ -211,7 +206,7 @@ numbered_backup (char **buffer, size_t buffer_size, size_t filelen) size_t versionlen; size_t new_buflen; - if (! REAL_DIR_ENTRY (dp) || NLENGTH (dp) < baselen + 4) + if (! REAL_DIR_ENTRY (dp) || _D_EXACT_NAMLEN (dp) < baselen + 4) continue; if (memcmp (buf + base_offset, dp->d_name, baselen + 2) != 0) |