Renamed some types Uid_t, Gid_t, Mode_t, etc. for perl5.

More space for synctree.

diff --git a/commands/i386/mtools-3.9.7/sysincludes.h b/commands/i386/mtools-3.9.7/sysincludes.h
index 3fb47fe577badb2229ae39c9a267deee99410ce1..4f69cedd20266efd85eb32ebeda93d49a397dbc9 100755 (executable)
--- a/commands/i386/mtools-3.9.7/sysincludes.h
+++ b/commands/i386/mtools-3.9.7/sysincludes.h
@@ -55,7 +55,7 @@
 #endif
 
 #ifdef OS_Minix
-typedef unsigned char *caddr_t;
+/* typedef unsigned char *caddr_t; */
 #endif
 
 

diff --git a/commands/simple/Makefile b/commands/simple/Makefile
index 16989f100a77b78da809be68215662584c2df87c..4e67ecd6e74612921459846c0024df5cd9c95eed 100755 (executable)
--- a/commands/simple/Makefile
+++ b/commands/simple/Makefile
@@ -691,7 +691,7 @@ sync:       sync.c
 
 synctree:      synctree.c
        $(CCLD) -o $@ -wo $?
-       @install -S 32kw $@
+       install -S 64kw $@
 
 sysenv:        sysenv.c
        $(CCLD) -o $@ -wo $?

diff --git a/commands/simple/chmod.c b/commands/simple/chmod.c
index afc040c96d57b7e758d41649188ccb40b99b9b29..f37f718ab1604424193cd7420fc48bc95b9bdf32 100755 (executable)
--- a/commands/simple/chmod.c
+++ b/commands/simple/chmod.c
@@ -40,14 +40,12 @@ struct stat st;
 char path[PATH_MAX + 1];
 
 _PROTOTYPE(int main, (int argc, char **argv));
-_PROTOTYPE(mode_t parsemode, (char *symbolic, Mode_t oldmode));
+_PROTOTYPE(mode_t parsemode, (char *symbolic, mode_t oldmode));
 _PROTOTYPE(int do_change, (char *name));
 _PROTOTYPE(void usage, (void));
 
 /* Parse a P1003.2 4.7.7-conformant symbolic mode. */
-mode_t parsemode(symbolic, oldmode)
-char *symbolic;
-mode_t oldmode;
+mode_t parsemode(char *symbolic, mode_t oldmode)
 {
   mode_t who, mask, newmode, tmpmask;
   char action;

diff --git a/commands/simple/diff.c b/commands/simple/diff.c
index 4764ed59502d51590630f5de6d6466690dbcc2c2..5102e2244422d51489c166384ae63fa0cc2198cc 100755 (executable)
--- a/commands/simple/diff.c
+++ b/commands/simple/diff.c
@@ -31,6 +31,7 @@
 *-----------------------------------------------------------------------------
 */
 
+#include <errno.h>
 #include <stdlib.h>
 #include <limits.h>            /* NAME_MAX for maximal filename length  */
 #include <string.h>            /* string manipulation                   */
@@ -870,7 +871,8 @@ FILE *file1, *file2;                /* The corresponding file-pointers       */
 
   inputfp = popen(buff, "r");
   if (!inputfp) {
-       fprintf(stderr, "Can't execute diff %s %s\n", old, new);
+       fprintf(stderr, "Can't execute diff %s %s, popen failed with %s\n",
+               old, new, strerror(errno));
        exit(2);
   }
   preoldend = -1000;
@@ -993,6 +995,7 @@ FILE *file1, *file2;                /* The corresponding file-pointers       */
                prenewend = newend;
        }
   }
+  fprintf(stderr, "pipe fd is %d\n", fileno(inputfp));
   status = pclose(inputfp);
   if (status != 0) diffs++;
   if (!WIFEXITED(status) || WEXITSTATUS(status) > 1) severe_error = 1;

diff --git a/commands/simple/fsck.c b/commands/simple/fsck.c
index 5337393ef0b9317ae2325cf1f20bac9bdbc49f12..fc3148b463e516e68cd03129ed31741c4c31d3c0 100755 (executable)
--- a/commands/simple/fsck.c
+++ b/commands/simple/fsck.c
@@ -190,7 +190,7 @@ _PROTOTYPE(void getcount, (void));
 _PROTOTYPE(void counterror, (Ino_t ino));
 _PROTOTYPE(void chkcount, (void));
 _PROTOTYPE(void freecount, (void));
-_PROTOTYPE(void printperm, (Mode_t mode, int shift, int special, int overlay));
+_PROTOTYPE(void printperm, (mode_t mode, int shift, int special, int overlay));
 _PROTOTYPE(void list, (Ino_t ino, d_inode *ip));
 _PROTOTYPE(int Remove, (dir_struct *dp));
 _PROTOTYPE(void make_printable_name, (char *dst, char *src, int n));
@@ -843,11 +843,7 @@ void freecount()
 }
 
 /* Print the inode permission bits given by mode and shift. */
-void printperm(mode, shift, special, overlay)
-mode_t mode;
-int shift;
-int special;
-int overlay;
+void printperm(mode_t mode, int shift, int special, int overlay)
 {
   if (mode >> shift & R_BIT)
        putchar('r');

diff --git a/commands/simple/fsck1.c b/commands/simple/fsck1.c
index 7324960847a47992b7f71e122296a0cadc04332c..b4ed89744e81dddc9f3a9937532e92bfb04d2096 100755 (executable)
--- a/commands/simple/fsck1.c
+++ b/commands/simple/fsck1.c
@@ -173,7 +173,7 @@ _PROTOTYPE(void getcount, (void));
 _PROTOTYPE(void counterror, (Ino_t ino));
 _PROTOTYPE(void chkcount, (void));
 _PROTOTYPE(void freecount, (void));
-_PROTOTYPE(void printperm, (Mode_t mode, int shift, int special, int overlay));
+_PROTOTYPE(void printperm, (mode_t mode, int shift, int special, int overlay));
 _PROTOTYPE(void list, (Ino_t ino, d_inode *ip));
 _PROTOTYPE(int Remove, (dir_struct *dp));
 _PROTOTYPE(void make_printable_name, (char *dst, char *src, int n));
@@ -779,11 +779,7 @@ void freecount()
 }
 
 /* Print the inode permission bits given by mode and shift. */
-void printperm(mode, shift, special, overlay)
-mode_t mode;
-int shift;
-int special;
-int overlay;
+void printperm(mode_t mode, int shift, int special, int overlay)
 {
   if (mode >> shift & R_BIT)
        putchar('r');

diff --git a/commands/simple/mkdir.c b/commands/simple/mkdir.c
index 38f3660532323188c9989fa35ba7e2cc127e2aa4..9044966a1f09b54c7bb05000955958a092ff330b 100755 (executable)
--- a/commands/simple/mkdir.c
+++ b/commands/simple/mkdir.c
@@ -38,15 +38,13 @@ mode_t u_mask;
 struct stat st;
 
 _PROTOTYPE(int main, (int argc, char **argv));
-_PROTOTYPE(mode_t parsemode, (char *symbolic, Mode_t oldmode));
+_PROTOTYPE(mode_t parsemode, (char *symbolic, mode_t oldmode));
 _PROTOTYPE(int makepath, (char *fordir));
 _PROTOTYPE(int makedir, (char *dirname));
 _PROTOTYPE(void usage, (void));
 
 /* Parse a P1003.2 4.7.7-conformant symbolic mode. */
-mode_t parsemode(symbolic, oldmode)
-char *symbolic;
-mode_t oldmode;
+mode_t parsemode(char *symbolic, mode_t oldmode)
 {
   mode_t who, mask, newmode, tmpmask;
   char action;

diff --git a/commands/simple/mkfifo.c b/commands/simple/mkfifo.c
index 8900dc52c0a18bdfef6873cea2966f7a0b73cba8..d117f551c43cd7dc311b7868bb85c333c6bfe3d2 100755 (executable)
--- a/commands/simple/mkfifo.c
+++ b/commands/simple/mkfifo.c
@@ -29,13 +29,11 @@
 mode_t u_mask;
 
 _PROTOTYPE(int main, (int argc, char **argv));
-_PROTOTYPE(mode_t parsemode, (char *symbolic, Mode_t oldmode));
+_PROTOTYPE(mode_t parsemode, (char *symbolic, mode_t oldmode));
 _PROTOTYPE(void usage, (void));
 
 /* Parse a P1003.2 4.7.7-conformant symbolic mode. */
-mode_t parsemode(symbolic, oldmode)
-char *symbolic;
-mode_t oldmode;
+mode_t parsemode(char *symbolic, mode_t oldmode)
 {
   mode_t who, mask, newmode, tmpmask;
   char action;

diff --git a/include/fcntl.h b/include/fcntl.h
index 06f6f89c6124cbd5e58f859ad2423c2b074a991e..7e65e4e06dbc8f6ae6f4bd0b6a60c265fce93146 100755 (executable)
--- a/include/fcntl.h
+++ b/include/fcntl.h
@@ -61,7 +61,7 @@ struct flock {
 
 
 /* Function Prototypes. */
-_PROTOTYPE( int creat, (const char *_path, Mode_t _mode)               );
+_PROTOTYPE( int creat, (const char *_path, _mnx_Mode_t _mode)          );
 _PROTOTYPE( int fcntl, (int _filedes, int _cmd, ...)                   );
 _PROTOTYPE( int open,  (const char *_path, int _oflag, ...)            );
 

diff --git a/include/grp.h b/include/grp.h
index cd307ddce4f4be8585c891b0ebe8e8bb78352a0f..88a93d7c442c2c491f17717456da26787fd4c58a 100755 (executable)
--- a/include/grp.h
+++ b/include/grp.h
@@ -15,7 +15,7 @@ struct        group {
 };
 
 /* Function Prototypes. */
-_PROTOTYPE( struct group *getgrgid, (Gid_t _gid)                       );
+_PROTOTYPE( struct group *getgrgid, (_mnx_Gid_t _gid)                          );
 _PROTOTYPE( struct group *getgrnam, (const char *_name)                        );
 
 #ifdef _MINIX

diff --git a/include/pwd.h b/include/pwd.h
index 48eb04f3d93248e0a00c5c9c3e23198da9d59806..ee343b0ef530bfcea4ea1c70c81edb0d5d9798e4 100755 (executable)
--- a/include/pwd.h
+++ b/include/pwd.h
@@ -22,7 +22,7 @@ struct passwd {
 
 /* Function Prototypes. */
 _PROTOTYPE( struct passwd *getpwnam, (const char *_name)               );
-_PROTOTYPE( struct passwd *getpwuid, (Uid_t _uid)                      );
+_PROTOTYPE( struct passwd *getpwuid, (_mnx_Uid_t _uid)                 );
 
 #ifdef _MINIX
 _PROTOTYPE( void endpwent, (void)                                      );

diff --git a/include/stdint.h b/include/stdint.h
index 0e7a402b02a68ebecb228507d0867b3cf0a5239c..e9b27807f36da73704970b4d171e5c4cf1c13ff2 100644 (file)
--- a/include/stdint.h
+++ b/include/stdint.h
@@ -13,6 +13,7 @@
 #ifndef _MINIX__TYPES_H
 #include <sys/types.h>
 #endif
+#include <minix/config.h>
 
 #if (_WORD_SIZE != 2 && _WORD_SIZE != 4) || \
        (_PTR_SIZE != _WORD_SIZE && _PTR_SIZE != 2*_WORD_SIZE)

diff --git a/include/sys/stat.h b/include/sys/stat.h
index 28dbb5a5cea4feb647eac9e27ceae882a67af07d..f586e459f2091693c15a3a3b0a567e3724910b64 100755 (executable)
--- a/include/sys/stat.h
+++ b/include/sys/stat.h
@@ -65,12 +65,12 @@ struct stat {
 #define S_ISLNK(m)      (((m) & S_IFMT) == S_IFLNK)     /* is a sym link */
 
 /* Function Prototypes. */
-_PROTOTYPE( int chmod, (const char *_path, Mode_t _mode)               );
+_PROTOTYPE( int chmod, (const char *_path, _mnx_Mode_t _mode)          );
 _PROTOTYPE( int fstat, (int _fildes, struct stat *_buf)                        );
-_PROTOTYPE( int mkdir, (const char *_path, Mode_t _mode)               );
-_PROTOTYPE( int mkfifo, (const char *_path, Mode_t _mode)              );
+_PROTOTYPE( int mkdir, (const char *_path, _mnx_Mode_t _mode)          );
+_PROTOTYPE( int mkfifo, (const char *_path, _mnx_Mode_t _mode)         );
 _PROTOTYPE( int stat, (const char *_path, struct stat *_buf)           );
-_PROTOTYPE( mode_t umask, (Mode_t _cmask)                              );
+_PROTOTYPE( mode_t umask, (_mnx_Mode_t _cmask)                         );
 
 /* Open Group Base Specifications Issue 6 (not complete) */
 _PROTOTYPE( int lstat, (const char *_path, struct stat *_buf)          );

diff --git a/include/sys/types.h b/include/sys/types.h
index 6bbf5b4cb5084529086c0087c0afdf3220b2afa9..2f91c10bef7849302aafa10c838ca6df8c39b5c2 100755 (executable)
--- a/include/sys/types.h
+++ b/include/sys/types.h
@@ -81,9 +81,9 @@ typedef struct { u32_t _[2]; } u64_t;
  * is clearer.
  */
 typedef int            Dev_t;
-typedef int           Gid_t;
+typedef int           _mnx_Gid_t;
 typedef int         Nlink_t;
-typedef int           Uid_t;
+typedef int           _mnx_Uid_t;
 typedef int             U8_t;
 typedef unsigned long  U32_t;
 typedef int             I8_t;
@@ -105,14 +105,14 @@ typedef unsigned long     Ino_t;
 typedef unsigned int    Zone1_t;
 typedef unsigned int Bitchunk_t;
 typedef unsigned int      U16_t;
-typedef unsigned int  Mode_t;
+typedef unsigned int  _mnx_Mode_t;
 
 #else /* _EM_WSIZE == 4, or _EM_WSIZE undefined */
 /*typedef int            Ino_t; Ino_t is now 32 bits */
 typedef int            Zone1_t;
 typedef int         Bitchunk_t;
 typedef int              U16_t;
-typedef int           Mode_t;
+typedef int           _mnx_Mode_t;
 
 #endif /* _EM_WSIZE == 2, etc */
  
@@ -124,5 +124,6 @@ typedef unsigned char       u_char;
 typedef unsigned short u_short;
 typedef unsigned int   u_int;
 typedef unsigned long  u_long;
+typedef char           *caddr_t;
 
 #endif /* _TYPES_H */

diff --git a/include/unistd.h b/include/unistd.h
index 0630bbd265bdb559dc588a02003c74749de67fcd..e4d34e7fd9574111d2aebec49874909456ab7998 100755 (executable)
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -85,7 +85,7 @@ _PROTOTYPE( void _exit, (int _status)                                 );
 _PROTOTYPE( int access, (const char *_path, int _amode)                        );
 _PROTOTYPE( unsigned int alarm, (unsigned int _seconds)                        );
 _PROTOTYPE( int chdir, (const char *_path)                             );
-_PROTOTYPE( int chown, (const char *_path, Uid_t _owner, Gid_t _group) );
+_PROTOTYPE( int chown, (const char *_path, _mnx_Uid_t _owner, _mnx_Gid_t _group)       );
 _PROTOTYPE( int close, (int _fd)                                       );
 _PROTOTYPE( char *ctermid, (char *_s)                                  );
 _PROTOTYPE( char *cuserid, (char *_s)                                  );
@@ -118,10 +118,10 @@ _PROTOTYPE( int pause, (void)                                             );
 _PROTOTYPE( int pipe, (int _fildes[2])                                 );
 _PROTOTYPE( ssize_t read, (int _fd, void *_buf, size_t _n)             );
 _PROTOTYPE( int rmdir, (const char *_path)                             );
-_PROTOTYPE( int setgid, (Gid_t _gid)                                   );
+_PROTOTYPE( int setgid, (_mnx_Gid_t _gid)                                      );
 _PROTOTYPE( int setpgid, (pid_t _pid, pid_t _pgid)                     );
 _PROTOTYPE( pid_t setsid, (void)                                       );
-_PROTOTYPE( int setuid, (Uid_t _uid)                                   );
+_PROTOTYPE( int setuid, (_mnx_Uid_t _uid)                                      );
 _PROTOTYPE( unsigned int sleep, (unsigned int _seconds)                        );
 _PROTOTYPE( long sysconf, (int _name)                                  );
 _PROTOTYPE( pid_t tcgetpgrp, (int _fd)                                 );
@@ -139,8 +139,8 @@ _PROTOTYPE( int symlink, (const char *path1, const char *path2)             );
 #endif
 _PROTOTYPE( int brk, (char *_addr)                                     );
 _PROTOTYPE( int chroot, (const char *_name)                            );
-_PROTOTYPE( int mknod, (const char *_name, Mode_t _mode, Dev_t _addr)  );
-_PROTOTYPE( int mknod4, (const char *_name, Mode_t _mode, Dev_t _addr,
+_PROTOTYPE( int mknod, (const char *_name, _mnx_Mode_t _mode, Dev_t _addr)     );
+_PROTOTYPE( int mknod4, (const char *_name, _mnx_Mode_t _mode, Dev_t _addr,
            long _size)                                                 );
 _PROTOTYPE( char *mktemp, (char *_template)                            );
 _PROTOTYPE( int mount, (char *_spec, char *_name, int _flag)           );

diff --git a/lib/other/getgrent.c b/lib/other/getgrent.c
index 2ee524bbcd5e5365b486f0b02a772de04419132e..63931e5bd867cf3ea0a5fe389135d2a868744e99 100755 (executable)
--- a/lib/other/getgrent.c
+++ b/lib/other/getgrent.c
@@ -127,7 +127,7 @@ struct group *getgrent(void)
        }
 }
 
-struct group *getgrgid(Gid_t gid)
+struct group *getgrgid(_mnx_Gid_t gid)
 /* Return the group file entry belonging to the user-id. */
 {
        struct group *gr;

diff --git a/lib/other/getpwent.c b/lib/other/getpwent.c
index b6c74b6d4b6426007fff0e148d87bb524c6d037e..f13fbe99a2a019f09db1d2edfaaa85b313234146 100755 (executable)
--- a/lib/other/getpwent.c
+++ b/lib/other/getpwent.c
@@ -120,7 +120,7 @@ struct passwd *getpwent(void)
        }
 }
 
-struct passwd *getpwuid(Uid_t uid)
+struct passwd *getpwuid(_mnx_Uid_t uid)
 /* Return the password file entry belonging to the user-id. */
 {
        struct passwd *pw;

diff --git a/lib/posix/_chmod.c b/lib/posix/_chmod.c
index efbf248c9af479b8c7cc4bbc9c968081db2d90c8..0f731b68fafc553fd4ce7b6d81187937ee51e82f 100755 (executable)
--- a/lib/posix/_chmod.c
+++ b/lib/posix/_chmod.c
@@ -4,7 +4,7 @@
 
 PUBLIC int chmod(name, mode)
 _CONST char *name;
-Mode_t mode;
+_mnx_Mode_t mode;
 {
   message m;
 

diff --git a/lib/posix/_chown.c b/lib/posix/_chown.c
index 9b261f6e2cd135de2a8d9c5ad1b271894fbb0133..2baf966e6f4b69fe8ec695298e2a5447dd68309b 100755 (executable)
--- a/lib/posix/_chown.c
+++ b/lib/posix/_chown.c
@@ -5,8 +5,8 @@
 
 PUBLIC int chown(name, owner, grp)
 _CONST char *name;
-Uid_t owner;
-Gid_t grp;
+_mnx_Uid_t owner;
+_mnx_Gid_t grp;
 {
   message m;
 

diff --git a/lib/posix/_creat.c b/lib/posix/_creat.c
index ab797b10753446996763444b4c208a5ac715d1ae..b4f475848ae66898381a6725eba61858fdfb7b9e 100755 (executable)
--- a/lib/posix/_creat.c
+++ b/lib/posix/_creat.c
@@ -4,7 +4,7 @@
 
 PUBLIC int creat(name, mode)
 _CONST char *name;
-Mode_t mode;
+_mnx_Mode_t mode;
 {
   message m;
 

diff --git a/lib/posix/_mkdir.c b/lib/posix/_mkdir.c
index da3aae8cc0fae8d1ca734b082861e74fba081dd5..ea6dab33ab03808c726325ee26e49d0317660089 100755 (executable)
--- a/lib/posix/_mkdir.c
+++ b/lib/posix/_mkdir.c
@@ -5,7 +5,7 @@
 
 PUBLIC int mkdir(name, mode)
 _CONST char *name;
-Mode_t mode;
+_mnx_Mode_t mode;
 {
   message m;
 

diff --git a/lib/posix/_mkfifo.c b/lib/posix/_mkfifo.c
index 78d4a632f7133ec946ea983c3cfedb5292370f33..012c5d567aa91f2d2118d8a4e632e58c5dac5100 100755 (executable)
--- a/lib/posix/_mkfifo.c
+++ b/lib/posix/_mkfifo.c
@@ -6,7 +6,7 @@
 
 PUBLIC int mkfifo(name, mode)
 _CONST char *name;
-Mode_t mode;
+_mnx_Mode_t mode;
 {
   return mknod(name, mode | S_IFIFO, (Dev_t) 0);
 }

diff --git a/lib/posix/_mknod.c b/lib/posix/_mknod.c
index c08beee13cbd92a092a87028bb069d48858f4717..6c221306f6e55b4df748c513f0da6d7d22d6be83 100755 (executable)
--- a/lib/posix/_mknod.c
+++ b/lib/posix/_mknod.c
@@ -6,7 +6,7 @@
 
 PUBLIC int mknod(name, mode, dev)
 _CONST char *name;
-Mode_t mode;
+_mnx_Mode_t mode;
 Dev_t dev;
 {
   message m;

diff --git a/lib/posix/_open.c b/lib/posix/_open.c
index 45dd409c9e65b142cae1cd0c712cbb5f7757cc96..cf5ea4c201de032fc8bb95b74bb488e8e3109330 100755 (executable)
--- a/lib/posix/_open.c
+++ b/lib/posix/_open.c
@@ -19,7 +19,7 @@ int flags;
   if (flags & O_CREAT) {
        m.m1_i1 = strlen(name) + 1;
        m.m1_i2 = flags;
-       m.m1_i3 = va_arg(argp, Mode_t);
+       m.m1_i3 = va_arg(argp, _mnx_Mode_t);
        m.m1_p1 = (char *) name;
   } else {
        _loadname(name, &m);

diff --git a/lib/posix/_setuid.c b/lib/posix/_setuid.c
index 92411437deed69abbb282d0f31296dcee90c1efe..3dd3c70fb7aa82eb04b4303f61e258b0a30c5cfb 100755 (executable)
--- a/lib/posix/_setuid.c
+++ b/lib/posix/_setuid.c
@@ -3,7 +3,7 @@
 #include <unistd.h>
 
 PUBLIC int setuid(usr)
-Uid_t usr;
+_mnx_Uid_t usr;
 {
   message m;
 

diff --git a/lib/posix/_umask.c b/lib/posix/_umask.c
index 87e93bc01eb372403531bbc5de3f288b81df6035..c41f9757cacffa728a88e814302a4017cda4f0b9 100755 (executable)
--- a/lib/posix/_umask.c
+++ b/lib/posix/_umask.c
@@ -3,7 +3,7 @@
 #include <sys/stat.h>
 
 PUBLIC mode_t umask(complmode)
-Mode_t complmode;
+_mnx_Mode_t complmode;
 {
   message m;
 

diff --git a/lib/stdio/fopen.c b/lib/stdio/fopen.c
index cf36376876dfaa6beda06d23ae1530a40a36f48d..915dcb2c6187917ab5933d40b590bfc1f9a03d79 100755 (executable)
--- a/lib/stdio/fopen.c
+++ b/lib/stdio/fopen.c
@@ -39,7 +39,7 @@
 #define        O_APPEND        0x040
 
 int _open(const char *path, int flags);
-int _creat(const char *path, Mode_t mode);
+int _creat(const char *path, _mnx_Mode_t mode);
 int _close(int d);
 
 FILE *

diff --git a/lib/stdio/freopen.c b/lib/stdio/freopen.c
index 5cea4870cf0751b2a150ba23f921e89ad23c8436..c237bfaf6cb4778e89b577df3e7ffd3f0d1278e5 100755 (executable)
--- a/lib/stdio/freopen.c
+++ b/lib/stdio/freopen.c
@@ -24,7 +24,7 @@
 #define        O_APPEND        0x040
 
 int _open(const char *path, int flags);
-int _creat(const char *path, Mode_t mode);
+int _creat(const char *path, _mnx_Mode_t mode);
 int _close(int d);
 
 FILE *

diff --git a/servers/fs/filedes.c b/servers/fs/filedes.c
index 739fdd2ed7efbb93b19fe4946bb7b714f44e4145..6f4a277b11b50cfbaa8f6d151083178984e11c2e 100644 (file)
--- a/servers/fs/filedes.c
+++ b/servers/fs/filedes.c
@@ -14,11 +14,7 @@
 /*===========================================================================*
  *                             get_fd                                       *
  *===========================================================================*/
-PUBLIC int get_fd(start, bits, k, fpt)
-int start;                     /* start of search (used for F_DUPFD) */
-mode_t bits;                   /* mode of the file to be created (RWX bits) */
-int *k;                                /* place to return file descriptor */
-struct filp **fpt;             /* place to return filp slot */
+PUBLIC int get_fd(int start, mode_t bits, int *k, struct filp **fpt)
 {
 /* Look for a free file descriptor and a free filp slot.  Fill in the mode word
  * in the latter, but don't claim either one yet, since the open() or creat()
@@ -78,9 +74,7 @@ int fild;                     /* file descriptor */
 /*===========================================================================*
  *                             find_filp                                    *
  *===========================================================================*/
-PUBLIC struct filp *find_filp(rip, bits)
-register struct inode *rip;    /* inode referred to by the filp to be found */
-Mode_t bits;                   /* mode of the filp to be found (RWX bits) */
+PUBLIC struct filp *find_filp(register struct inode *rip, mode_t bits)
 {
 /* Find a filp slot that refers to the inode 'rip' in a way as described
  * by the mode bit 'bits'. Used for determining whether somebody is still

diff --git a/servers/fs/inode.c b/servers/fs/inode.c
index 80caa1b6613797daa9ab4fffcb6df0c7deee1758..cdef41bc2ae9729ea07bb754e7a7a9256d66916e 100644 (file)
--- a/servers/fs/inode.c
+++ b/servers/fs/inode.c
@@ -102,9 +102,7 @@ register struct inode *rip; /* pointer to inode to be released */
 /*===========================================================================*
  *                             alloc_inode                                  *
  *===========================================================================*/
-PUBLIC struct inode *alloc_inode(dev, bits)
-dev_t dev;                     /* device on which to allocate the inode */
-mode_t bits;                   /* mode of the inode */
+PUBLIC struct inode *alloc_inode(dev_t dev, mode_t bits)
 {
 /* Allocate a free inode on 'dev', and return a pointer to it. */
 

diff --git a/servers/fs/open.c b/servers/fs/open.c
index cb00b496b4a6a54db8aa7a75722ccb9b31bec99c..9c93a13a1c7c35206d9ff1c7682ab1fb9e81773a 100644 (file)
--- a/servers/fs/open.c
+++ b/servers/fs/open.c
@@ -28,9 +28,9 @@
 
 PRIVATE char mode_map[] = {R_BIT, W_BIT, R_BIT|W_BIT, 0};
 
-FORWARD _PROTOTYPE( int common_open, (int oflags, Mode_t omode)                );
-FORWARD _PROTOTYPE( int pipe_open, (struct inode *rip,Mode_t bits,int oflags));
-FORWARD _PROTOTYPE( struct inode *new_node, (char *path, Mode_t bits,
+FORWARD _PROTOTYPE( int common_open, (int oflags, mode_t omode)                );
+FORWARD _PROTOTYPE( int pipe_open, (struct inode *rip,mode_t bits,int oflags));
+FORWARD _PROTOTYPE( struct inode *new_node, (char *path, mode_t bits,
                                                        zone_t z0)      );
 
 
@@ -75,9 +75,7 @@ PUBLIC int do_open()
 /*===========================================================================*
  *                             common_open                                  *
  *===========================================================================*/
-PRIVATE int common_open(oflags, omode)
-register int oflags;
-mode_t omode;
+PRIVATE int common_open(register int oflags, mode_t omode)
 {
 /* Common code from do_creat and do_open. */
 
@@ -202,10 +200,7 @@ mode_t omode;
 /*===========================================================================*
  *                             new_node                                     *
  *===========================================================================*/
-PRIVATE struct inode *new_node(path, bits, z0)
-char *path;                    /* pointer to path name */
-mode_t bits;                   /* mode of the new inode */
-zone_t z0;                     /* zone number 0 for new inode */
+PRIVATE struct inode *new_node(char *path, mode_t bits,        zone_t z0)
 {
 /* New_node() is called by common_open(), do_mknod(), and do_mkdir().  
  * In all cases it allocates a new inode, makes a directory entry for it on 
@@ -267,10 +262,8 @@ zone_t z0;                 /* zone number 0 for new inode */
 /*===========================================================================*
  *                             pipe_open                                    *
  *===========================================================================*/
-PRIVATE int pipe_open(rip, bits, oflags)
-register struct inode *rip;
-register mode_t bits;
-register int oflags;
+PRIVATE int pipe_open(register struct inode *rip, register mode_t bits,
+       register int oflags)
 {
 /*  This function is called from common_open. It checks if
  *  there is at least one reader/writer pair for the pipe, if not

diff --git a/servers/fs/protect.c b/servers/fs/protect.c
index cbed88849aa00c05b7547531577cda39cadc9d0c..6c3bdb644126aaf932d008a9a036be6b8d2c3436 100644 (file)
--- a/servers/fs/protect.c
+++ b/servers/fs/protect.c
@@ -140,9 +140,7 @@ PUBLIC int do_access()
 /*===========================================================================*
  *                             forbidden                                    *
  *===========================================================================*/
-PUBLIC int forbidden(rip, access_desired)
-register struct inode *rip;    /* pointer to inode to be checked */
-mode_t access_desired; /* RWX bits */
+PUBLIC int forbidden(register struct inode *rip, mode_t access_desired)
 {
 /* Given a pointer to an inode, 'rip', and the access desired, determine
  * if the access is allowed, and if not why not.  The routine looks up the

diff --git a/servers/fs/proto.h b/servers/fs/proto.h
index f7e10ba249954432eb99a18820682f3aa042d4a7..ac6248f3c7a142a99ff065171b73c2517106d83d 100644 (file)
--- a/servers/fs/proto.h
+++ b/servers/fs/proto.h
@@ -50,12 +50,12 @@ _PROTOTYPE( void map_controllers, (void)                            );
 _PROTOTYPE( int map_driver, (int major, int proc_nr, int dev_style)    );
 
 /* filedes.c */
-_PROTOTYPE( struct filp *find_filp, (struct inode *rip, Mode_t bits)   );
-_PROTOTYPE( int get_fd, (int start, Mode_t bits, int *k, struct filp **fpt) );
+_PROTOTYPE( struct filp *find_filp, (struct inode *rip, mode_t bits)   );
+_PROTOTYPE( int get_fd, (int start, mode_t bits, int *k, struct filp **fpt) );
 _PROTOTYPE( struct filp *get_filp, (int fild)                          );
 
 /* inode.c */
-_PROTOTYPE( struct inode *alloc_inode, (Dev_t dev, Mode_t bits)                );
+_PROTOTYPE( struct inode *alloc_inode, (dev_t dev, mode_t bits)                );
 _PROTOTYPE( void dup_inode, (struct inode *ip)                         );
 _PROTOTYPE( void free_inode, (Dev_t dev, Ino_t numb)                   );
 _PROTOTYPE( struct inode *get_inode, (Dev_t dev, int numb)             );
@@ -128,7 +128,7 @@ _PROTOTYPE( int do_access, (void)                                   );
 _PROTOTYPE( int do_chmod, (void)                                       );
 _PROTOTYPE( int do_chown, (void)                                       );
 _PROTOTYPE( int do_umask, (void)                                       );
-_PROTOTYPE( int forbidden, (struct inode *rip, Mode_t access_desired)  );
+_PROTOTYPE( int forbidden, (struct inode *rip, mode_t access_desired)  );
 _PROTOTYPE( int read_only, (struct inode *ip)                          );
 
 /* read.c */