From: Derek R. Price <derek@ximbiot.com>
Date: Tue, 11 Jul 2006 13:18:42 +0000 (+0000)
Subject: * glob.c: s/NAMLEN/_D_EXACT_NAMLEN/.
X-Git-Tag: cvs-readonly~2232
X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=cdae4b6387c8133babaa886675bf92e046be6608;p=gnulib.git

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

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 790a291b8..977f4be08 100644
--- 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 a2b0d89f2..df0c5e2ab 100644
--- 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)