Changeset 1624

Timestamp:

Nov 8, 2004, 2:06:04 AM (21 years ago)

Author:

bird

Message:

Updated some headers to 5.2/3 level.

Location:

trunk/src/emx/include

Files:

• InnoTekLIBC/backend.h (modified) (1 diff, 1 prop)
• InnoTekLIBC/sharedpm.h (modified) (3 diffs, 1 prop)
• getopt.h (modified) (4 diffs, 1 prop)
• signal.h (modified) (2 diffs, 1 prop)
• sys/_null.h (added)
• sys/signal.h (modified) (1 diff, 1 prop)
• sys/unistd.h (added)
• unistd.h (modified) (11 diffs, 1 prop)

trunk/src/emx/include/InnoTekLIBC/backend.h

@@ -500 +500 @@
 
 /**
- * Worker called after __libc_Back_signalRaise() was called with a
- * preallocated signal queue entry. This function will make sure
- * we're not ending up with too many heap allocated packets in the
- * free list.
- */
-void __libc_Back_signalFreeWorker(void);
+ * Queue a signal.
+ *
+ * @returns 0 on success.
+ * @returns -1 on failure, errno set.
+ * @param   pid             The target process id.
+ * @param   iSignalNo       Signal to queue.
+ * @param   SigVal          The value to associate with the signal.
+ */
+int __libc_Back_signalQueue(pid_t pid, int iSignalNo, const union sigval SigVal);
 
 /**

trunk/src/emx/include/InnoTekLIBC/sharedpm.h

@@ -108 +108 @@
 } __LIBC_EXIT_REASON;
 
-
-/** The maximum number of signals a process can have pending on other processes concurrently. */
-#define __LIBC_SPM_SIGNALS_MAX_SENT 48
 
 /**
@@ -284 +281 @@
     volatile __LIBC_PSPMSIGNAL  pSigHead;
     /** Number of signals send.
-     * After __LIBC_SPM_SIGNALS_MAX_SENT signals only SIGCHLD will be allowed sent.
+     * After _POSIX_SIGQUEUE_MAX signals only SIGCHLD will be allowed sent.
      */
     volatile unsigned           cSigsSent;
@@ -295 +292 @@
 
     /** Reserved pool pointer field with default value 0. */
-    unsigned                    aReserved[40 - 16];
+    unsigned                    aReserved[40 - 17];
 
     /** Number of possible pointers to shared memory starting at pvInherit.

trunk/src/emx/include/getopt.h

@@ -1 +1 @@
 /* getopt.h,v 1.6 2004/09/14 22:27:33 bird Exp */
 /** @file
- * FreeBSD 5.1
- * @changed bird: Added two GNU apis for libiberty.
+ * FreeBSD 5.2
+ * @changed bird: Added one GNU api from libiberty.
  */
 
 /*      $NetBSD: getopt.h,v 1.4 2000/07/07 10:43:54 ad Exp $    */
-/*      $FreeBSD: src/include/getopt.h,v 1.1 2002/09/29 04:14:30 eric Exp $ */
+/*      $FreeBSD: src/include/getopt.h,v 1.6 2004/02/24 08:09:20 ache Exp $ */
 
 /*-
@@ -44 +44 @@
  */
 
-
 #ifndef _GETOPT_H_
 #define _GETOPT_H_
 
 #include <sys/cdefs.h>
-#include <unistd.h>
 
 /*
- * Gnu like getopt_long() and BSD4.4 getsubopt()/optreset extensions
+ * GNU-like getopt_long()/getopt_long_only() with 4.4BSD optreset extension.
+ * getopt() is declared here too for GNU programs.
  */
-#if !defined(_POSIX_SOURCE) && !defined(_XOPEN_SOURCE)
 #define no_argument        0
 #define required_argument  1
@@ -74 +72 @@
 
 __BEGIN_DECLS
-int getopt_long __P((int, char * const *, const char *,
-    const struct option *, int *));
+int     getopt_long(int, char * const *, const char *,
+        const struct option *, int *);
+int     getopt_long_only(int, char * const *, const char *,
+        const struct option *, int *);
+#ifndef _GETOPT_DECLARED
+#define _GETOPT_DECLARED
+int      getopt(int, char * const [], const char *);
 
-/* bird - start: these are provided thru libiberty. */
-int getopt_long_only __P((int argc, char *const *, const char *,
-    const struct option *, int *));
+extern char *optarg;                    /* getopt(3) external variables */
+extern int optind, opterr, optopt;
+#endif
+#ifndef _OPTRESET_DECLARED
+#define _OPTRESET_DECLARED
+extern int optreset;                    /* getopt(3) external variable */
+#endif
+
+/* bird - start: this is provided thru libiberty. */
 int _getopt_internal __P((int, char *const *, const char *,
     const struct option *, int *, int));
@@ -85 +94 @@
 
 __END_DECLS
-#endif
 
 #endif /* !_GETOPT_H_ */

trunk/src/emx/include/signal.h

@@ -91 +91 @@
  * in scope (in the current implementation), so we can't use it here.
  */
+#endif /* bird we do */
 int     sigqueue(__pid_t, int, const union sigval);
-#endif
 struct timespec;
 int     sigtimedwait(const sigset_t * __restrict, siginfo_t * __restrict,
@@ -124 +124 @@
 int     sigignore(int);
 int     sigrelse(int);
+void  (*sigset(int, void (*)(int)))(int);
 #endif
 #if __BSD_VISIBLE && !defined(_XOPEN_SOURCE) && !defined(sigpause)

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

@@ -364 +364 @@
 typedef union sigval
 {
+    /** Interger value. */
+    int     sival_int;
+    /** Pointer value. */
+    void   *sival_ptr;
+    /** FreeBSD names - probably a typo in the FreeBSD, but anyway.
+     * @{ */
     int     sigval_int;
     void   *sigval_ptr;
+    /** @} */
 } sigval_t;
 #endif

trunk/src/emx/include/unistd.h

@@ -1 +1 @@
 /* $Id: */
 /** @file
- * EMX/FreeBSD 5.1
+ * FreeBSD 5.3
  *
  * @changed Commented out stuff which isn't implemented, TCPIP stuff at bottom.
- * @todo    Several man-years.. ;) Serious, complete the FreeBSD 5.1 merge and
+ * @todo    Several man-years.. ;) Serious, complete the FreeBSD 5.3 merge and
  *          implement all the functions. Currently there is a bunch of POSIX
  *          #defines missing.
@@ -42 +42 @@
  *
  *      @(#)unistd.h    8.12 (Berkeley) 4/27/95
- * $FreeBSD: src/include/unistd.h,v 1.66 2002/12/29 01:07:55 mike Exp $
+ * $FreeBSD: src/include/unistd.h,v 1.73 2004/02/23 04:51:07 ache Exp $
  */
 
@@ -49 +49 @@
 #define _UNISTD_H                       /* bird: emx */
 
-
 #include <sys/cdefs.h>
 #include <sys/types.h>                  /* XXX adds too much pollution. */
-/** @todo port FreeBSD sys/unistd.h: #include <sys/unistd.h> */
+#include <sys/unistd.h>
+#include <sys/_null.h>
 #include <sys/_types.h>
 
@@ -96 +96 @@
 #endif
 
-#if !defined(STDIN_FILENO)              /* bird: emx */
 #define  STDIN_FILENO   0       /* standard input file descriptor */
 #define STDOUT_FILENO   1       /* standard output file descriptor */
 #define STDERR_FILENO   2       /* standard error file descriptor */
-#endif
-
-#ifndef NULL
-#define NULL            0       /* null pointer constant */
-#endif
 
 #if __XSI_VISIBLE || __POSIX_VISIBLE >= 200112
@@ -113 +107 @@
 #endif
 
-
-/** @todo: big todo to get in all the POSIX defines. */
-
-/* whence values for lseek(2) */
-#ifndef SEEK_SET
-#define SEEK_SET        0       /* set file offset to offset */
-#define SEEK_CUR        1       /* set file offset to current plus offset */
-#define SEEK_END        2       /* set file offset to EOF plus offset */
-#endif
-
-#ifndef _POSIX_SOURCE
-/* whence values for lseek(2); renamed by POSIX 1003.1 */
-#define L_SET           SEEK_SET
-#define L_INCR          SEEK_CUR
-#define L_XTND          SEEK_END
-#endif
-
-#if !defined (F_OK)
-#define F_OK 0
-#define X_OK 1
-#define W_OK 2
-#define R_OK 4
-#endif
-
-#if !defined (SEEK_SET)
-#define SEEK_SET 0
-#define SEEK_CUR 1
-#define SEEK_END 2
-#endif
-
-#if !defined (_PC_LINK_MAX)
-#define _PC_LINK_MAX            1
-#define _PC_MAX_CANON           2
-#define _PC_MAX_INPUT           3
-#define _PC_NAME_MAX            4
-#define _PC_PATH_MAX            5
-#define _PC_PIPE_BUF            6
-#define _PC_CHOWN_RESTRICTED    7
-#define _PC_NO_TRUNC            8
-#define _PC_VDISABLE            9
-#endif
-
-#if !defined (_SC_ARG_MAX)
-#define _SC_ARG_MAX             1
-#define _SC_CHILD_MAX           2
-#define _SC_CLK_TCK             3
-#define _SC_NGROUPS_MAX         4
-#define _SC_OPEN_MAX            5
-#define _SC_STREAM_MAX          6
-#define _SC_TZNAME_MAX          7
-#define _SC_JOB_CONTROL         8
-#define _SC_SAVED_IDS           9
-#define _SC_VERSION             10
-#endif
-
-#if !defined (_POSIX_VERSION)
-#define _POSIX_VERSION          199009L
-#endif
-
+/*
+ * POSIX options and option groups we unconditionally do or don't
+ * implement.  This list includes those options which are exclusively
+ * implemented (or not) in user mode.  Please keep this list in
+ * alphabetical order.
+ *
+ * Anything which is defined as zero below **must** have an
+ * implementation for the corresponding sysconf() which is able to
+ * determine conclusively whether or not the feature is supported.
+ * Anything which is defined as other than -1 below **must** have
+ * complete headers, types, and function declarations as specified by
+ * the POSIX standard; however, if the relevant sysconf() function
+ * returns -1, the functions may be stubbed out.
+ */
+#define _POSIX_BARRIERS                 -1
+#define _POSIX_READER_WRITER_LOCKS      200112L
+#define _POSIX_REGEXP                   1
+#define _POSIX_SHELL                    1
+#define _POSIX_SPAWN                    -1
+#define _POSIX_SPIN_LOCKS               -1
+#define _POSIX_THREAD_ATTR_STACKADDR    200112L
+#define _POSIX_THREAD_ATTR_STACKSIZE    200112L
+#define _POSIX_THREAD_CPUTIME           -1
+#define _POSIX_THREAD_PRIO_INHERIT      200112L
+#define _POSIX_THREAD_PRIO_PROTECT      200112L
+#define _POSIX_THREAD_PRIORITY_SCHEDULING 200112L
+#define _POSIX_THREAD_PROCESS_SHARED    -1
+#define _POSIX_THREAD_SAFE_FUNCTIONS    -1
+#define _POSIX_THREAD_SPORADIC_SERVER   -1
+#define _POSIX_THREADS                  200112L
+#define _POSIX_TRACE                    -1
+#define _POSIX_TRACE_EVENT_FILTER       -1
+#define _POSIX_TRACE_INHERIT            -1
+#define _POSIX_TRACE_LOG                -1
+#define _POSIX2_C_BIND                  200112L /* mandatory */
+#define _POSIX2_C_DEV                   -1 /* need c99 utility */
+#define _POSIX2_CHAR_TERM               1
+#define _POSIX2_FORT_DEV                -1 /* need fort77 utility */
+#define _POSIX2_FORT_RUN                200112L
+#define _POSIX2_LOCALEDEF               -1
+#define _POSIX2_PBS                     -1
+#define _POSIX2_PBS_ACCOUNTING          -1
+#define _POSIX2_PBS_CHECKPOINT          -1
+#define _POSIX2_PBS_LOCATE              -1
+#define _POSIX2_PBS_MESSAGE             -1
+#define _POSIX2_PBS_TRACK               -1
+#define _POSIX2_SW_DEV                  -1 /* XXX ??? */
+#define _POSIX2_UPE                     200112L
+#define _V6_ILP32_OFF32                 -1
+#define _V6_ILP32_OFFBIG                0
+#define _V6_LP64_OFF64                  0
+#define _V6_LPBIG_OFFBIG                -1
+
+#if __XSI_VISIBLE
+#define _XOPEN_CRYPT                    -1 /* XXX ??? */
+#define _XOPEN_ENH_I18N                 -1 /* mandatory in XSI */
+#define _XOPEN_LEGACY                   -1
+#define _XOPEN_REALTIME                 -1
+#define _XOPEN_REALTIME_THREADS         -1
+#define _XOPEN_UNIX                     -1
+#endif
+
+/* Define the POSIX.2 version we target for compliance. */
+#define _POSIX2_VERSION         199212L
+
+/*
+ * POSIX-style system configuration variable accessors (for the
+ * sysconf function).  The kernel does not directly implement the
+ * sysconf() interface; rather, a C library stub translates references
+ * to sysconf() into calls to sysctl() using a giant switch statement.
+ * Those that are marked `user' are implemented entirely in the C
+ * library and never query the kernel.  pathconf() is implemented
+ * directly by the kernel so those are not defined here.
+ */
+#define _SC_ARG_MAX              1
+#define _SC_CHILD_MAX            2
+#define _SC_CLK_TCK              3
+#define _SC_NGROUPS_MAX          4
+#define _SC_OPEN_MAX             5
+#define _SC_JOB_CONTROL          6
+#define _SC_SAVED_IDS            7
+#define _SC_VERSION              8
+#define _SC_BC_BASE_MAX          9 /* user */
+#define _SC_BC_DIM_MAX          10 /* user */
+#define _SC_BC_SCALE_MAX        11 /* user */
+#define _SC_BC_STRING_MAX       12 /* user */
+#define _SC_COLL_WEIGHTS_MAX    13 /* user */
+#define _SC_EXPR_NEST_MAX       14 /* user */
+#define _SC_LINE_MAX            15 /* user */
+#define _SC_RE_DUP_MAX          16 /* user */
+#define _SC_2_VERSION           17 /* user */
+#define _SC_2_C_BIND            18 /* user */
+#define _SC_2_C_DEV             19 /* user */
+#define _SC_2_CHAR_TERM         20 /* user */
+#define _SC_2_FORT_DEV          21 /* user */
+#define _SC_2_FORT_RUN          22 /* user */
+#define _SC_2_LOCALEDEF         23 /* user */
+#define _SC_2_SW_DEV            24 /* user */
+#define _SC_2_UPE               25 /* user */
+#define _SC_STREAM_MAX          26 /* user */
+#define _SC_TZNAME_MAX          27 /* user */
+
+#if __POSIX_VISIBLE >= 199309
+#define _SC_ASYNCHRONOUS_IO     28
+#define _SC_MAPPED_FILES        29
+#define _SC_MEMLOCK             30
+#define _SC_MEMLOCK_RANGE       31
+#define _SC_MEMORY_PROTECTION   32
+#define _SC_MESSAGE_PASSING     33
+#define _SC_PRIORITIZED_IO      34
+#define _SC_PRIORITY_SCHEDULING 35
+#define _SC_REALTIME_SIGNALS    36
+#define _SC_SEMAPHORES          37
+#define _SC_FSYNC               38
+#define _SC_SHARED_MEMORY_OBJECTS 39
+#define _SC_SYNCHRONIZED_IO     40
+#define _SC_TIMERS              41
+#define _SC_AIO_LISTIO_MAX      42
+#define _SC_AIO_MAX             43
+#define _SC_AIO_PRIO_DELTA_MAX  44
+#define _SC_DELAYTIMER_MAX      45
+#define _SC_MQ_OPEN_MAX         46
+#define _SC_PAGESIZE            47
+#define _SC_RTSIG_MAX           48
+#define _SC_SEM_NSEMS_MAX       49
+#define _SC_SEM_VALUE_MAX       50
+#define _SC_SIGQUEUE_MAX        51
+#define _SC_TIMER_MAX           52
+#endif
+
+#if __POSIX_VISIBLE >= 200112
+#define _SC_2_PBS               59 /* user */
+#define _SC_2_PBS_ACCOUNTING    60 /* user */
+#define _SC_2_PBS_CHECKPOINT    61 /* user */
+#define _SC_2_PBS_LOCATE        62 /* user */
+#define _SC_2_PBS_MESSAGE       63 /* user */
+#define _SC_2_PBS_TRACK         64 /* user */
+#define _SC_ADVISORY_INFO       65
+#define _SC_BARRIERS            66 /* user */
+#define _SC_CLOCK_SELECTION     67
+#define _SC_CPUTIME             68
+#define _SC_FILE_LOCKING        69
+#define _SC_GETGR_R_SIZE_MAX    70 /* user */
+#define _SC_GETPW_R_SIZE_MAX    71 /* user */
+#define _SC_HOST_NAME_MAX       72
+#define _SC_LOGIN_NAME_MAX      73
+#define _SC_MONOTONIC_CLOCK     74
+#define _SC_MQ_PRIO_MAX         75
+#define _SC_READER_WRITER_LOCKS 76 /* user */
+#define _SC_REGEXP              77 /* user */
+#define _SC_SHELL               78 /* user */
+#define _SC_SPAWN               79 /* user */
+#define _SC_SPIN_LOCKS          80 /* user */
+#define _SC_SPORADIC_SERVER     81
+#define _SC_THREAD_ATTR_STACKADDR 82 /* user */
+#define _SC_THREAD_ATTR_STACKSIZE 83 /* user */
+#define _SC_THREAD_CPUTIME      84 /* user */
+#define _SC_THREAD_DESTRUCTOR_ITERATIONS 85 /* user */
+#define _SC_THREAD_KEYS_MAX     86 /* user */
+#define _SC_THREAD_PRIO_INHERIT 87 /* user */
+#define _SC_THREAD_PRIO_PROTECT 88 /* user */
+#define _SC_THREAD_PRIORITY_SCHEDULING 89 /* user */
+#define _SC_THREAD_PROCESS_SHARED 90 /* user */
+#define _SC_THREAD_SAFE_FUNCTIONS 91 /* user */
+#define _SC_THREAD_SPORADIC_SERVER 92 /* user */
+#define _SC_THREAD_STACK_MIN    93 /* user */
+#define _SC_THREAD_THREADS_MAX  94 /* user */
+#define _SC_TIMEOUTS            95 /* user */
+#define _SC_THREADS             96 /* user */
+#define _SC_TRACE               97 /* user */
+#define _SC_TRACE_EVENT_FILTER  98 /* user */
+#define _SC_TRACE_INHERIT       99 /* user */
+#define _SC_TRACE_LOG           100 /* user */
+#define _SC_TTY_NAME_MAX        101 /* user */
+#define _SC_TYPED_MEMORY_OBJECTS 102
+#define _SC_V6_ILP32_OFF32      103 /* user */
+#define _SC_V6_ILP32_OFFBIG     104 /* user */
+#define _SC_V6_LP64_OFF64       105 /* user */
+#define _SC_V6_LPBIG_OFFBIG     106 /* user */
+#define _SC_IPV6                118
+#define _SC_RAW_SOCKETS         119
+#define _SC_SYMLOOP_MAX         120
+#endif
+
+#if __XSI_VISIBLE
+#define _SC_ATEXIT_MAX          107 /* user */
+#define _SC_IOV_MAX             56
+#define _SC_PAGE_SIZE           _SC_PAGESIZE
+#define _SC_XOPEN_CRYPT         108 /* user */
+#define _SC_XOPEN_ENH_I18N      109 /* user */
+#define _SC_XOPEN_LEGACY        110 /* user */
+#define _SC_XOPEN_REALTIME      111
+#define _SC_XOPEN_REALTIME_THREADS 112
+#define _SC_XOPEN_SHM           113
+#define _SC_XOPEN_STREAMS       114
+#define _SC_XOPEN_UNIX          115
+#define _SC_XOPEN_VERSION       116
+#define _SC_XOPEN_XCU_VERSION   117 /* user */
+#endif
+
+#if __BSD_VISIBLE
+#define _SC_NPROCESSORS_CONF    57
+#define _SC_NPROCESSORS_ONLN    58
+#endif
+
+/* Keys for the confstr(3) function. */
+#if __POSIX_VISIBLE >= 199209
+#define _CS_PATH                1       /* default value of PATH */
+#endif
+
+#if __POSIX_VISIBLE >= 200112
+#define _CS_POSIX_V6_ILP32_OFF32_CFLAGS         2
+#define _CS_POSIX_V6_ILP32_OFF32_LDFLAGS        3
+#define _CS_POSIX_V6_ILP32_OFF32_LIBS           4
+#define _CS_POSIX_V6_ILP32_OFFBIG_CFLAGS        5
+#define _CS_POSIX_V6_ILP32_OFFBIG_LDFLAGS       6
+#define _CS_POSIX_V6_ILP32_OFFBIG_LIBS          7
+#define _CS_POSIX_V6_LP64_OFF64_CFLAGS          8
+#define _CS_POSIX_V6_LP64_OFF64_LDFLAGS         9
+#define _CS_POSIX_V6_LP64_OFF64_LIBS            10
+#define _CS_POSIX_V6_LPBIG_OFFBIG_CFLAGS        11
+#define _CS_POSIX_V6_LPBIG_OFFBIG_LDFLAGS       12
+#define _CS_POSIX_V6_LPBIG_OFFBIG_LIBS          13
+#define _CS_POSIX_V6_WIDTH_RESTRICTED_ENVS      14
+#endif
 
 __BEGIN_DECLS
 /* 1003.1-1990 */
-void     _exit(int) __dead2;
-int      access(const char *, int);
-unsigned int     alarm(unsigned int);
-int      chdir(const char *);
+void     _exit(int) __dead2;
+int      access(const char *, int);
+unsigned int     alarm(unsigned int);
+int      chdir(const char *);
 int      chown(const char *, uid_t, gid_t);
-int      close(int);
-char *   cuserid(char *); /* bird: emx/todo/obosolete? */
-int      dup(int);
-int      dup2(int, int);
+int      close(int);
+int      dup(int);
+int      dup2(int, int);
 int      eaccess(const char *, int);
-int      execl(const char *, const char *, ...);
-int      execle(const char *, const char *, ...);
-int      execlp(const char *, const char *, ...);
-int      execv(const char *, char * const *);
-int      execve(const char *, char * const *, char * const *);
-int      execvp(const char *, char * const *);
-pid_t    fork(void);
-long     fpathconf(int, int);
-char    *getcwd(char *, size_t);
-gid_t    getegid(void);
-uid_t    geteuid(void);
-gid_t    getgid(void);
-int      getgroups(int, gid_t []);
-char    *getlogin(void);
-pid_t    getpgrp(void);
-pid_t    getpid(void);
-pid_t    getppid(void);
-uid_t    getuid(void);
-int      isatty(int);
+int      execl(const char *, const char *, ...);
+int      execle(const char *, const char *, ...);
+int      execlp(const char *, const char *, ...);
+int      execv(const char *, char * const *);
+int      execve(const char *, char * const *, char * const *);
+int      execvp(const char *, char * const *);
+pid_t    fork(void);
+long     fpathconf(int, int);
+char    *getcwd(char *, size_t);
+gid_t    getegid(void);
+uid_t    geteuid(void);
+gid_t    getgid(void);
+int      getgroups(int, gid_t []);
+char    *getlogin(void);
+pid_t    getpgrp(void);
+pid_t    getpid(void);
+pid_t    getppid(void);
+uid_t    getuid(void);
+int      isatty(int);
 int      link(const char *, const char *);
 #ifndef _LSEEK_DECLARED
 #define _LSEEK_DECLARED
-off_t    lseek(int, off_t, int);
-#endif
-long     pathconf(const char *, int);
-int      pause(void);
-int      pipe(int *);
-ssize_t  read(int, void *, size_t);
-int      rmdir(const char *);
-int      setgid(gid_t);
-/** @todo void   setproctitle(const char *_fmt, ...) __printf0like(1, 2); */
-int      setpgid(pid_t, pid_t);
-pid_t    setsid(void);
-int      setuid(uid_t);
-unsigned sleep(unsigned);
-long     sysconf(int);
-pid_t    tcgetpgrp(int);
-int      tcsetpgrp(int, pid_t);
-char    *ttyname(int);
-int      unlink(const char *);
-int      write(int, const void *, size_t);
+off_t    lseek(int, off_t, int);
+#endif
+long     pathconf(const char *, int);
+int      pause(void);
+int      pipe(int *);
+ssize_t  read(int, void *, size_t);
+int      rmdir(const char *);
+int      setgid(gid_t);
+int      setpgid(pid_t, pid_t);
+void     setproctitle(const char *_fmt, ...) __printf0like(1, 2);
+pid_t    setsid(void);
+int      setuid(uid_t);
+unsigned int     sleep(unsigned int);
+long     sysconf(int);
+pid_t    tcgetpgrp(int);
+int      tcsetpgrp(int, pid_t);
+char    *ttyname(int);
+int      unlink(const char *);
+ssize_t  write(int, const void *, size_t);
 
 /* 1003.2-1992 */
 #if __POSIX_VISIBLE >= 199209 || __XSI_VISIBLE
 /** @todo size_t         confstr(int, char *, size_t);*/
+#ifndef _GETOPT_DECLARED
+#define _GETOPT_DECLARED
 int      getopt(int, char * const [], const char *);
 
 extern char *optarg;                    /* getopt(3) external variables */
 extern int optind, opterr, optopt;
+#endif /* _GETOPT_DECLARED */
 #endif
 
@@ -260 +422 @@
 #endif
 #if __POSIX_VISIBLE >= 200112
-/* tcpip: int    gethostname(char *, int / * socklen_t * /); */
+/* tcpip: int    gethostname(char *, size_t); */
 /** @todo int    setegid(gid_t);  */
 /** @todo int    seteuid(uid_t); */
@@ -311 +473 @@
 int      getpagesize(void) __pure2;
 char    *getpass(const char *);
-char    *_getpass1(const char *);          /* bird: emx stuff */
-char    *_getpass2(const char *, int);     /* bird: emx stuff */
 void    *sbrk(intptr_t);
 #endif
@@ -328 +488 @@
 void     endusershell(void);
 /** @todo int    exect(const char *, char * const *, char * const *); */
+/** @todo int    execvP(const char *, const char *, char * const *); */
 /** @todo char  *fflagstostr(u_long); */
 /** @todo int    getdomainname(char *, int); */
@@ -399 +560 @@
 void    *valloc(size_t);                        /* obsoleted by malloc() */
 
-/** @todo extern char *suboptarg; */                    /* getsubopt(3) external variable */
-/** @todo #ifndef _GETSUBOPT_DECLARED */
-/** @todo int    getsubopt(char **, char * const *, char **); */
-/** @todo #define       _GETSUBOPT_DECLARED */
-/** @todo #endif */
+#ifndef _OPTRESET_DECLARED
+#define _OPTRESET_DECLARED
 extern int optreset;                    /* getopt(3) external variable */
+#endif
 #endif /* __BSD_VISIBLE */
 
@@ -419 +578 @@
  * EMX stuff.
  */
+#if __XSI_VISIBLE <= 500 || __BSD_VISIBLE
+char    *_getpass1(const char *);
+char    *_getpass2(const char *, int);
+#endif
+
 #if !defined(_POSIX_SOURCE) || defined(_WITH_UNDERSCORE)
 /** @todo update this section to match the one without underscores as far as needed! */
@@ -513 +677 @@
 __END_DECLS
 
-#endif /* not _UNISTD_H */
+#endif /* !_UNISTD_H_ */