<sys/syslimits.h>

reduces differences, raise NAME_MAX

Change-Id: I2e5f6296e6539162c52fdf13fb1fd27a56587e0c

diff --git a/commands/backup/backup.c b/commands/backup/backup.c
index 267d97b13551030a66b0e99d7e3946ac67db9a74..529608f9cacd5ed1279706a827f77d9e3df62c08 100644 (file)
--- a/commands/backup/backup.c
+++ b/commands/backup/backup.c
@@ -35,6 +35,7 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/syslimits.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <utime.h>

diff --git a/commands/cp/cp.c b/commands/cp/cp.c
index 75cf43107401e8bb2e81880617bac2729ac4507b..470a94bd75e2471d7c1fb3e4190d75e3559a6d05 100644 (file)
--- a/commands/cp/cp.c
+++ b/commands/cp/cp.c
@@ -15,6 +15,7 @@
 #include <fcntl.h>
 #include <time.h>
 #include <sys/stat.h>
+#include <sys/syslimits.h>
 #include <utime.h>
 #include <dirent.h>
 #include <errno.h>

diff --git a/commands/writeisofs/writeisofs.c b/commands/writeisofs/writeisofs.c
index a5cefc557543cd477916d397dfe053597ea1a849..9029f2efc0d6454f08c025f24cf4f842dc52579d 100644 (file)
--- a/commands/writeisofs/writeisofs.c
+++ b/commands/writeisofs/writeisofs.c
@@ -29,7 +29,7 @@ extern int optind;
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#define NAMELEN                (NAME_MAX+5)
+#define NAMELEN                500
 #define ISONAMELEN     12      /* XXX could easily be 31 */
 #define PLATFORM_80X86 0
 

diff --git a/lib/libc/sys-minix/m_closefrom.c b/lib/libc/sys-minix/m_closefrom.c
index eae7995c87797cfe18d18c38db18393341a3ce52..14db9f80fcbfd9e905b7fe2dcf66cbc779058873 100644 (file)
--- a/lib/libc/sys-minix/m_closefrom.c
+++ b/lib/libc/sys-minix/m_closefrom.c
@@ -7,7 +7,7 @@
 int closefrom(int fd)
 {
        int f, ok = 0, e = 0;
-       for(f = fd; f < __MINIX_OPEN_MAX; f++) {
+       for(f = fd; f < OPEN_MAX; f++) {
                if(close(f) >= 0)
                        ok = 1;
                else

diff --git a/sys/sys/fd_set.h b/sys/sys/fd_set.h
index 0fca18e88018290723e4e778d48e49bdc8420304..a20fd515b66832e4794ea3e2d0dff760f74fce4f 100644 (file)
--- a/sys/sys/fd_set.h
+++ b/sys/sys/fd_set.h
@@ -58,7 +58,7 @@ typedef       __uint32_t      __fd_mask;
 #ifndef        FD_SETSIZE
 #ifdef __minix
 #include <sys/syslimits.h>
-#define        FD_SETSIZE      __MINIX_OPEN_MAX
+#define        FD_SETSIZE      OPEN_MAX
 #else
 #define        FD_SETSIZE      256
 #endif

diff --git a/sys/sys/syslimits.h b/sys/sys/syslimits.h
index 5ae3be3e70604f769d1f6babf0da8acf2713df69..9c6976d64c0c4222ec3d260522d91dcce275d266 100644 (file)
--- a/sys/sys/syslimits.h
+++ b/sys/sys/syslimits.h
@@ -34,16 +34,15 @@
 #ifndef _SYS_SYSLIMITS_H_
 #define _SYS_SYSLIMITS_H_
 
-#if defined(__minix)
-#define __MINIX_OPEN_MAX       255 /* a process may have 255 files open */
-#define __MINIX_PATH_MAX       1024/* a pathname may contain 1023 chars (+ '\0')*/
-
-#if defined(_STANDALONE)
+#if defined(_STANDALONE) && defined(__minix)
 /* LSC: In NetBSD this gets pulled in through libkern.h */
 #include <sys/null.h>
 uint32_t crc32(uint32_t, const uint8_t *, size_t);
 #endif /* defined(_STANDALONE) */
-#endif /* defined(__minix) */
+
+#ifdef __minix
+#define OPEN_MAX 255
+#endif
 
 #include <sys/featuretest.h>
 
@@ -53,19 +52,24 @@ uint32_t crc32(uint32_t, const uint8_t *, size_t);
 #ifndef CHILD_MAX
 #define        CHILD_MAX                 160   /* max simultaneous processes */
 #endif
-#define        GID_MAX            USHRT_MAX    /* max value for a gid_t (2^31-2) */
+#define        GID_MAX            2147483647U  /* max value for a gid_t (2^31-2) */
 #define        LINK_MAX                32767   /* max file link count */
 #define        MAX_CANON                 255   /* max bytes in term canon input line */
 #define        MAX_INPUT                 255   /* max bytes in terminal input */
-#define        NAME_MAX                  255   /* max bytes in a file name, must be */
+#define        NAME_MAX                  511   /* max bytes in a file name, must be */
                                        /* kept in sync with MAXPATHLEN */
-#define        NGROUPS_MAX                8    /* max supplemental group id's */
-#define UID_MAX       USHRT_MAX  /* max value for a uid_t */
+#define        NGROUPS_MAX                16   /* max supplemental group id's */
+#define        UID_MAX            2147483647U  /* max value for a uid_t (2^31-2) */
 #ifndef OPEN_MAX
-#define        OPEN_MAX __MINIX_OPEN_MAX       /* max open files per process */
+#define        OPEN_MAX                  128   /* max open files per process */
+#endif
+#define        PATH_MAX                 1024   /* max bytes in pathname */
+
+#ifdef __minix
+#define        PIPE_BUF                32768   /* max bytes for atomic pipe wri
+#else
+#define        PIPE_BUF                  512   /* max bytes for atomic pipe writes */
 #endif
-#define        PATH_MAX     __MINIX_PATH_MAX   /* max bytes in pathname */
-#define        PIPE_BUF                32768   /* max bytes for atomic pipe writes */
 
 #define        BC_BASE_MAX           INT_MAX   /* max ibase/obase values in bc(1) */
 #define        BC_DIM_MAX              65535   /* max array elements in bc(1) */

diff --git a/test/common.c b/test/common.c
index d530d555919a196588663c0d32223352fa0f0e67..a4e1fa03235dd301b04cb1f77f5e7b1fe07ceccd 100644 (file)
--- a/test/common.c
+++ b/test/common.c
@@ -9,6 +9,7 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <sys/statvfs.h>
+#include <sys/syslimits.h>
 
 #include "common.h"
 

diff --git a/test/t40c.c b/test/t40c.c
index d78f981aa447764572e0ea2ac331d08834daaa70..54cc29f8c790dbc0a23151175bd30e5774924f0d 100644 (file)
--- a/test/t40c.c
+++ b/test/t40c.c
@@ -17,6 +17,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <sys/select.h>
+#include <sys/syslimits.h>
 #include <errno.h>
 #include <sys/wait.h>
 #include <string.h>

diff --git a/test/test40.c b/test/test40.c
index 15a36e3ca9a01355ce952c112e3f03055bdee14a..c4b84e8ede8f217cbe28e9f932282122458e63ad 100644 (file)
--- a/test/test40.c
+++ b/test/test40.c
@@ -6,6 +6,7 @@
 
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <sys/syslimits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>

diff --git a/test/test41.c b/test/test41.c
index 0cec41c9c0c1eb145386b68043e35498e1406338..ee5ba6da47319e9baadc4977a0804702f60fe276 100644 (file)
--- a/test/test41.c
+++ b/test/test41.c
@@ -10,6 +10,7 @@
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/wait.h>
+#include <sys/syslimits.h>
 #include <signal.h>
 #include <unistd.h>
 #include <errno.h>

diff --git a/test/test42.c b/test/test42.c
index c61ce0d6a3eb384ad3c6d48e68fe87c39db16c3b..1b6f9c0e8bbcc90d70ccadea0a1d23a744777eaf 100644 (file)
--- a/test/test42.c
+++ b/test/test42.c
@@ -9,6 +9,7 @@
 #include <sys/wait.h>
 #include <sys/select.h>
 #include <sys/ptrace.h>
+#include <sys/syslimits.h>
 
 #define ITERATIONS 3
 int max_error = 4;

diff --git a/test/test58.c b/test/test58.c
index c327639eb321acd9d948894472a7f43a88c0bea8..0988ab399c2dcca53f2289e24fd808526896fa4f 100644 (file)
--- a/test/test58.c
+++ b/test/test58.c
@@ -20,6 +20,7 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
+#include <sys/syslimits.h>
 
 int subtest = -1;
 int max_error = 999;   /* Effectively no limit. This is necessary as this

diff --git a/test/test61.c b/test/test61.c
index 958dfedd951ba530d882c1bf90ac4a65c4e21fe3..e7060538742585222a86a016912c01b3995b0d8e 100644 (file)
--- a/test/test61.c
+++ b/test/test61.c
@@ -1,6 +1,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
+#include <sys/syslimits.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <unistd.h>

diff --git a/test/test67.c b/test/test67.c
index 64fdd92c4101c1f120f79695bfa51ac21e112c2a..68033a807a2c6c4762ea6323f3a1fe9601d0fb67 100644 (file)
--- a/test/test67.c
+++ b/test/test67.c
@@ -3,6 +3,7 @@
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <sys/syslimits.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <netdb.h>

diff --git a/test/test68.c b/test/test68.c
index dd51d6b13477899f6693498e8edd512c9cbc8dfe..273117bce0b76114e08e3d6e4ebdbda8db09a577 100644 (file)
--- a/test/test68.c
+++ b/test/test68.c
@@ -1,5 +1,6 @@
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <sys/syslimits.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <signal.h>

diff --git a/test/test76.c b/test/test76.c
index 062ccf4ce509e372e325c0f8d9d3272914f270a8..c7268329a3232691f05472fb226f566843e6d9a8 100644 (file)
--- a/test/test76.c
+++ b/test/test76.c
@@ -5,6 +5,7 @@
 #include <sys/wait.h>
 #include <sys/socket.h>
 #include <sys/utsname.h>
+#include <sys/syslimits.h>
 #include <netinet/in.h>
 #include <signal.h>
 #include <unistd.h>

diff --git a/test/test77.c b/test/test77.c
index b634a009123c55a9c707a62d5bc07ebeb0698169..2b8c68d095e04828a16ca6594af99a2832114b2d 100644 (file)
--- a/test/test77.c
+++ b/test/test77.c
@@ -6,6 +6,7 @@
 #include <signal.h>
 #include <termios.h>
 #include <sys/wait.h>
+#include <sys/syslimits.h>
 #include <paths.h>
 #include <fcntl.h>
 #include <util.h>

diff --git a/usr.sbin/installboot/minixfs3.c b/usr.sbin/installboot/minixfs3.c
index 8009e5a8907f7601cbcfd76354e75f9d2d8c5a82..cf491b8b946015caf719655c94e926e608c28062 100644 (file)
--- a/usr.sbin/installboot/minixfs3.c
+++ b/usr.sbin/installboot/minixfs3.c
@@ -4,6 +4,7 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <sys/bootblock.h>
+#include <sys/syslimits.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <string.h>