diff options
| -rw-r--r-- | Rules.mak | 58 | ||||
| -rw-r--r-- | include/sys/wait.h | 135 | ||||
| -rw-r--r-- | libc/sysdeps/linux/i386/bits/waitflags.h | 30 | ||||
| -rw-r--r-- | libc/sysdeps/linux/i386/bits/waitstatus.h | 104 | ||||
| -rw-r--r-- | test/silly/tiny.c | 2 |
5 files changed, 221 insertions, 108 deletions
@@ -1,7 +1,9 @@ # Rules.make for uCLibc # # This file contains rules which are shared between multiple Makefiles. -# Feel free to adjust to taste... +# All normal configuration options live in the file named "Config". +# You probably should not mess with this file unless you know what you +# are doing... # -Erik Andersen <andersen@lineo.com> < andersee@debian.org> # # Copyright (C) 2000 by Lineo, inc. @@ -20,60 +22,8 @@ # this program; if not, write to the Free Software Foundation, Inc., 59 Temple # Place, Suite 330, Boston, MA 02111-1307 USA # -# Derived in part from the Linux-8086 C library, the GNU C Library, and several -# other sundry sources. Files within this library are copyright by their -# respective copyright holders. -PROG := libc.a -VERSION := 0.95 -BUILDTIME := $(shell TZ=UTC date --utc "+%Y.%m.%d-%H:%M%z") -export VERSION - -# Set the following to `true' to make a debuggable build. -# Do not enable this for production builds... -DODEBUG = false - -# This specifies which malloc implementation is used. -# "malloc-simple" is very, very small, but is also very, very dumb -# and does not try to make good use of memory or clean up after itself. -# "malloc" on the other hand is a bit bigger, but is pretty smart thereby -# minimizing memory wastage and reusing already allocated memory. This -# can be lots faster and safer IMHO. -#MALLOC = malloc-simple -MALLOC = malloc - -# If you want large file summit support (greater then 2 Gib), -# turn this on. This has no effect unless your kernel supports -# lfs. This surrently does nothing... -DOLFS = false - -# Enable stuff that is broken (to fix it of course....) -DO_FIXME_STUFF = true - -# Disable this if your CPU has a memory management unit (MMU) -HAS_MMU = true - -# Disable this if your CPU has a floating point unit (FPU) -HAS_FLOATS = true - -# Use C functions instead of macros for ctype.h stuff -# This should generally stay false... -USE_CTYPE_C_FUNCTIONS = false - -# If you are running a cross compiler, you may want to set this -# to something more interesting... -CROSS = #powerpc-linux- -CC = $(CROSS)gcc -STRIPTOOL = $(CROSS)strip - -# Figure out what arch to build... -ARCH = $(shell uname -m | sed -e 's/i.86/i386/' -e 's/sparc.*/sparc/' -e 's/arm.*/arm/g') - - -#-------------------------------------------------------- -# Nothing beyond this point should need be touched by mere -# mortals so you should probably leave this stuff alone. -#-------------------------------------------------------- +include Config GCCINCDIR = $(shell gcc -print-search-dirs | sed -ne "s/install: \(.*\)/\1include/gp") diff --git a/include/sys/wait.h b/include/sys/wait.h index be95c2202..2ba604de6 100644 --- a/include/sys/wait.h +++ b/include/sys/wait.h @@ -1,82 +1,84 @@ -/* Copyright (C) 1991, 1992 Free Software Foundation, Inc. -This file is part of the GNU C Library. +/* Copyright (C) 1991, 92, 93, 94, 96, 97, 98 Free Software Foundation, Inc. + This file is part of the GNU C Library. -The GNU C Library is free software; you can redistribute it and/or -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. -The GNU C Library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the, 1992 Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ /* * POSIX Standard: 3.2.1 Wait for Process Termination <sys/wait.h> */ #ifndef _SYS_WAIT_H - #define _SYS_WAIT_H 1 + #include <features.h> -#include <errno.h> __BEGIN_DECLS -#include <sys/types.h> +#include <bits/types.h> + +#if defined __USE_XOPEN && !defined pid_t +typedef __pid_t pid_t; +# define pid_t pid_t +#endif /* This will define the `W*' macros for the flag bits to `waitpid', `wait3', and `wait4'. */ -#include <waitflags.h> +#include <bits/waitflags.h> #ifdef __USE_BSD /* Lots of hair to allow traditional BSD use of `union wait' as well as POSIX.1 use of `int' for the status word. */ -#ifdef __GNUC__ -#define __WAIT_INT(status) \ +# if defined __GNUC__ && !defined __cplusplus +# define __WAIT_INT(status) \ (__extension__ ({ union { __typeof(status) __in; int __i; } __u; \ __u.__in = (status); __u.__i; })) -#else -#define __WAIT_INT(status) (*(int *) &(status)) -#endif - -/* This is the type of the argument to `wait'. With GCC 2.6.1 and later, - the funky union causes redeclarations with either `int *' or `union wait - *' to be allowed without complaint. __WAIT_STATUS_DEFN is the type used - in the actual function definitions. */ - -/* g++ in gcc 2.6.1 doesn't work. Maybe 2.7.x. H.J. */ -#if !defined (__GNUC__) || defined (__cplusplus) || \ - __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 6) || \ - (defined(_MIT_POSIX_THREADS) && _MIT_POSIX_THREADS > 0) -#define __WAIT_STATUS __ptr_t -#define __WAIT_STATUS_DEFN __ptr_t -#else +# else +# define __WAIT_INT(status) (*(int *) &(status)) +# endif + +/* This is the type of the argument to `wait'. The funky union + causes redeclarations with ether `int *' or `union wait *' to be + allowed without complaint. __WAIT_STATUS_DEFN is the type used in + the actual function definitions. */ + +# if !defined __GNUC__ || __GNUC__ < 2 || defined __cplusplus +# define __WAIT_STATUS __ptr_t +# define __WAIT_STATUS_DEFN __ptr_t +# else /* This works in GCC 2.6.1 and later. */ typedef union { union wait *__uptr; int *__iptr; - } __WAIT_STATUS __attribute__ ((transparent_union)); -#define __WAIT_STATUS_DEFN int * + } __WAIT_STATUS __attribute__ ((__transparent_union__)); +# define __WAIT_STATUS_DEFN int * #endif #else /* Don't use BSD. */ -#define __WAIT_INT(status) (status) -#define __WAIT_STATUS int * +# define __WAIT_INT(status) (status) +# define __WAIT_STATUS int * +# define __WAIT_STATUS_DEFN int * #endif /* Use BSD. */ /* This will define all the `__W*' macros. */ -#include <waitstatus.h> +#include <bits/waitstatus.h> #define WEXITSTATUS(status) __WEXITSTATUS(__WAIT_INT(status)) #define WTERMSIG(status) __WTERMSIG(__WAIT_INT(status)) @@ -86,9 +88,20 @@ typedef union #define WIFSTOPPED(status) __WIFSTOPPED(__WAIT_INT(status)) #ifdef __USE_BSD -#define WCOREDUMP(status) __WCOREDUMP(__WAIT_INT(status)) -#define W_EXITCODE(ret, sig) __W_EXITCODE(ret, sig) -#define W_STOPCODE(sig) __W_STOPCODE(sig) +# define WCOREFLAG __WCOREFLAG +# define WCOREDUMP(status) __WCOREDUMP(__WAIT_INT(status)) +# define W_EXITCODE(ret, sig) __W_EXITCODE(ret, sig) +# define W_STOPCODE(sig) __W_STOPCODE(sig) +#endif + +/* The following values are used by the `waitid' function. */ +#if defined __USE_SVID || defined __USE_XOPEN +typedef enum +{ + P_ALL, /* Wait for any child. */ + P_PID, /* Wait for specified process. */ + P_PGID /* Wait for members of process group. */ +} idtype_t; #endif @@ -99,8 +112,8 @@ extern __pid_t wait __P ((__WAIT_STATUS __stat_loc)); #ifdef __USE_BSD /* Special values for the PID argument to `waitpid' and `wait4'. */ -#define WAIT_ANY (-1) /* Any process. */ -#define WAIT_MYPGRP 0 /* Any process in my process group. */ +# define WAIT_ANY (-1) /* Any process. */ +# define WAIT_MYPGRP 0 /* Any process in my process group. */ #endif /* Wait for a child matching PID to die. @@ -115,11 +128,25 @@ extern __pid_t wait __P ((__WAIT_STATUS __stat_loc)); return PID and store the dead child's status in STAT_LOC. Return (pid_t) -1 for errors. If the WUNTRACED bit is set in OPTIONS, return status for stopped children; otherwise don't. */ -extern __pid_t __waitpid __P ((__pid_t __pid, int *__stat_loc, - int __options)); extern __pid_t waitpid __P ((__pid_t __pid, int *__stat_loc, int __options)); -#ifdef __USE_BSD + +#if defined __USE_SVID || defined __USE_XOPEN +# define __need_siginfo_t +# include <bits/siginfo.h> +/* Wait for a childing matching IDTYPE and ID to change the status and + place appropriate information in *INFOP. + If IDTYPE is P_PID, match any process whose process ID is ID. + If IDTYPE is P_PGID, match any process whose process group is ID. + If IDTYPE is P_ALL, match any process. + If the WNOHANG bit is set in OPTIONS, and that child + is not already dead, clear *INFOP and return 0. If successful, store + exit code and status in *INFOP. */ +extern int waitid __P ((idtype_t __idtype, __id_t __id, siginfo_t *__infop, + int __options)); +#endif + +#if defined __USE_BSD || defined __USE_XOPEN_EXTENDED /* This being here makes the prototypes valid whether or not we have already included <sys/resource.h> to define `struct rusage'. */ struct rusage; @@ -129,14 +156,16 @@ struct rusage; nil, store information about the child's resource usage there. If the WUNTRACED bit is set in OPTIONS, return status for stopped children; otherwise don't. */ -extern __pid_t __wait3 __P ((__WAIT_STATUS __stat_loc, - int __options, struct rusage * __usage)); extern __pid_t wait3 __P ((__WAIT_STATUS __stat_loc, int __options, struct rusage * __usage)); +#endif + +#ifdef __USE_BSD +/* This being here makes the prototypes valid whether or not + we have already included <sys/resource.h> to define `struct rusage'. */ +struct rusage; /* PID is like waitpid. Other args are like wait3. */ -extern __pid_t __wait4 __P ((__pid_t __pid, __WAIT_STATUS __stat_loc, - int __options, struct rusage *__usage)); extern __pid_t wait4 __P ((__pid_t __pid, __WAIT_STATUS __stat_loc, int __options, struct rusage *__usage)); #endif /* Use BSD. */ diff --git a/libc/sysdeps/linux/i386/bits/waitflags.h b/libc/sysdeps/linux/i386/bits/waitflags.h new file mode 100644 index 000000000..afc8b2229 --- /dev/null +++ b/libc/sysdeps/linux/i386/bits/waitflags.h @@ -0,0 +1,30 @@ +/* Definitions of flag bits for `waitpid' et al. + Copyright (C) 1992, 1996, 1997, 2000 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#ifndef _SYS_WAIT_H +# error "Never include <bits/waitflags.h> directly; use <sys/wait.h> instead." +#endif + + +/* Bits in the third argument to `waitpid'. */ +#define WNOHANG 1 /* Don't block waiting. */ +#define WUNTRACED 2 /* Report status of stopped children. */ + +#define __WALL 0x40000000 /* Wait for any child. */ +#define __WCLONE 0x80000000 /* Wait for cloned process. */ diff --git a/libc/sysdeps/linux/i386/bits/waitstatus.h b/libc/sysdeps/linux/i386/bits/waitstatus.h new file mode 100644 index 000000000..1ec55107f --- /dev/null +++ b/libc/sysdeps/linux/i386/bits/waitstatus.h @@ -0,0 +1,104 @@ +/* Definitions of status bits for `wait' et al. + Copyright (C) 1992, 1994, 1996, 1997 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#ifndef _SYS_WAIT_H +# error "Never include <bits/waitstatus.h> directly; use <sys/wait.h> instead." +#endif + + +/* Everything extant so far uses these same bits. */ + + +/* If WIFEXITED(STATUS), the low-order 8 bits of the status. */ +#define __WEXITSTATUS(status) (((status) & 0xff00) >> 8) + +/* If WIFSIGNALED(STATUS), the terminating signal. */ +#define __WTERMSIG(status) ((status) & 0x7f) + +/* If WIFSTOPPED(STATUS), the signal that stopped the child. */ +#define __WSTOPSIG(status) __WEXITSTATUS(status) + +/* Nonzero if STATUS indicates normal termination. */ +#define __WIFEXITED(status) (__WTERMSIG(status) == 0) + +/* Nonzero if STATUS indicates termination by a signal. */ +#ifdef __GNUC__ +# define __WIFSIGNALED(status) \ + (__extension__ ({ int __status = (status); \ + !__WIFSTOPPED(__status) && !__WIFEXITED(__status); })) +#else /* Not GCC. */ +# define __WIFSIGNALED(status) (!__WIFSTOPPED(status) && !__WIFEXITED(status)) +#endif /* GCC. */ + +/* Nonzero if STATUS indicates the child is stopped. */ +#define __WIFSTOPPED(status) (((status) & 0xff) == 0x7f) + +/* Nonzero if STATUS indicates the child dumped core. */ +#define __WCOREDUMP(status) ((status) & __WCOREFLAG) + +/* Macros for constructing status values. */ +#define __W_EXITCODE(ret, sig) ((ret) << 8 | (sig)) +#define __W_STOPCODE(sig) ((sig) << 8 | 0x7f) +#define __WCOREFLAG 0x80 + + +#ifdef __USE_BSD + +# include <endian.h> + +union wait + { + int w_status; + struct + { +# if __BYTE_ORDER == __LITTLE_ENDIAN + unsigned int __w_termsig:7; /* Terminating signal. */ + unsigned int __w_coredump:1; /* Set if dumped core. */ + unsigned int __w_retcode:8; /* Return code if exited normally. */ + unsigned int:16; +# endif /* Little endian. */ +# if __BYTE_ORDER == __BIG_ENDIAN + unsigned int:16; + unsigned int __w_retcode:8; + unsigned int __w_coredump:1; + unsigned int __w_termsig:7; +# endif /* Big endian. */ + } __wait_terminated; + struct + { +# if __BYTE_ORDER == __LITTLE_ENDIAN + unsigned int __w_stopval:8; /* W_STOPPED if stopped. */ + unsigned int __w_stopsig:8; /* Stopping signal. */ + unsigned int:16; +# endif /* Little endian. */ +# if __BYTE_ORDER == __BIG_ENDIAN + unsigned int:16; + unsigned int __w_stopsig:8; /* Stopping signal. */ + unsigned int __w_stopval:8; /* W_STOPPED if stopped. */ +# endif /* Big endian. */ + } __wait_stopped; + }; + +# define w_termsig __wait_terminated.__w_termsig +# define w_coredump __wait_terminated.__w_coredump +# define w_retcode __wait_terminated.__w_retcode +# define w_stopsig __wait_stopped.__w_stopsig +# define w_stopval __wait_stopped.__w_stopval + +#endif /* Use BSD. */ diff --git a/test/silly/tiny.c b/test/silly/tiny.c index cbf8b1643..88cfde2ef 100644 --- a/test/silly/tiny.c +++ b/test/silly/tiny.c @@ -4,5 +4,5 @@ int main(void) { write(1,"hello world\n",12); - exit(42); + _exit(42); } |