changeset 6954:f9276a8d45a7

* glob.c: s/NAMLEN/_D_EXACT_NAMLEN/.
author Derek R. Price <derek@ximbiot.com>
date Tue, 11 Jul 2006 13:18:42 +0000
parents a09f233b4efb
children 7715890c929a
files lib/ChangeLog lib/glob.c
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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:
--- 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 @@
 			  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)