BSD 4_3_Net_2 release

[unix-history] / usr / src / sys / sys / wait.h

diff --git a/usr/src/sys/sys/wait.h b/usr/src/sys/sys/wait.h
index 334d00c..de3a50d 100644 (file)
--- a/usr/src/sys/sys/wait.h
+++ b/usr/src/sys/sys/wait.h
@@ -2,22 +2,35 @@
  * Copyright (c) 1982, 1986, 1989 The Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1982, 1986, 1989 The Regents of the University of California.
  * All rights reserved.
  *

- * Redistribution is only permitted until one year after the first shipment
- * of 4.4BSD by the Regents.  Otherwise, redistribution and use in source and
- * binary forms are permitted provided that: (1) source distributions retain
- * this entire copyright notice and comment, and (2) distributions including
- * binaries display the following acknowledgement:  This product includes
- * software developed by the University of California, Berkeley and its
- * contributors'' in the documentation or other materials provided with the
- * distribution and in all advertising materials mentioning features or use
- * of this software.  Neither the name of the University nor the names of
- * its contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.

  *
  *

- *     @(#)wait.h      7.9 (Berkeley) 6/28/90
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *     @(#)wait.h      7.17 (Berkeley) 6/19/91

  */
 
 /*
  */
 
 /*


@@ -89,15 +102,16 @@ union wait {
         */
        struct {
 #if BYTE_ORDER == LITTLE_ENDIAN 
         */
        struct {
 #if BYTE_ORDER == LITTLE_ENDIAN 

-               unsigned short  w_Termsig:7;    /* termination signal */
-               unsigned short  w_Coredump:1;   /* core dump indicator */
-               unsigned short  w_Retcode:8;    /* exit code if w_termsig==0 */
+               unsigned int    w_Termsig:7,    /* termination signal */
+                               w_Coredump:1,   /* core dump indicator */
+                               w_Retcode:8,    /* exit code if w_termsig==0 */
+                               w_Filler:16;    /* upper bits filler */

 #endif
 #if BYTE_ORDER == BIG_ENDIAN 
 #endif
 #if BYTE_ORDER == BIG_ENDIAN 

-               unsigned short  w_Filler;       /* upper bits filler */
-               unsigned char   w_Retcode;      /* exit code if w_termsig==0 */
-               unsigned char   w_Coredump:1;   /* core dump indicator */
-               unsigned char   w_Termsig:7;    /* termination signal */
+               unsigned int    w_Filler:16,    /* upper bits filler */
+                               w_Retcode:8,    /* exit code if w_termsig==0 */
+                               w_Coredump:1,   /* core dump indicator */
+                               w_Termsig:7;    /* termination signal */

 #endif
        } w_T;
        /*
 #endif
        } w_T;
        /*


@@ -107,12 +121,14 @@ union wait {
         */
        struct {
 #if BYTE_ORDER == LITTLE_ENDIAN 
         */
        struct {
 #if BYTE_ORDER == LITTLE_ENDIAN 

-               unsigned short  w_Stopval:8;    /* == W_STOPPED if stopped */
-               unsigned short  w_Stopsig:8;    /* signal that stopped us */
-#else
-               unsigned short  w_Filler;       /* upper bits filler */
-               unsigned char   w_Stopsig;      /* signal that stopped us */
-               unsigned char   w_Stopval;      /* == W_STOPPED if stopped */
+               unsigned int    w_Stopval:8,    /* == W_STOPPED if stopped */
+                               w_Stopsig:8,    /* signal that stopped us */
+                               w_Filler:16;    /* upper bits filler */
+#endif
+#if BYTE_ORDER == BIG_ENDIAN 
+               unsigned int    w_Filler:16,    /* upper bits filler */
+                               w_Stopsig:8,    /* signal that stopped us */
+                               w_Stopval:8;    /* == W_STOPPED if stopped */

 #endif
        } w_S;
 };
 #endif
        } w_S;
 };


@@ -124,3 +140,19 @@ union wait {
 
 #define        WSTOPPED        _WSTOPPED
 #endif /* _POSIX_SOURCE */
 
 #define        WSTOPPED        _WSTOPPED
 #endif /* _POSIX_SOURCE */

+
+#ifndef KERNEL
+#include <sys/types.h>
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+struct rusage; /* forward declaration */
+
+pid_t  wait __P((int *));
+pid_t  waitpid __P((pid_t, int *, int));
+#ifndef _POSIX_SOURCE
+pid_t  wait3 __P((int *, int, struct rusage *));
+pid_t  wait4 __P((pid_t, int *, int, struct rusage *));
+#endif
+__END_DECLS
+#endif