| waitid.c (256281) | waitid.c (281981) |
|---|---|
| 1/*- 2 * Copyright (c) 2012 Jukka A. Ukkonen 3 * All rights reserved. 4 * 5 * This software was developed by Jukka Ukkonen for FreeBSD. 6 * 7 * Redistribution and use in source and binary forms, with or without 8 * modification, are permitted provided that the following conditions --- 13 unchanged lines hidden (view full) --- 22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 26 * SUCH DAMAGE. 27 */ 28 29#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 2012 Jukka A. Ukkonen 3 * All rights reserved. 4 * 5 * This software was developed by Jukka Ukkonen for FreeBSD. 6 * 7 * Redistribution and use in source and binary forms, with or without 8 * modification, are permitted provided that the following conditions --- 13 unchanged lines hidden (view full) --- 22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 26 * SUCH DAMAGE. 27 */ 28 29#include <sys/cdefs.h> |
| 30__FBSDID("$FreeBSD: stable/10/lib/libc/gen/waitid.c 242960 2012-11-13 12:55:52Z kib $"); | 30__FBSDID("$FreeBSD: stable/10/lib/libc/gen/waitid.c 281981 2015-04-25 08:14:08Z kib $"); |
| 31 32#include "namespace.h" 33#include <sys/types.h> 34#include <sys/wait.h> 35#include <stddef.h> 36#include <string.h> 37#include <signal.h> 38#include <errno.h> 39#include "un-namespace.h" | 31 32#include "namespace.h" 33#include <sys/types.h> 34#include <sys/wait.h> 35#include <stddef.h> 36#include <string.h> 37#include <signal.h> 38#include <errno.h> 39#include "un-namespace.h" |
| 40#include "libc_private.h" |
|
| 40 41int 42__waitid(idtype_t idtype, id_t id, siginfo_t *info, int flags) 43{ 44 int status; 45 pid_t ret; 46 | 41 42int 43__waitid(idtype_t idtype, id_t id, siginfo_t *info, int flags) 44{ 45 int status; 46 pid_t ret; 47 |
| 47 ret = _wait6(idtype, id, &status, flags, NULL, info); | 48 ret = ((pid_t (*)(idtype_t, id_t, int *, int, struct __wrusage *, 49 siginfo_t *))__libc_interposing[INTERPOS_wait6])(idtype, id, 50 &status, flags, NULL, info); |
| 48 49 /* 50 * According to SUSv4, waitid() shall not return a PID when a 51 * process is found, but only 0. If a process was actually 52 * found, siginfo_t fields si_signo and si_pid will be 53 * non-zero. In case WNOHANG was set in the flags and no 54 * process was found those fields are set to zero using 55 * memset() below. 56 */ 57 if (ret == 0 && info != NULL) 58 memset(info, 0, sizeof(*info)); 59 else if (ret > 0) 60 ret = 0; 61 return (ret); 62} 63 64__weak_reference(__waitid, waitid); 65__weak_reference(__waitid, _waitid); | 51 52 /* 53 * According to SUSv4, waitid() shall not return a PID when a 54 * process is found, but only 0. If a process was actually 55 * found, siginfo_t fields si_signo and si_pid will be 56 * non-zero. In case WNOHANG was set in the flags and no 57 * process was found those fields are set to zero using 58 * memset() below. 59 */ 60 if (ret == 0 && info != NULL) 61 memset(info, 0, sizeof(*info)); 62 else if (ret > 0) 63 ret = 0; 64 return (ret); 65} 66 67__weak_reference(__waitid, waitid); 68__weak_reference(__waitid, _waitid); |