clean up header files

[unix-history] / usr / src / include / unistd.h

diff --git a/usr/src/include/unistd.h b/usr/src/include/unistd.h
index af68b24..49f8511 100644 (file)
--- a/usr/src/include/unistd.h
+++ b/usr/src/include/unistd.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)unistd.h    5.16 (Berkeley) %G%
+ *     @(#)unistd.h    5.25 (Berkeley) %G%

  */
 
 #ifndef _UNISTD_H_
  */
 
 #ifndef _UNISTD_H_


@@ -18,12 +18,6 @@
 #define        STDOUT_FILENO   1       /* standard output file descriptor */
 #define        STDERR_FILENO   2       /* standard error file descriptor */
 
 #define        STDOUT_FILENO   1       /* standard output file descriptor */
 #define        STDERR_FILENO   2       /* standard error file descriptor */
 

-/* fnmatch(3) defines */
-#define        FNM_PATHNAME    0x01    /* match pathnames, not filenames */
-#ifndef _POSIX_SOURCE
-#define        FNM_QUOTE       0x02    /* escape special chars with \ */
-#endif
-

 #ifndef NULL
 #define        NULL            0       /* null pointer constant */
 #endif
 #ifndef NULL
 #define        NULL            0       /* null pointer constant */
 #endif


@@ -32,11 +26,10 @@ __BEGIN_DECLS
 __dead void
         _exit __P((int));
 int     access __P((const char *, int));
 __dead void
         _exit __P((int));
 int     access __P((const char *, int));

-u_int   alarm __P((u_int));
+unsigned int    alarm __P((unsigned int));

 int     chdir __P((const char *));
 int     chown __P((const char *, uid_t, gid_t));
 int     close __P((int));
 int     chdir __P((const char *));
 int     chown __P((const char *, uid_t, gid_t));
 int     close __P((int));

-char   *cuserid __P((char *));

 int     dup __P((int));
 int     dup2 __P((int, int));
 int     execl __P((const char *, const char *, ...));
 int     dup __P((int));
 int     dup2 __P((int, int));
 int     execl __P((const char *, const char *, ...));


@@ -59,7 +52,8 @@ pid_t  getppid __P((void));
 uid_t   getuid __P((void));
 int     isatty __P((int));
 int     link __P((const char *, const char *));
 uid_t   getuid __P((void));
 int     isatty __P((int));
 int     link __P((const char *, const char *));

-long    lseek __P((int, long, int));
+#define         lseek __lseek
+off_t   lseek __P((int, off_t, int));

 long    pathconf __P((const char *, int));     /* not yet */
 int     pause __P((void));
 int     pipe __P((int *));
 long    pathconf __P((const char *, int));     /* not yet */
 int     pause __P((void));
 int     pipe __P((int *));


@@ -69,7 +63,7 @@ int    setgid __P((gid_t));
 int     setpgid __P((pid_t, pid_t));
 pid_t   setsid __P((void));
 int     setuid __P((uid_t));
 int     setpgid __P((pid_t, pid_t));
 pid_t   setsid __P((void));
 int     setuid __P((uid_t));

-u_int   sleep __P((u_int));
+unsigned int    sleep __P((unsigned int));

 long    sysconf __P((int));                    /* not yet */
 pid_t   tcgetpgrp __P((int));
 int     tcsetpgrp __P((int, pid_t));
 long    sysconf __P((int));                    /* not yet */
 pid_t   tcgetpgrp __P((int));
 int     tcsetpgrp __P((int, pid_t));


@@ -96,8 +90,8 @@ int    exect __P((const char *, char * const *, char * const *));
 int     fchdir __P((int));
 int     fchflags __P((int, long));
 int     fchown __P((int, int, int));
 int     fchdir __P((int));
 int     fchflags __P((int, long));
 int     fchown __P((int, int, int));

-int     fnmatch __P((const char *, const char *, int));

 int     fsync __P((int));
 int     fsync __P((int));

+#define         ftruncate __ftruncate

 int     ftruncate __P((int, off_t));
 int     getdtablesize __P((void));
 long    gethostid __P((void));
 int     ftruncate __P((int, off_t));
 int     getdtablesize __P((void));
 long    gethostid __P((void));


@@ -109,13 +103,14 @@ char      *getpass __P((const char *));
 char   *getusershell __P((void));
 char   *getwd __P((char *));                   /* obsoleted by getcwd() */
 int     initgroups __P((const char *, int));
 char   *getusershell __P((void));
 char   *getwd __P((char *));                   /* obsoleted by getcwd() */
 int     initgroups __P((const char *, int));

+int     iruserok __P((unsigned long, int, const char *, const char *));

 int     mknod __P((const char *, mode_t, dev_t));
 int     mkstemp __P((char *));
 char   *mktemp __P((char *));
 int     mknod __P((const char *, mode_t, dev_t));
 int     mkstemp __P((char *));
 char   *mktemp __P((char *));

-int     nfssvc __P((int));
+int     nfssvc __P((int, caddr_t));

 int     nice __P((int));
 int     nice __P((int));

-void    psignal __P((u_int, const char *));
-extern char *sys_siglist[];
+void    psignal __P((unsigned int, const char *));
+extern char *const sys_siglist[];

 int     profil __P((char *, int, int, int));
 int     rcmd __P((char **, int, const char *,
                const char *, const char *, int *));
 int     profil __P((char *, int, int, int));
 int     rcmd __P((char **, int, const char *,
                const char *, const char *, int *));


@@ -146,10 +141,11 @@ int        swapon __P((const char *));
 int     symlink __P((const char *, const char *));
 void    sync __P((void));
 int     syscall __P((int, ...));
 int     symlink __P((const char *, const char *));
 void    sync __P((void));
 int     syscall __P((int, ...));

+#define         truncate __truncate

 int     truncate __P((const char *, off_t));
 int     ttyslot __P((void));
 int     truncate __P((const char *, off_t));
 int     ttyslot __P((void));

-u_int   ualarm __P((u_int, u_int));
-void    usleep __P((u_int));
+unsigned int    ualarm __P((unsigned int, unsigned int));
+void    usleep __P((unsigned int));

 void   *valloc __P((size_t));                  /* obsoleted by malloc() */
 int     vfork __P((void));
 
 void   *valloc __P((size_t));                  /* obsoleted by malloc() */
 int     vfork __P((void));