diff options
Diffstat (limited to 'libio')
| -rw-r--r-- | libio/Makefile | 3 | ||||
| -rw-r--r-- | libio/Versions | 2 | ||||
| -rw-r--r-- | libio/iofdopen.c | 4 | ||||
| -rw-r--r-- | libio/iofputs_u.c | 42 | ||||
| -rw-r--r-- | libio/iopopen.c | 22 | ||||
| -rw-r--r-- | libio/stdio.h | 6 |
6 files changed, 76 insertions, 3 deletions
diff --git a/libio/Makefile b/libio/Makefile index bc43ebb674..84240bd852 100644 --- a/libio/Makefile +++ b/libio/Makefile @@ -50,7 +50,8 @@ CPPFLAGS-.o += -DIO_DEBUG ifneq (,$(filter %REENTRANT, $(defines))) routines += clearerr_u feof_u ferror_u fputc_u getc_u getchar_u \ - iofflush_u putc_u putchar_u peekc iofread_u iofwrite_u iofgets_u + iofflush_u putc_u putchar_u peekc iofread_u iofwrite_u iofgets_u \ + iofputs_u CPPFLAGS += -D_IO_MTSAFE_IO endif diff --git a/libio/Versions b/libio/Versions index 467ba22b74..7cc09454c3 100644 --- a/libio/Versions +++ b/libio/Versions @@ -89,6 +89,6 @@ libc { # f* fgetpos64; fopen64; freopen64; fseeko; fseeko64; fsetpos64; ftello; ftello64; fopen; fclose; fdopen; fread_unlocked; fwrite_unlocked; - fgets_unlocked; + fgets_unlocked; fputs_unlocked; } } diff --git a/libio/iofdopen.c b/libio/iofdopen.c index a51bc3c49a..44be50a37d 100644 --- a/libio/iofdopen.c +++ b/libio/iofdopen.c @@ -30,8 +30,12 @@ #include <fcntl.h> #ifndef _IO_fcntl +#ifdef _LIBC +#define _IO_fcntl __fcntl +#else #define _IO_fcntl fcntl #endif +#endif _IO_FILE * _IO_new_fdopen (fd, mode) diff --git a/libio/iofputs_u.c b/libio/iofputs_u.c new file mode 100644 index 0000000000..6fca3048eb --- /dev/null +++ b/libio/iofputs_u.c @@ -0,0 +1,42 @@ +/* Copyright (C) 1993, 1996, 1997, 1998 Free Software Foundation, Inc. + This file is part of the GNU IO Library. + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2, or (at + your option) any later version. + + This 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 + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this library; see the file COPYING. If not, write to + the Free Software Foundation, 59 Temple Place - Suite 330, Boston, + MA 02111-1307, USA. + + As a special exception, if you link this library with files + compiled with a GNU compiler to produce an executable, this does + not cause the resulting executable to be covered by the GNU General + Public License. This exception does not however invalidate any + other reasons why the executable file might be covered by the GNU + General Public License. */ + +#include "libioP.h" +#include <string.h> + +int +fputs_unlocked (str, fp) + const char *str; + _IO_FILE *fp; +{ + _IO_size_t len = strlen (str); + int result; + CHECK_FILE (fp, EOF); + if (_IO_sputn (fp, str, len) != len) + result = EOF; + else + result = 1; + return result; +} diff --git a/libio/iopopen.c b/libio/iopopen.c index 3d2a79635d..30ff4b8ae7 100644 --- a/libio/iopopen.c +++ b/libio/iopopen.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1993, 1997, 1998 Free Software Foundation, Inc. This file is part of the GNU IO Library. Written by Per Bothner <bothner@cygnus.com>. @@ -41,25 +41,41 @@ #include <sys/wait.h> #ifndef _IO_fork +#ifdef _LIBC +#define _IO_fork __vfork +#else #define _IO_fork vfork /* defined in libiberty, if needed */ +#endif extern _IO_pid_t _IO_fork __P ((void)); #endif #endif /* _IO_HAVE_SYS_WAIT */ #ifndef _IO_pipe +#ifdef _LIBC +#define _IO_pipe __pipe +#else #define _IO_pipe pipe +#endif extern int _IO_pipe __P ((int des[2])); #endif #ifndef _IO_dup2 +#ifdef _LIBC +#define _IO_dup2 __dup2 +#else #define _IO_dup2 dup2 +#endif extern int _IO_dup2 __P ((int fd, int fd2)); #endif #ifndef _IO_waitpid +#ifdef _LIBC +#define _IO_waitpid __waitpid +#else #define _IO_waitpid waitpid #endif +#endif #ifndef _IO_execl #define _IO_execl execl @@ -69,8 +85,12 @@ extern int _IO_dup2 __P ((int fd, int fd2)); #endif #ifndef _IO_close +#ifdef _LIBC +#define _IO_close __close +#else #define _IO_close close #endif +#endif struct _IO_proc_file { diff --git a/libio/stdio.h b/libio/stdio.h index eb0d98d7d2..87ca35b068 100644 --- a/libio/stdio.h +++ b/libio/stdio.h @@ -516,6 +516,12 @@ getline (char **__lineptr, size_t *__n, FILE *__stream) /* Write a string to STREAM. */ extern int fputs __P ((__const char *__restrict __s, FILE *__restrict __stream)); + +#ifdef __USE_GNU +/* This function does the same as `fgets' but does not lock the stream. */ +extern int fputs_unlocked __P ((__const char *__restrict __s, + FILE *__restrict __stream)); +#endif /* Write a string, followed by a newline, to stdout. */ extern int puts __P ((__const char *__s)); |