From 68dbb3a69e78e24a778c6602c8cc91d715839d08 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sun, 15 Dec 1996 02:15:29 +0000 Subject: update from main archive 961214 Sun Dec 15 01:53:20 1996 Ulrich Drepper * Makefile (subdirs): Change crypt to md5-crypt. * crypt/Makefile, crypt/md5-crypt.c, crypt/md5.c, crypt/md5.h, crypt/md5c-test.c, crypt/md5test.c: Move to new directory md5-crypt. * sysdeps/unix/sysv/linux/configure.in: Refer to linuxthreads and crypt instead of LinuxThreads and des-crypt. * Makefile (subdirs): Add nss back. * sysdeps/unix/inet/Subdirs: Move nis to end of file to fulfill dependencies. * libio/iofclose.c: Implement fclose(NULL) as closing all streams. * stdio-common/Makefile (routines): Add fcloseall. * stdio-common/fcloseall.c: New file. * sysdeps/generic/abort.c: Make implementation POSIX.1 compatible. * sysdeps/mach/libc-lock.h: Add definition of __libc_lock_trylock. * sysdeps/stub/libc-lock.h: Define __libc_lock_trylock to always return 0. * stdio-common/printf.h: Define MIN and MAX only if not already defined. * stdio-common/vfprintf.c: Set errno to EBADF if stream does not allow writing. Required by POSIX.1. * libio/libioP.h (CHECK_FILE): Use MAYBE_SET_EINVAL instead of assignment. * interp.c: Update copyright. * libio/clearerr.c: Likewise. * libio/ioseekoff.c: Likewise. * libio/ioseekpos.c: Likewise. * stdio/fclose.c: Likewise. * stdio/fflus.c: Likewise. * libio/libio.h [!_IO_MTSAFE_IO]: Define _IO_cleanup_region_start and _IO_cleanup_region_end as empty. * libio/fgetc.c: Use _IO_cleanup_region_start and _IO_cleanup_region_end instead of __libc_cleanup_region_start and __libc_cleanup_region_end. * libio/fputc.c: Likewise. * libio/freopen.c: Likewise. * libio/fseek.c: Likewise. * libio/getc.c: Likewise. * libio/getchar.c: Likewise. * libio/iofclose.c: Likewise. * libio/iofflush.c: Likewise. * libio/iofgetpos.c: Likewise. * libio/iofgets.c: Likewise. * libio/iofputs.c: Likewise. * libio/iofread.c: Likewise. * libio/iofsetpos.c: Likewise. * libio/ioftell.c: Likewise. * libio/iofwrite.c: Likewise. * libio/iogetdelim.c: Likewise. * libio/iogets.c: Likewise. * libio/ioputs.c: Likewise. * libio/iosetbuffer.c: Likewise. * libio/iosetvbuf.c: Likewise. * libio/ioungetc.c: Likewise. * libio/iovspintf.c: Use cleanup handler to make sure no dangling locks can stay over. * libio/iovsscanf.c: Likewise. * libio/genops.c: Use _IO_lock_init_recursive and _IO_lock_fini instead of __libc_lock_init_recursive and __libc_lock_fini. * libio/filedoalloc.c: Only use __isatty when compiling GNU libc. Otherwise use isatty. * libio/fileops.c: Likewise for __open and open. * login/utmp_file.c (getutent_r_file): Use fcntl instead of flock. * nis/ypclnt.h: Add more casts to prevent warnings. * nss/Makefile (services): Remove dns. (libnss_dns, libnss_dns-inhibit-o): Remove definition. ($(objpfx)libnss_dns.so): Removed. * nss/nss_dns/dns-host.c, nss/nss_dns/dns-network.c: Moved to... * resolv/nss_dns: ...here. * resolv/Makefile (extra-libs): Add libnss_dns. (libnss_dns-routines, libnss_dns-inhibit-o): Define as in nss/Makefile. * nss/XXX-lookup.c: Call __nss_database_lookup with new argument specifying alternate name for entry in /etc/nsswitch.conf * nss/nsswitch.c: If no entry with primary name is found in /etc/nsswitch.conf try alternate name if given. * nss/nsswitch.h: Add new parameter in prototype for __nss_database_lookup. * nss/spwd-lookup.c: Provide alternative entry name to look for. This makes our NSS compatible with Solaris' nsswitch.conf files. * string/tst-strlen.c: Change all counting variables to type size_t to prevent warnings. * sysdeps/posix/fpathconf.c: Update copyright. * sysdeps/posix/pathconf.c: Don't call fpathconf to do the work. Opening the file at this path may fail if it is a FIFO or pipe. These changes make the time implementation POSIX.1 compliant. * time/localtime.c (__localtime_r): Always call __tzset not only if __tzset_run is zero. * time/strftime.c: Add definition of memset_space to help to reduce for systems which have memset. (strftime): Don't use tm_zone member of argument for zone name. Instead always use tzname[]. Call tzset() as required by POSIX.1 before any action. * time/tzset.c (tzset): Set tzname[] as required by POSIX.1. Remove global variable __tzset_run. __tzset is now called always when a dependent function is used. (__tzset): Caching happens based on the contents of the environment variable TZ. Fri Dec 13 01:06:52 1996 Andreas Schwab * sysdeps/unix/sysv/linux/paths.h: Add _PATH_KLOG. Thu Dec 12 09:16:35 1996 Andreas Schwab * rellns-sh: Correctly handle a relative source file name. Wed Dec 11 19:18:40 1996 Andreas Schwab * login/utmp_file.c (setutent_file): Seek back to beginning of the file if resetting. Thu Dec 12 16:39:12 1996 Thomas Bushnell, n/BSG * hurd/hurdinit.c (map0): Delete function. Don't do this on _hurd_preinit_hook. * hurd/hurdstartup.c (_hurd_startup): Map page zero redzone here. --- stdio-common/Makefile | 2 +- stdio-common/fcloseall.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ stdio-common/printf-parse.h | 4 ++++ stdio-common/vfprintf.c | 14 ++++++++++++-- 4 files changed, 61 insertions(+), 3 deletions(-) create mode 100644 stdio-common/fcloseall.c (limited to 'stdio-common') diff --git a/stdio-common/Makefile b/stdio-common/Makefile index ec7429c..4f4d45e 100644 --- a/stdio-common/Makefile +++ b/stdio-common/Makefile @@ -33,7 +33,7 @@ routines := \ tmpfile tmpnam tmpnam_r tempnam tempname \ getline getw putw \ remove rename \ - lockfile + lockfile fcloseall aux := errlist siglist distribute := _itoa.h printf-parse.h diff --git a/stdio-common/fcloseall.c b/stdio-common/fcloseall.c new file mode 100644 index 0000000..d056b90 --- /dev/null +++ b/stdio-common/fcloseall.c @@ -0,0 +1,44 @@ +/* Close all streams but make sure this isn't done more than once. + This function is called in abort(). + Copyright (C) 1996 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 1996. + + 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. */ + +#include +#include + +static int already_called; + +__libc_lock_define_initialized (static, lock); + +void +__close_all_streams (void) +{ + /* We must be prepared for multi-threading on multiple calls. */ + if (! __libc_lock_trylock (lock) && already_called) + { + /* Signal that we already did this. */ + already_called = 1; + + /* Do the real work. */ + fclose (NULL); + + /* We don't release the lock so that the `trylock' immediately + fails. */ + } +} diff --git a/stdio-common/printf-parse.h b/stdio-common/printf-parse.h index 86a9821..8e3ea0a 100644 --- a/stdio-common/printf-parse.h +++ b/stdio-common/printf-parse.h @@ -25,10 +25,14 @@ #define NDEBUG 1 #include +#ifndef MAX #define MAX(a,b) ({typeof(a) _a = (a); typeof(b) _b = (b); \ _a > _b ? _a : _b; }) +#endif +#ifndef MIN #define MIN(a,b) ({typeof(a) _a = (a); typeof(b) _b = (b); \ _a < _b ? _a : _b; }) +#endif struct printf_spec { diff --git a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c index 31ff999..fa18033 100644 --- a/stdio-common/vfprintf.c +++ b/stdio-common/vfprintf.c @@ -98,7 +98,12 @@ ssize_t __wprintf_pad __P ((FILE *, wchar_t pad, size_t n)); { \ /* Check file argument for consistence. */ \ CHECK_FILE (S, -1); \ - if (S->_flags & _IO_NO_WRITES || Format == NULL) \ + if (S->_flags & _IO_NO_WRITES) \ + { \ + __set_errno (EBADF); \ + return -1; \ + } \ + if (Format == NULL) \ { \ MAYBE_SET_EINVAL; \ return -1; \ @@ -113,7 +118,12 @@ ssize_t __wprintf_pad __P ((FILE *, wchar_t pad, size_t n)); do \ { \ /* Check file argument for consistence. */ \ - if (!__validfp(S) || !S->__mode.__write || Format == NULL) \ + if (!__validfp (S) || !S->__mode.__write) \ + { \ + __set_errno (EBADF); \ + return -1; \ + } \ + if (Format == NULL) \ { \ __set_errno (EINVAL); \ return -1; \ -- cgit v1.1