diff options
Diffstat (limited to 'stdio-common')
| -rw-r--r-- | stdio-common/Makefile | 2 | ||||
| -rw-r--r-- | stdio-common/fcloseall.c | 44 | ||||
| -rw-r--r-- | stdio-common/printf-parse.h | 4 | ||||
| -rw-r--r-- | stdio-common/vfprintf.c | 14 |
4 files changed, 61 insertions, 3 deletions
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 <drepper@cygnus.com>, 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 <libc-lock.h> +#include <stdio.h> + +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 <assert.h> +#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; \ |