diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | crypt/md5-crypt.c | 1 | ||||
| -rw-r--r-- | libio/fileops.c | 10 |
3 files changed, 9 insertions, 4 deletions
@@ -1,5 +1,7 @@ 2002-11-10 Roland McGrath <roland@redhat.com> + * crypt/md5-crypt.c: Doc fix. + * sysdeps/unix/make-syscalls.sh: Insert $(make-target-directory) at the beginning of generated target commands. diff --git a/crypt/md5-crypt.c b/crypt/md5-crypt.c index 8cd23e3fa6..ededfaec71 100644 --- a/crypt/md5-crypt.c +++ b/crypt/md5-crypt.c @@ -1,4 +1,5 @@ /* One way encryption based on MD5 sum. + Compatible with the behavior of MD5 crypt introduced in FreeBSD 2.0. Copyright (C) 1996,1997,1999,2000,2001,2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. diff --git a/libio/fileops.c b/libio/fileops.c index c1892f34b8..032f4a7269 100644 --- a/libio/fileops.c +++ b/libio/fileops.c @@ -62,6 +62,7 @@ extern int errno; # define lseek(FD, Offset, Whence) __lseek (FD, Offset, Whence) # define read(FD, Buf, NBytes) __read (FD, Buf, NBytes) # define write(FD, Buf, NBytes) __write (FD, Buf, NBytes) +# define _IO_do_write _IO_new_do_write /* For macro uses. */ #else # define _IO_new_do_write _IO_do_write # define _IO_new_file_attach _IO_file_attach @@ -854,16 +855,16 @@ _IO_new_file_overflow (f, ch) f->_IO_write_end = f->_IO_write_ptr; } if (ch == EOF) - return _IO_new_do_write(f, f->_IO_write_base, - f->_IO_write_ptr - f->_IO_write_base); + return INTUSE(_IO_do_write) (f, f->_IO_write_base, + f->_IO_write_ptr - f->_IO_write_base); if (f->_IO_write_ptr == f->_IO_buf_end ) /* Buffer is really full */ if (_IO_do_flush (f) == EOF) return EOF; *f->_IO_write_ptr++ = ch; if ((f->_flags & _IO_UNBUFFERED) || ((f->_flags & _IO_LINE_BUF) && ch == '\n')) - if (_IO_new_do_write(f, f->_IO_write_base, - f->_IO_write_ptr - f->_IO_write_base) == EOF) + if (INTUSE(_IO_do_write) (f, f->_IO_write_base, + f->_IO_write_ptr - f->_IO_write_base) == EOF) return EOF; return (unsigned char) ch; } @@ -1548,6 +1549,7 @@ _IO_file_xsgetn_maybe_mmap (fp, data, n) } #ifdef _LIBC +# undef _IO_do_write versioned_symbol (libc, _IO_new_do_write, _IO_do_write, GLIBC_2_1); versioned_symbol (libc, _IO_new_file_attach, _IO_file_attach, GLIBC_2_1); versioned_symbol (libc, _IO_new_file_close_it, _IO_file_close_it, GLIBC_2_1); |