aboutsummaryrefslogtreecommitdiff
path: root/libio/fileops.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-09-06 09:56:14 +0000
committerUlrich Drepper <drepper@redhat.com>2003-09-06 09:56:14 +0000
commiteb35b0972f174cd58f118737c2935653309df7e9 (patch)
treef61603e4b104c032b3ce7b4293eb9fe38901b6ee /libio/fileops.c
parent483b8cc6cfd531611f6141b288a5e16e8010905c (diff)
downloadglibc-eb35b0972f174cd58f118737c2935653309df7e9.tar
glibc-eb35b0972f174cd58f118737c2935653309df7e9.tar.gz
glibc-eb35b0972f174cd58f118737c2935653309df7e9.tar.bz2
glibc-eb35b0972f174cd58f118737c2935653309df7e9.zip
Update.
* sysdeps/unix/sysv/linux/tcgetattr.c (__tcgetattr): Fill in c_ispeed and c_ospeed fields. * sysdeps/unix/sysv/linux/speed.c (cfsetospeed): Set c_ospeed field. (cfsetispeed): Set c_ispeed field. * sysdeps/unix/sysv/linux/tcsetattr.c (IBAUD0): Define unconditionally to match corresponding speed.c code. 2003-09-06 Ulrich Drepper <drepper@redhat.com> * libio/wfileops.c (_IO_wfile_underflow): Mark beginning of the narrow character buffer. * libio/Makefile: Add rules to build and run bug-ftell. * libio/bug-ftell.c: New file. * stdio-common/vfprintf.c: Don't use the first grouping number twice. * stdio-common/vfscanf.c (vfscanf): Fix recognition of characters matching the decimal point and possibly leading the thousands separator. This caused the recognition of thousands separators to always fail. 2003-09-05 Ulrich Drepper <drepper@redhat.com> * libio/fileops.c (_IO_new_file_overflow): Handle switching to write mode from read in backup buffer. * libio/Makefile (tests): Add bug-ungetc2. * libio/bug-ungetc2.c: New file. 2003-09-05 Roland McGrath <roland@redhat.com> >>>>>>> 1.7905 * sysdeps/unix/sysv/linux/linux_fsinfo.h: Define VXFS_SUPER_MAGIC.
Diffstat (limited to 'libio/fileops.c')
-rw-r--r--libio/fileops.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/libio/fileops.c b/libio/fileops.c
index 1a633190c7..050fa66a46 100644
--- a/libio/fileops.c
+++ b/libio/fileops.c
@@ -849,15 +849,13 @@ _IO_new_file_overflow (f, ch)
f->_IO_read_base - f->_IO_buf_base);
f->_IO_read_ptr = f->_IO_read_base;
}
- else
- {
- if (f->_IO_read_ptr == f->_IO_buf_end)
- f->_IO_read_end = f->_IO_read_ptr = f->_IO_buf_base;
- f->_IO_write_ptr = f->_IO_read_ptr;
- f->_IO_write_base = f->_IO_write_ptr;
- f->_IO_write_end = f->_IO_buf_end;
- f->_IO_read_base = f->_IO_read_ptr = f->_IO_read_end;
- }
+
+ if (f->_IO_read_ptr == f->_IO_buf_end)
+ f->_IO_read_end = f->_IO_read_ptr = f->_IO_buf_base;
+ f->_IO_write_ptr = f->_IO_read_ptr;
+ f->_IO_write_base = f->_IO_write_ptr;
+ f->_IO_write_end = f->_IO_buf_end;
+ f->_IO_read_base = f->_IO_read_ptr = f->_IO_read_end;
f->_flags |= _IO_CURRENTLY_PUTTING;
if (f->_mode <= 0 && f->_flags & (_IO_LINE_BUF+_IO_UNBUFFERED))