diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | lib/savedir.c | 7 |
2 files changed, 7 insertions, 4 deletions
@@ -1,3 +1,7 @@ +2009-11-26 Paolo Bonzini <bonzini@gnu.org> + + * lib/savedir.c: Do not use NAMLEN. + 2009-11-21 Paolo Bonzini <bonzini@gnu.org> * configure.ac: Remove AC_SEP. diff --git a/lib/savedir.c b/lib/savedir.c index e31c843a..9c46b66e 100644 --- a/lib/savedir.c +++ b/lib/savedir.c @@ -30,10 +30,8 @@ #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 @@ -134,7 +132,8 @@ savedir (const char *dir, off_t name_size, struct exclude *included_patterns, || (dp->d_name[1] != '\0' && (dp->d_name[1] != '.' || dp->d_name[2] != '\0'))) { - off_t size_needed = (namep - name_space) + NAMLEN (dp) + 2; + size_t namlen = strlen (dp->d_name); + size_t size_needed = (namep - name_space) + namlen + 2; if ((included_patterns || excluded_patterns) && !isdir1 (dir, dp->d_name)) @@ -172,7 +171,7 @@ savedir (const char *dir, off_t name_size, struct exclude *included_patterns, name_space = new_name_space; } strcpy (namep, dp->d_name); - namep += NAMLEN (dp) + 1; + namep += namlen + 1; } } *namep = '\0'; |