diff options
author | Ulrich Drepper <drepper@redhat.com> | 1998-07-08 22:53:56 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1998-07-08 22:53:56 +0000 |
commit | 4bae55673314ecad6127cc156b1e5e5bb3c88b57 (patch) | |
tree | 0852b2d8bcf4eaf45fad45bac6ae5d51955dbad9 /libio | |
parent | a3d6fb9b428a51048b31eacd6fe7fad7095ccfd5 (diff) | |
download | glibc-4bae55673314ecad6127cc156b1e5e5bb3c88b57.tar.gz |
Update.
1998-07-08 22:18 Ulrich Drepper <drepper@cygnus.com>
* elf/Versions: Add _dl_mcount_wrapper_check.
* elf/dlfcn.h (DL_CALL_FCT): Don't test _dl_profile_map, simply use
_dl_mcount_wrapper_check.
* iconv/skeleton.c: Use DL_CALL_FCT, not _CALL_DL_FCT.
* elf/dl-reloc.c (_dl_relocate_object): Don't declare using
internal_function.
* elf/ldsodefs.h: Likewise.
* io/fcntl.h: Define SEEK_SET, SEEK_CUR, and SEEK_END.
* libio/stdio.h: Make sure va_list is defined for X/Open.
Define P_tmpdir for X/Open.
* posix/regex.h: Fix typo.
* posix/unistd.h: Define intptr_t if not already happened.
Add pthread_atfork prototype.
* sysdeps/generic/bits/types.h: Define __intptr_t.
* sysdeps/unix/sysv/linux/alpha/bits/types.h: Likewise.
* sysdeps/unix/sysv/linux/bits/types.h: Likewise.
* sysdeps/unix/sysv/linux/bits/mips/types.h: Likewise.
* sysdeps/unix/sysv/linux/bits/sparc/sparc64/types.h: Likewise.
* sysdeps/unix/sysv/sysv4/solaris2/bits/types.h: Likewise.
* sysdeps/wordsize-32/stdint.h: Don't define intptr_t if already done.
* sysdeps/wordsize-64/stdint.h: Likewise.
* posix/bits/posix1_lim.h: Define _POSIX_CLOCKRES_MIN.
* signal/Makefile (headers): Add bits/sigthread.h.
* signal/signal.h: Include bits/sigthread.h.
* sysdeps/generic/bits/sigthread.h: New file.
* stdlib/stdlib.h: Declare rand_r use __USE_POSIX.
* sysdeps/generic/bits/confname.h: Define _PC_FILESIZEBITS.
* sysdeps/posix/pathconf.c: Handle _PC_FILESIZEBITS.
* sysdeps/unix/sysv/linux/alpha/fpathconf.c: New file.
* sysdeps/unix/sysv/linux/alpha/pathconf.c: New file.
* sysdeps/generic/bits/dlfcn.h: Define RTLD_LOCAL.
* elf/rtld.c: Remove preloading and loadpath variables in SUID
programs.
* sysdeps/generic/dl-sysdep.c: Define unsetenv.
* sysdeps/unix/sysv/linux/i386/dl-librecon.h: Define other envvar
names.
* sysdeps/unix/sysv/linux/bits/errno.h: Define ECANCELED.
* sysdeps/unix/sysv/linux/bits/fcntl.h: Define O_RSYNC and O_DSYNC.
Remove O_READ and O_WRITE definition.
* sysdeps/unix/sysv/linux/bits/resource.h: Define RLIM_SAVED_MAX
and RLIM_SAVED_CUR.
* sysdeps/unix/sysv/linux/fstatvfs.h: Handle UFS filesystem.
1998-07-06 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* Makerules ($(common-objpfx)sysd-versions): Expect awk script in
scripts directory. Pass move-if-change to awk.
(common-generated): Add $(version-maps) and sysd-versions.
* versions.awk: Moved to...
* scripts/versions.awk: ... here. Use move-if-change to void
touching unchanged files. Print "version-maps = ..." instead of
"all-version-maps = ..." and without $(common-objpfx). Explain
expected variable names.
* Makefile (distribute): Updated.
1998-07-06 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* misc/getttyent.c (getttyent): Don't return with locked stream.
* misc/mntent_r.c (__getmntent_r): Likewise.
1998-07-07 18:24 Ulrich Drepper <drepper@cygnus.com>
* libio/fileops.c (_IO_do_write): Don't shrink wwrite buffer to zero
if stream is line buffered.
(_io_file_overflow): Likewise.
* libio/libio.h (_IO_putc_unlocked): Make sure that for line-buffered
streams writing '\n' flushes the string.
Diffstat (limited to 'libio')
-rw-r--r-- | libio/fileops.c | 4 | ||||
-rw-r--r-- | libio/libio.h | 17 | ||||
-rw-r--r-- | libio/stdio.h | 6 |
3 files changed, 21 insertions, 6 deletions
diff --git a/libio/fileops.c b/libio/fileops.c index 1219abea5d..66c2fc514b 100644 --- a/libio/fileops.c +++ b/libio/fileops.c @@ -316,7 +316,7 @@ _IO_do_write (fp, data, to_do) fp->_cur_column = _IO_adjust_column (fp->_cur_column - 1, data, to_do) + 1; _IO_setg (fp, fp->_IO_buf_base, fp->_IO_buf_base, fp->_IO_buf_base); fp->_IO_write_base = fp->_IO_write_ptr = fp->_IO_buf_base; - fp->_IO_write_end = ((fp->_flags & (_IO_LINE_BUF+_IO_UNBUFFERED)) + fp->_IO_write_end = ((fp->_flags & (_IO_UNBUFFERED)) ? fp->_IO_buf_base : fp->_IO_buf_end); return count != to_do ? EOF : 0; } @@ -410,7 +410,7 @@ _IO_file_overflow (f, ch) f->_IO_write_end = f->_IO_buf_end; f->_IO_read_base = f->_IO_read_ptr = f->_IO_read_end; - if (f->_flags & (_IO_LINE_BUF+_IO_UNBUFFERED)) + if (f->_flags & (_IO_UNBUFFERED)) f->_IO_write_end = f->_IO_write_ptr; f->_flags |= _IO_CURRENTLY_PUTTING; } diff --git a/libio/libio.h b/libio/libio.h index c3dd640b2f..410794f77c 100644 --- a/libio/libio.h +++ b/libio/libio.h @@ -287,10 +287,23 @@ extern int __overflow __P ((_IO_FILE *, int)); && __underflow (_fp) == EOF ? EOF \ : *(unsigned char *) (_fp)->_IO_read_ptr) -#define _IO_putc_unlocked(_ch, _fp) \ +#ifdef __GNUC__ +# define _IO_putc_unlocked(_ch, _fp) \ + (__extension__ \ + ({ unsigned char _chl = (_ch); \ + (((_fp)->_IO_write_ptr >= (_fp)->_IO_write_end \ + || (_chl == '\n' && ((_fp)->_flags & _IO_LINE_BUF))) \ + ? __overflow (_fp, (unsigned char) _chl) \ + : (unsigned char) (*(_fp)->_IO_write_ptr++ = _chl)); })) +#else +# define _IO_putc_unlocked(_ch, _fp) \ (((_fp)->_IO_write_ptr >= (_fp)->_IO_write_end) \ ? __overflow (_fp, (unsigned char) (_ch)) \ - : (unsigned char) (*(_fp)->_IO_write_ptr++ = (_ch))) + : ((unsigned char) (*(_fp)->_IO_write_ptr = (_ch)) == '\n' \ + && ((_fp)->_flags & _IO_LINE_BUF) \ + ? __overflow (_fp, (unsigned char) *(_fp)->_IO_write_ptr) \ + : (unsigned char) (*(_fp)->_IO_write_ptr++))) +#endif #define _IO_feof_unlocked(__fp) (((__fp)->_flags & _IO_EOF_SEEN) != 0) #define _IO_ferror_unlocked(__fp) (((__fp)->_flags & _IO_ERR_SEEN) != 0) diff --git a/libio/stdio.h b/libio/stdio.h index b220e41081..1167d3cf39 100644 --- a/libio/stdio.h +++ b/libio/stdio.h @@ -32,7 +32,9 @@ __BEGIN_DECLS # define __need_NULL # include <stddef.h> -# define __need___va_list +# ifndef __USE_XOPEN +# define __need___va_list +# endif # include <stdarg.h> # include <bits/types.h> @@ -111,7 +113,7 @@ extern void __libc_fatal __P ((__const char *__message)) #define SEEK_END 2 /* Seek from end of file. */ -#ifdef __USE_SVID +#if defined __USE_SVID || defined __USE_XOPEN /* Default path prefix for `tempnam' and `tmpnam'. */ # define P_tmpdir "/tmp" #endif |