about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2008-07-08 16:21:11 +0000
committerUlrich Drepper <drepper@redhat.com>2008-07-08 16:21:11 +0000
commit38dc8fad642838e0ef54392bcec069ffb8dc3c98 (patch)
tree73610da11d7f99e0cd44e2f0b4465ebe73c273c5
parent80d41976443f045c747b67ed3a5dddb66c519227 (diff)
downloadglibc-38dc8fad642838e0ef54392bcec069ffb8dc3c98.tar.gz
glibc-38dc8fad642838e0ef54392bcec069ffb8dc3c98.tar.xz
glibc-38dc8fad642838e0ef54392bcec069ffb8dc3c98.zip
[BZ #6719]
2008-07-08  Ulrich Drepper  <drepper@redhat.com>
	[BZ #6719]
	* libio/iosetvbuf.c (_IO_setvbuf): Correctly clear buffering flags
	when selecting fully-buffered stream.
	Patch by Wang Xin <wxinee@gmail.com>.
-rw-r--r--ChangeLog7
-rw-r--r--libio/iosetvbuf.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0ea85f9078..3a9f983441 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-07-08  Ulrich Drepper  <drepper@redhat.com>
+
+	[BZ #6719]
+	* libio/iosetvbuf.c (_IO_setvbuf): Correctly clear buffering flags
+	when selecting fully-buffered stream.
+	Patch by Wang Xin <wxinee@gmail.com>.
+
 2008-07-06  Samuel Thibault  <samuel.thibault@ens-lyon.org>
 
 	* sysdeps/mach/hurd/open.c: Include <stdio.h>.
diff --git a/libio/iosetvbuf.c b/libio/iosetvbuf.c
index 7580230eb6..a92eaebf85 100644
--- a/libio/iosetvbuf.c
+++ b/libio/iosetvbuf.c
@@ -45,7 +45,7 @@ _IO_setvbuf (fp, buf, mode, size)
   switch (mode)
     {
     case _IOFBF:
-      fp->_IO_file_flags &= ~_IO_LINE_BUF|_IO_UNBUFFERED;
+      fp->_IO_file_flags &= ~(_IO_LINE_BUF|_IO_UNBUFFERED);
       if (buf == NULL)
 	{
 	  if (fp->_IO_buf_base == NULL)