Changeset 2113

Timestamp:

Jun 29, 2005, 6:06:03 AM (20 years ago)

Author:

bird

Message:

o On glibc lot's of limits.h stuff is included from direct.h because of

need for NAME_MAX, let's do something similar.

o Corrected MAXNAMLEN / d_name field length.

Location:

trunk/src/emx

Files:

• ChangeLog.LIBC (modified) (1 diff, 1 prop)
• include/sys/dirent.h (modified) (3 diffs, 1 prop)

trunk/src/emx/ChangeLog.LIBC

@@ -10 +10 @@
         o Added memrawchr and strchrnul from glibc, enabling us to shop .S
           files from glibc at the same time.
+        o On glibc lot's of limits.h stuff is included from direct.h because of
+          need for NAME_MAX, let's do something similar.
+        o Corrected MAXNAMLEN / d_name field length.
 
 2005-06-27: knut st. osmundsen <bird-gccos2-spam@anduin.net>

trunk/src/emx/include/sys/dirent.h

@@ -38 +38 @@
  * FreeBSD 5.1
  * @changed bird: Merged in all the EMX stuff.
+ * @changed bird: glibc hack.
+ * @changed bird: MAXNAMLEN vs NAME_MAX.
  */
 
@@ -45 +47 @@
 #include <sys/cdefs.h>
 #include <sys/_types.h>
+#if defined(__USE_GNU) && !defined(MAXNAMLEN)
+/* Fixing a common problem with tests using NAME_MAX without including limits.h. */
+# include <sys/param.h>
+#endif
+
 
 /*
@@ -63 +70 @@
         __uint8_t  d_namlen;            /* length of string in d_name */
 #if __BSD_VISIBLE
-#ifndef MAXNAMLEN  /* bird: emx */
-#define MAXNAMLEN       260 /* bird: changed from 255. */
-#endif             /* bird: emx */
+#ifndef MAXNAMLEN                   /* bird */
+#ifdef NAME_MAX                     /* bird */
+#define MAXNAMLEN       NAME_MAX    /* bird */
+#else                               /* bird */
+#define MAXNAMLEN       256
+#endif                              /* bird */
+#endif                              /* bird */
         char    d_name[MAXNAMLEN + 1];  /* name must be no longer than this */
 #else
-        char    d_name[260 + 1];        /* bird: changed from 255. */ /* name must be no longer than this */
+        char    d_name[255 + 1];        /* name must be no longer than this */
 #endif
-/* bird: Extra EMX fields - start */
+/* bird: Extra EMX fields - start */ /** @todo move these up before the name! LIBC07 */
         __uint8_t  d_attr;              /* OS file attributes        */
         __uint16_t d_time;              /* OS file modification time */