From ba1ffaa1c6989873b57edc84491bfd1308b2190d Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 31 Oct 1996 02:57:12 +0000 Subject: update from main archive 961030 Thu Oct 31 00:01:39 1996 Ulrich Drepper * signal/Makefile (routines): Add sigwait. * signal/signal.h: Add prototype for sigwait. * sysdeps/posix/sigwait.c: New file. Implementation of sigwait function from POSIX.1c. * sysdeps/stub/sigwait.c: New file. Stub version of sigwait. Wed Oct 30 02:01:17 1996 Richard Henderson * sunrpc/xdr_float.c (xdr_float): Handle sizeof(float)!=sizeof(long), but don't bother going farther than sizeof(float)==sizeof(int). (xdr_double): Handle little-endian machines! Handle sizeof(double) != 2*sizeof(long), though again don't bother with more than int. Thu Oct 29 16:09:42 1996 Craig Metz * sysdeps/posix/getaddrinfo.c: Use buffer limits for inet_ntop function. Tue Oct 29 12:37:22 1996 Ulrich Drepper * Makerules: Create symbolic links for linking in $(libdir). (make-link): Use absolute path for destination if this is not in the same directory. * elf/rtld.c (dl_main): When verifying don't check the name of the dynamic linker. * shlib-versions: Change entries for Hurd specific libs from *-*-gnu* to *-*-gnu?* so that i586-pc-linux-gnu does not match these entries. * assert/assert.h: Reformat copyright. Change reference to ANSI into reference to ISO C. * ctype/ctype.h: Likewise. * errno.h: Likewise. * limits.h: Likewise. * math/math.h: Likewise. * setjmp/setjmp.h: Likewise. * stdio/stdio.h: Likewise. * libio/stdio.h: Likewise. * stdlib/stdlib.h: Likewise. * string/string.h: Likewise. * time/time.h: Likewise. * string/argz.h: Use __const is definitions. * elf/dlfcn.h: Use __const and __P. Reformat copyright. * misc/err.h: Likewise. * wctype/wctype.h (wctrans_t): Use __const instead of const. * Makeconfig ($(common-objpfx)soversions.mk): Generate list of sonames for versioned libraries. * Makefile: Remove code to generate libc-version.h. Generate gnu/lib-names.h with info from soversions.mk. * features.h: Define __GLIBC__ and __GLIBC_MINOR__. * dirent/tst-seekdir.c: Initialize save3. * grp/testgrp.c: Initialize my_group. * grp/fgetgrent_r.c: Change interface to follow POSIX.1c. * grp/grp.h: Likewise. * nss/getXXbyYY.c: Likewise. * nss/getXXbyYY_r.c: Likewise. * nss/getXXent.c: Likewise. * nss/getXXent_r.c: Likewise. * pwd/fgetpwent_r.c: Likewise. * pwd/pwd.h: Likewise. * shadow/fgetspent_r.c: Likewise. * shadow/sgetspent.c: Likewise. * shadow/sgetspent_r.c: Likewise. * grp/fgetgrent.c: Adapt for change in interface of fgetgrent_r. * pwd/fgetpwent.c: Likewise, for fgetpwent_r.c. * shadow/fgetspent.c: Likewise, for fgetpwent_r.c. * resolv/netdb.h: Adapt prototypes for reentrant functions to follow POSIX.1c. * sunrpc/rpc/netdb.h: Likewise, * shadow/shadow.h: Likewise. * inet/getnetgrent_r.c: Follow change in pwd/grp function interface. * sysdeps/unix/getlogin_r.c: Return ERANGE when buffer is too small. * inet/herrno.c: Don't define __h_errno. Only h_errno otherwise the ELF aliasing creates strange situations. * sysdeps/unix/sysv/linux/errnos.H: Define __set_errno as inline function. * sysdeps/unix/sysv/linux/i386/sysdep.S: Don't define __errno. * sysdeps/unix/sysv/linux/m68k/sysdep.S: Likewise. * libio/libio.h: Don't declare _IO_flockfile and _IO_funlockfile weak. * locale/programs/charmap.c: Add casts to prevent warnings. * locale/programs/linereader.h: Likewise. * locale/programs/ld-collate.c: Likewise. * locale/programs/stringtrans.c: Likewise. Change types for various variables to prevent warnings. * locale/programs/ld-ctype.c: Likewise. * locale/programs/linereader.h (lr_ungetc): Likewise. * locale/programs/charset.h (struct charset): Use `unsigned int' as type for width_default. * posix/regex.c: Change type of `this_reg' variables. * stdio-common/Makefile: Use -Wno-format for tstdiomisc.c. * stdio-common/bug5.c: De-ANSI-fy. Use correct types for variables. * stdio-common/printf_fp.c: Initialize to_shift. * stdio-common/test_rdwr.c: Add cast. * stdio-common/vfprintf.c: Add casts and use correct types to prevent warnings. * stdio-common/vfscanf.c: Initialize str and strptr. * sysdeps/libm-ieee754/e_jnf.c: Use correct types to prevent warnings. * sysdeps/libm-ieee754/e_pow.c: Likewise. * sysdeps/libm-ieee754/e_powf.c: Likewise. * sysdeps/libm-ieee754/e_rem_pio2f.c: Likewise. * time/test-tz.c: Likewise. * manual/creature.texi: Document _REENTRANT and _THREAD_SAFE. * manual/libc.texinfo: Prevent makeinfo failure by avoiding libc.cp index. This must be fixed. * manual/nss.texi: Adapt for correct POSIX.1c interface of reentrant functions. * manual/users.texi: Document netgroup functions. * po/es.po: Updated. * po/fr.po: Updated. * posix/fnmatch.c: Change to match libit version. * posix/unistd.h: Change prototype for ttyname_r to match POSIX.1c. * sysdep/posix/ttyname_r.c: Likewise. * stdlib/atexit.h (__new_exitfn): Add internal locking. * stdlib/exit.c: De-ANSI-fy. Handle new ef_us value for flavor. * stdlib/exit.h: De-ANSI-fy. Define new ef_us value for flavor. * stdlib/random.c (__srandom): Add internal locking. (__initstate): Likewise. (__setstate): Likewise. (__random): Likewise. Mon Oct 28 22:28:37 1996 NIIBE Yutaka * sysdeps/generic/crypt-entry.c (crypt_r): Use __set_errno. (crypt): Likewise. * resolv/gethnamaddr.c (gethostbyname2): Likewise. * sysdeps/generic/uname.c: Likewise. * sysdeps/posix/rename.c: Likewise. * sysdeps/stub/setrlimit.c: Likewise. * nss/nss_db/db-netgrp.c (_nss_db_setnetgrent): Fix typo. Sun Oct 27 11:12:50 1996 Andreas Schwab * locale/programs/ld-collate.c (collate_order_elem): Fix format string. (collate_element_to): Cast field width argument to `int' for format string. (collate_symbol): Likewise. (collate_order_elem): Likewise. (collate_weight_bsymbol): Likewise. (collate_simple_weight): Likewise. * locale/programs/ld-time.c (STRARR_ELEM): Fix format string. * locale/programs/ld-ctype.c (ctype_class_newP): Add missing argument for format string. (ctype_map_newP): Likewise. (set_class_defaults): Fix format string. * locale/programs/localedef.c (construct_output_path): Putting an explicit \0 into the format string does not work, use %c. Sat Oct 26 20:38:36 1996 Richard Henderson * Makerules: Install all shared libraries in $(slibdir). * login/Makefile: Build libutil.so in others pass after libc.so is created. * misc/mntent.h: Include for _PATH_MNTTAB & _PATH_MOUNTED. * string/stratcliff.c: Allocate 3 pages instead of one, then use mprotect so that we know that the adjacent pages are inaccessible. * resource/sys/resource.h: Move all structures and enums to ... * sysdeps/generic/resourcebits.h: ... here ... * sysdeps/unix/bsd/sun/sunos4/resourcebits.h: ... and here. * sysdeps/unix/sysv/linux/alpha/resourcebits.h: Remove. * sysdeps/unix/sysv/linux/i386/resourcebits.h: Remove. * sysdeps/unix/sysv/linux/m68k/resourcebits.h: Remove. * sysdeps/unix/sysv/linux/mips/resourcebits.h: Remove. * sysdeps/unix/sysv/linux/resourcebits.h: New file. Use kernel header for RLIMIT_* definitions. The members of struct rlimit are longs. Thu Oct 24 17:43:34 1996 Andreas Schwab * MakeTAGS (sysdep-dirs): Fix typo. Wed Oct 23 03:45:22 1996 Ulrich Drepper * Makefile (headers): Don't mention libc-version.h. (install-others): ...but here. * time/strptime.c: Recognize %s, %u, %g, and %G format. nothing is found. This guarantees all subsequent calls behave * sysdeps/unix/sysv/linux/syscalls.list: Change function name for * io/getwd.c (getwd) [! PATH_MAX]: Don't assume that the user's buffer is any longer than the amount necessary to hold the filename; the Hurd getcwd uses the *entire* contents of the buffer, however long it is specified to be. * posix/getconf.c: De-ANSI-fy. Recognize POSIX.2 constant names. since these do not depend on the platform. --- stdlib/atexit.c | 57 +++++++++++++++++++++++++++++++++++++++++---------------- stdlib/exit.c | 23 +++++++++++------------ stdlib/exit.h | 12 ++++++------ stdlib/random.c | 30 +++++++++++++++++++++++++++--- stdlib/stdlib.h | 28 ++++++++++++++-------------- 5 files changed, 99 insertions(+), 51 deletions(-) (limited to 'stdlib') diff --git a/stdlib/atexit.c b/stdlib/atexit.c index a2ab453576..675de668cc 100644 --- a/stdlib/atexit.c +++ b/stdlib/atexit.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1996 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 @@ -16,16 +16,16 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include +#include #include #include "exit.h" /* Register FUNC to be executed by `exit'. */ int -DEFUN(atexit, (func), void EXFUN((*func), (NOARGS))) +atexit (void (*func) (void)) { - struct exit_function *new = __new_exitfn(); + struct exit_function *new = __new_exitfn (); if (new == NULL) return -1; @@ -36,30 +36,55 @@ DEFUN(atexit, (func), void EXFUN((*func), (NOARGS))) } +/* We change global data, so we need locking. */ +__libc_lock_define_initialized (static, lock) + + static struct exit_function_list fnlist = { NULL, 0, }; struct exit_function_list *__exit_funcs = &fnlist; struct exit_function * -DEFUN_VOID(__new_exitfn) +__new_exitfn (void) { - register struct exit_function_list *l; + struct exit_function_list *l; + size_t i = 0; + + __libc_lock_lock (lock) for (l = __exit_funcs; l != NULL; l = l->next) { - register size_t i; for (i = 0; i < l->idx; ++i) if (l->fns[i].flavor == ef_free) - return &l->fns[i]; - if (l->idx < sizeof(l->fns) / sizeof(l->fns[0])) - return &l->fns[l->idx++]; + break; + if (i < l->idx) + break; + + if (l->idx < sizeof (l->fns) / sizeof (l->fns[0])) + { + i = l->idx++; + break; + } } - l = (struct exit_function_list *) malloc(sizeof(struct exit_function_list)); if (l == NULL) - return NULL; - l->next = __exit_funcs; - __exit_funcs = l; + { + l = (struct exit_function_list *) + malloc (sizeof (struct exit_function_list)); + if (l != NULL) + { + l->next = __exit_funcs; + __exit_funcs = l; + + l->idx = 1; + i = 0; + } + } + + /* Mark entry as used, but we don't know the flavor now. */ + if (l != NULL) + l->fns[i].flavor = ef_us; + + __libc_lock_unlock (lock) - l->idx = 1; - return &l->fns[0]; + return l == NULL ? NULL : &l->fns[i]; } diff --git a/stdlib/exit.c b/stdlib/exit.c index 4f33a25cc4..ec7ee6a2db 100644 --- a/stdlib/exit.c +++ b/stdlib/exit.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1995 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1995, 1996 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 @@ -16,7 +16,6 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include #include #include #include @@ -32,25 +31,26 @@ DEFINE_HOOK (__libc_atexit, (void)) in the reverse of the order in which they were registered perform stdio cleanup, and terminate program execution with STATUS. */ void -DEFUN(exit, (status), int status) +exit (int status) { - register CONST struct exit_function_list *l; + const struct exit_function_list *l; for (l = __exit_funcs; l != NULL; l = l->next) { - register size_t i = l->idx; + size_t i = l->idx; while (i-- > 0) { - CONST struct exit_function *CONST f = &l->fns[i]; + const struct exit_function *const f = &l->fns[i]; switch (f->flavor) { case ef_free: + case ef_us: break; case ef_on: - (*f->func.on.fn)(status, f->func.on.arg); + (*f->func.on.fn) (status, f->func.on.arg); break; case ef_at: - (*f->func.at)(); + (*f->func.at) (); break; } } @@ -60,11 +60,10 @@ DEFUN(exit, (status), int status) RUN_HOOK (__libc_atexit, ()); #else { - extern void EXFUN(_cleanup, (NOARGS)); - _cleanup(); + extern void _cleanup (void); + _cleanup (); } #endif - _exit(status); + _exit (status); } - diff --git a/stdlib/exit.h b/stdlib/exit.h index 214217853e..83d20b7451 100644 --- a/stdlib/exit.h +++ b/stdlib/exit.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1996 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 @@ -20,14 +20,14 @@ Cambridge, MA 02139, USA. */ struct exit_function { - enum { ef_free, ef_on, ef_at } flavor; /* `ef_free' MUST be zero! */ + enum { ef_free, ef_us, ef_on, ef_at } flavor; /* `ef_free' MUST be zero! */ union { - void EXFUN((*at), (NOARGS)); + void (*at) (void); struct { - void EXFUN((*fn), (int status, PTR arg)); - PTR arg; + void (*fn) (int status, void *arg); + void *arg; } on; } func; }; @@ -39,6 +39,6 @@ struct exit_function_list }; extern struct exit_function_list *__exit_funcs; -extern struct exit_function *EXFUN(__new_exitfn, (NOARGS)); +extern struct exit_function *__new_exitfn (void); #endif /* exit.h */ diff --git a/stdlib/random.c b/stdlib/random.c index e2b191b696..461b76f29b 100644 --- a/stdlib/random.c +++ b/stdlib/random.c @@ -22,6 +22,7 @@ * Rewritten to use reentrant functions by Ulrich Drepper, 1995. */ +#include #include #include #include @@ -162,6 +163,11 @@ static struct random_data unsafe_state = end_ptr : &randtbl[sizeof (randtbl) / sizeof (randtbl[0])] }; +/* POSIX.1c requires that there is mutual exclusion for the `rand' and + `srand' functions to prevent concurrent calls from modifying common + data. */ +__libc_lock_define_initialized (static, lock) + /* Initialize the random number generator based on the given seed. If the type is the trivial no-state-information type, just remember the seed. Otherwise, initializes state[] based on the given "seed" via a linear @@ -174,7 +180,9 @@ void __srandom (x) unsigned int x; { + __libc_lock_lock (lock) (void) __srandom_r (x, &unsafe_state); + __libc_lock_unlock (lock) } weak_alias (__srandom, srandom) @@ -197,10 +205,16 @@ __initstate (seed, arg_state, n) void *arg_state; size_t n; { - void *ostate = (void *) &unsafe_state.state[-1]; + void *ostate; + + __libc_lock_lock (lock) + + ostate = (void *) &unsafe_state.state[-1]; __initstate_r (seed, arg_state, n, &unsafe_state); + __libc_lock_unlock (lock) + return ostate; } @@ -218,10 +232,16 @@ void * __setstate (arg_state) void *arg_state; { - void *ostate = (void *) &unsafe_state.state[-1]; + void *ostate; + + __libc_lock_lock (lock) + + ostate = (void *) &unsafe_state.state[-1]; if (__setstate_r (arg_state, &unsafe_state) < 0) - return NULL; + ostate = NULL; + + __libc_lock_unlock (lock) return ostate; } @@ -244,8 +264,12 @@ __random () { int32_t retval; + __libc_lock_lock (lock) + (void) __random_r (&unsafe_state, &retval); + __libc_lock_unlock (lock) + return retval; } diff --git a/stdlib/stdlib.h b/stdlib/stdlib.h index cb48aa1f1c..d11b8bf73b 100644 --- a/stdlib/stdlib.h +++ b/stdlib/stdlib.h @@ -1,23 +1,23 @@ /* Copyright (C) 1991, 92, 93, 94, 95, 96 Free Software Foundation, Inc. -This file is part of the GNU C Library. + 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 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. */ /* - * ANSI Standard: 4.10 GENERAL UTILITIES + * ISO S Standard: 4.10 GENERAL UTILITIES */ #ifndef _STDLIB_H -- cgit v1.2.3