[commits] r6519 - in /fsf/trunk/libc: ./ libio/ localedata/ localedata/charmaps/ stdio-common/

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Wed Jul  9 00:05:06 2008
New Revision: 6519

Log:
Import glibc-mainline for 2008-07-09

Added:
    fsf/trunk/libc/stdio-common/tst-setvbuf1.c
    fsf/trunk/libc/stdio-common/tst-setvbuf1.expect
Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/libio/iosetvbuf.c
    fsf/trunk/libc/localedata/ChangeLog
    fsf/trunk/libc/localedata/charmaps/UTF-8
    fsf/trunk/libc/stdio-common/Makefile

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Wed Jul  9 00:05:06 2008
@@ -1,3 +1,14 @@
+2008-07-08  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	* stdio-common/Makefile: Add rules to build and run tst-setvbuf1.
+	* stdio-common/tst-setvbuf1.c: New file.
+	* stdio-common/tst-setvbuf1.expect: New file.
+
+	[BZ #6719]
+	* libio/iosetvbuf.c (_IO_setvbuf): Correctly clear buffering flags
+	when selecting fully-buffered stream.
+	Patch by Wang Xin <wxinee@xxxxxxxxx>.
+
 2008-07-06  Samuel Thibault  <samuel.thibault@xxxxxxxxxxxx>
 
 	* sysdeps/mach/hurd/open.c: Include <stdio.h>.

Modified: fsf/trunk/libc/libio/iosetvbuf.c
==============================================================================
--- fsf/trunk/libc/libio/iosetvbuf.c (original)
+++ fsf/trunk/libc/libio/iosetvbuf.c Wed Jul  9 00:05:06 2008
@@ -45,7 +45,7 @@
   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)

Modified: fsf/trunk/libc/localedata/ChangeLog
==============================================================================
--- fsf/trunk/libc/localedata/ChangeLog (original)
+++ fsf/trunk/libc/localedata/ChangeLog Wed Jul  9 00:05:06 2008
@@ -1,3 +1,9 @@
+2008-07-08  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	[BZ #6713]
+	* charmaps/UTF-8: Fix U1DBA entry representation.
+	Patch by Colin Watson.
+
 2008-06-27  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	* tst-strptime.c (do_test): Add test of %EY.

Modified: fsf/trunk/libc/localedata/charmaps/UTF-8
==============================================================================
--- fsf/trunk/libc/localedata/charmaps/UTF-8 (original)
+++ fsf/trunk/libc/localedata/charmaps/UTF-8 Wed Jul  9 00:05:06 2008
@@ -5961,7 +5961,7 @@
 <U1DB7>     /xe1/xb6/xb7 MODIFIER LETTER SMALL UPSILON
 <U1DB8>     /xe1/xb6/xb8 MODIFIER LETTER SMALL CAPITAL U
 <U1DB9>     /xe1/xb6/xb9 MODIFIER LETTER SMALL V WITH HOOK
-<U1DBA>     /xe1/xb6/xbe MODIFIER LETTER SMALL TURNED V
+<U1DBA>     /xe1/xb6/xba MODIFIER LETTER SMALL TURNED V
 <U1DBB>     /xe1/xb6/xbb MODIFIER LETTER SMALL Z
 <U1DBC>     /xe1/xb6/xbc MODIFIER LETTER SMALL Z WITH RETROFLEX HOOK
 <U1DBD>     /xe1/xb6/xbd MODIFIER LETTER SMALL Z WITH CURL

Modified: fsf/trunk/libc/stdio-common/Makefile
==============================================================================
--- fsf/trunk/libc/stdio-common/Makefile (original)
+++ fsf/trunk/libc/stdio-common/Makefile Wed Jul  9 00:05:06 2008
@@ -1,4 +1,4 @@
-# Copyright (C) 1991-2006, 2007 Free Software Foundation, Inc.
+# Copyright (C) 1991-2006, 2007, 2008 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -58,7 +58,7 @@
 	 tst-popen tst-unlockedio tst-fmemopen2 tst-put-error tst-fgets \
 	 tst-fwrite bug16 bug17 tst-swscanf tst-sprintf2 bug18 bug18a \
 	 bug19 bug19a tst-popen2 scanf13 scanf14 scanf15 bug20 bug21 bug22 \
-	 scanf16 scanf17
+	 scanf16 scanf17 tst-setvbuf1
 
 test-srcs = tst-unbputc tst-printf
 
@@ -130,3 +130,7 @@
 ifneq (,$(filter %REENTRANT, $(defines)))
 CPPFLAGS += -D_IO_MTSAFE_IO
 endif
+
+$(objpfx)tst-setvbuf1.out: tst-setvbuf1.expect $(objpfx)tst-setvbuf1
+	$(built-program-cmd) > $@ 2>&1
+	cmp tst-setvbuf1.expect $@

Added: fsf/trunk/libc/stdio-common/tst-setvbuf1.c
==============================================================================
--- fsf/trunk/libc/stdio-common/tst-setvbuf1.c (added)
+++ fsf/trunk/libc/stdio-common/tst-setvbuf1.c Wed Jul  9 00:05:06 2008
@@ -1,0 +1,19 @@
+#include <stdio.h>
+
+static int
+do_test (void)
+{
+  if (setvbuf (stderr, NULL, _IOFBF, BUFSIZ) != 0)
+    {
+      puts ("Set full buffer error.");
+      return 1;
+    }
+
+  fprintf (stderr, "Output #1 <stderr>.\n");
+  printf ("Output #2 <stdout>.\n");
+
+  return 0;
+}
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"

Added: fsf/trunk/libc/stdio-common/tst-setvbuf1.expect
==============================================================================
--- fsf/trunk/libc/stdio-common/tst-setvbuf1.expect (added)
+++ fsf/trunk/libc/stdio-common/tst-setvbuf1.expect Wed Jul  9 00:05:06 2008
@@ -1,0 +1,2 @@
+Output #2 <stdout>.
+Output #1 <stderr>.