Sat Apr 2 11:18:26 2016 UTC ()
correct the definition of WSTOPPED


(christos)
diff -r1.26 -r1.27 src/sys/sys/wait.h
cvs diff -r1.26 -r1.27 src/sys/sys/wait.h (expand / switch to unified diff)

--- src/sys/sys/wait.h 2009/01/11 02:45:56 1.26
+++ src/sys/sys/wait.h 2016/04/02 11:18:26 1.27
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: wait.h,v 1.26 2009/01/11 02:45:56 christos Exp $ */ 1/* $NetBSD: wait.h,v 1.27 2016/04/02 11:18:26 christos Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1982, 1986, 1989, 1993, 1994 4 * Copyright (c) 1982, 1986, 1989, 1993, 1994
5 * The Regents of the University of California. All rights reserved. 5 * The Regents of the University of California. All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -69,26 +69,27 @@ @@ -69,26 +69,27 @@
69 69
70/* 70/*
71 * Option bits for the third argument of wait4. WNOHANG causes the 71 * Option bits for the third argument of wait4. WNOHANG causes the
72 * wait to not hang if there are no stopped or terminated processes, rather 72 * wait to not hang if there are no stopped or terminated processes, rather
73 * returning an error indication in this case (pid==0). WUNTRACED 73 * returning an error indication in this case (pid==0). WUNTRACED
74 * indicates that the caller should receive status about untraced children 74 * indicates that the caller should receive status about untraced children
75 * which stop due to signals. If children are stopped and a wait without 75 * which stop due to signals. If children are stopped and a wait without
76 * this option is done, it is as though they were still running... nothing 76 * this option is done, it is as though they were still running... nothing
77 * about them is returned. 77 * about them is returned.
78 */ 78 */
79#define WNOHANG 0x00000001 /* don't hang in wait */ 79#define WNOHANG 0x00000001 /* don't hang in wait */
80#define WUNTRACED 0x00000002 /* tell about stopped, 80#define WUNTRACED 0x00000002 /* tell about stopped,
81 untraced children */ 81 untraced children */
 82#define WSTOPPED WUNTRACED /* SUS compatibility */
82#if defined(_XOPEN_SOURCE) || defined(_NETBSD_SOURCE) 83#if defined(_XOPEN_SOURCE) || defined(_NETBSD_SOURCE)
83#define WALTSIG 0x00000004 /* wait for processes that exit 84#define WALTSIG 0x00000004 /* wait for processes that exit
84 with an alternate signal (i.e. 85 with an alternate signal (i.e.
85 not SIGCHLD) */ 86 not SIGCHLD) */
86#define WALLSIG 0x00000008 /* wait for processes that exit 87#define WALLSIG 0x00000008 /* wait for processes that exit
87 with any signal, i.e. SIGCHLD 88 with any signal, i.e. SIGCHLD
88 and alternates */ 89 and alternates */
89 90
90/* 91/*
91 * These are the Linux names of some of the above flags, for compatibility 92 * These are the Linux names of some of the above flags, for compatibility
92 * with Linux's clone(2) API. 93 * with Linux's clone(2) API.
93 */ 94 */
94#define __WCLONE WALTSIG 95#define __WCLONE WALTSIG
@@ -153,27 +154,26 @@ union wait { @@ -153,27 +154,26 @@ union wait {
153#if BYTE_ORDER == BIG_ENDIAN 154#if BYTE_ORDER == BIG_ENDIAN
154 unsigned int w_Filler:16, /* upper bits filler */ 155 unsigned int w_Filler:16, /* upper bits filler */
155 w_Stopsig:8, /* signal that stopped us */ 156 w_Stopsig:8, /* signal that stopped us */
156 w_Stopval:8; /* == W_STOPPED if stopped */ 157 w_Stopval:8; /* == W_STOPPED if stopped */
157#endif 158#endif
158 } w_S; 159 } w_S;
159}; 160};
160#define w_termsig w_T.w_Termsig 161#define w_termsig w_T.w_Termsig
161#define w_coredump w_T.w_Coredump 162#define w_coredump w_T.w_Coredump
162#define w_retcode w_T.w_Retcode 163#define w_retcode w_T.w_Retcode
163#define w_stopval w_S.w_Stopval 164#define w_stopval w_S.w_Stopval
164#define w_stopsig w_S.w_Stopsig 165#define w_stopsig w_S.w_Stopsig
165 166
166#define WSTOPPED _WSTOPPED 
167#endif /* _XOPEN_SOURCE || _NETBSD_SOURCE */ 167#endif /* _XOPEN_SOURCE || _NETBSD_SOURCE */
168 168
169#ifndef _KERNEL 169#ifndef _KERNEL
170#include <sys/cdefs.h> 170#include <sys/cdefs.h>
171 171
172__BEGIN_DECLS 172__BEGIN_DECLS
173struct rusage; /* forward declaration */ 173struct rusage; /* forward declaration */
174 174
175pid_t wait(int *); 175pid_t wait(int *);
176pid_t waitpid(pid_t, int *, int); 176pid_t waitpid(pid_t, int *, int);
177#if defined(_XOPEN_SOURCE) || defined(_NETBSD_SOURCE) 177#if defined(_XOPEN_SOURCE) || defined(_NETBSD_SOURCE)
178#ifndef __LIBC12_SOURCE__ 178#ifndef __LIBC12_SOURCE__
179pid_t wait3(int *, int, struct rusage *) __RENAME(__wait350); 179pid_t wait3(int *, int, struct rusage *) __RENAME(__wait350);