* glob.c: s/NAMLEN/_D_EXACT_NAMLEN/.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 790a291b8538d6868ae7fe0d2ecdf3c5950598d4..977f4be08ab7582f2b94b1770f11ce60b9efc990 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2006-07-11  Derek R. Price  <derek@ximbiot.com>
+
+       * glob.c: s/NAMLEN/_D_EXACT_NAMLEN/.
+
 2006-07-10  Derek R. Price  <derek@ximbiot.com>
 
        * backupfile.c, dirfd.h, fts.c, getcwd.c, glob.c, glob_.h:

diff --git a/lib/glob.c b/lib/glob.c
index a2b0d89f2d1c9b47fdc1cf955409f41cae60af2f..df0c5e2abbf3933b9b94c9af4ade563611b3382f 100644 (file)
--- a/lib/glob.c
+++ b/lib/glob.c
@@ -93,7 +93,7 @@
 # endif
 
 # define CONVERT_DIRENT_DIRENT64(d64, d32) \
-  memcpy ((d64)->d_name, (d32)->d_name, NAMLEN (d32) + 1);                   \
+  memcpy ((d64)->d_name, (d32)->d_name, _D_EXACT_NAMLEN (d32) + 1);          \
   CONVERT_D_INO (d64, d32)                                                   \
   CONVERT_D_TYPE (d64, d32)
 #endif
@@ -1176,7 +1176,7 @@ glob_in_dir (const char *pattern, const char *directory, int flags,
                          struct globlink *new =
                            __alloca (sizeof (struct globlink));
                          char *p;
-                         len = NAMLEN (d);
+                         len = _D_EXACT_NAMLEN (d);
                          new->name =
                            malloc (len + 1 + ((flags & GLOB_MARK) && isdir));
                          if (new->name == NULL)