diff options
| author | Roland McGrath <roland@gnu.org> | 1996-05-09 00:37:21 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 1996-05-09 00:37:21 +0000 |
| commit | 7c713e287e50dc338779ed1a6c6ac701720a3a41 (patch) | |
| tree | 00dc9bb790eef870a0624a5813120cc3971b16ff /libio/ioputs.c | |
| parent | f0523145cc30a32daa64dd0bd5661b0b204f00da (diff) | |
| download | glibc-7c713e287e50dc338779ed1a6c6ac701720a3a41.tar glibc-7c713e287e50dc338779ed1a6c6ac701720a3a41.tar.gz glibc-7c713e287e50dc338779ed1a6c6ac701720a3a41.tar.bz2 glibc-7c713e287e50dc338779ed1a6c6ac701720a3a41.zip | |
Wed May 8 20:04:29 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* Rules (subdir_install): Depend on $(common-objpfx)sor-$(subdir).
[! libc.so-version]: Clear static-only-routines.
($(common-objpfx)sor-$(subdir)): New target.
[static-only-routines]: New static pattern rule for these .so's.
* Makerules [libc.so-version] ($(slibdir)/libc.so): Target removed.
[libc.so-version] ($(libdir)/libc.so, $(common-objpfx)libc-syms.so):
New targets replace it.
(install) [libc.so-version]: Depend on $(libdir)/libc.so instead of
$(slibdir)/libc.so.
* io/Makefile (static-only-routines): New variable.
* configure.in: Check for tools objdump and objcopy, and for awk.
* config.make.in (OBJDUMP, OBJCOPY, AWK): New variables.
Thu May 9 01:24:00 1996 Ulrich Drepper <drepper@cygnus.com>
* locale/programs/config.h: Remove definition of wint_t.
* locale/programs/ld-collate.c: Include <wchar.h> instead of
<wcstr.h>.
* manual/time.texi: Add some more description for %U and %W
format of strftime. Describe new format %V of strftime.
* resolv/gethnamaddr.c: Prevent warning by preventing variable
definition.
* stdio-common/_itoa.c: Ditto.
Tue May 7 23:43:07 1996 Ulrich Drepper <drepper@cygnus.com>
* libio/clearerr.c, libio/feof.c, libio/ferror.c, libio/fgetc.c,
libio/fileno.c, libio/fputc.c, libio/freopen.c, libio/fseek.c,
libio/genops.c, libio/getc.c, libio/getchar.c, libio/iofclose.c,
libio/iofflush.c, libio/iofgetpos.c, libio/iofgets.c,
libio/iofputs.c, libio/iofread.c, libio/iofsetpos.c,
libio/ioftell.c, libio/iofwrite.c, libio/iogetdelim.c,
libio/iogets.c, libio/ioputs.c, libio/iosetbuffer.c,
libio/iosetvbuf.c, libio/ioungetc.c, libio/iovsprintf.c,
libio/libio.h, libio/putc.c, libio/putchar.c, libio/rewind.c,
libio/stdio.h, stdio-common/printf_fp.c, stdio-common/vfprintf.c,
stdio-common/vfscanf.c: Prepare for reentrent libio.
* libio/clearerr_u.c, libio/feof_u.c, libio/ferror_u.c,
libio/fputc_u.c, libio/getc_u.c, libio/getchar_u.c,
libio/iofflush_u.c, libio/putc_u.c, libio/putchar_u.c: New files.
Used in reentrent libio.
* misc/getusershell.c: Prevent warnings.
Diffstat (limited to 'libio/ioputs.c')
| -rw-r--r-- | libio/ioputs.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/libio/ioputs.c b/libio/ioputs.c index 129da1d821..6c52f7521c 100644 --- a/libio/ioputs.c +++ b/libio/ioputs.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993 Free Software Foundation +/* Copyright (C) 1993, 1996 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 @@ -28,11 +28,15 @@ int _IO_puts (str) const char *str; { + int result; _IO_size_t len = strlen (str); - if (_IO_sputn (_IO_stdout, str, len) != len) - return EOF; - if (_IO_putc ('\n', _IO_stdout) == EOF) - return EOF; - return len+1; + _IO_flockfile (fp); + if (_IO_sputn (_IO_stdout, str, len) == len + && _IO_putc_unlocked ('\n', _IO_stdout) != EOF) + result = len + 1; + else + result = EOF; + _IO_funlockfile (fp); + return result; } weak_alias (_IO_puts, puts) |