[commits] r9731 - in /fsf/trunk/libc: ChangeLog iconv/iconv_prog.c localedata/ChangeLog localedata/locales/i18n

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Tue Jan 26 00:03:06 2010
New Revision: 9731

Log:
Import glibc-mainline for 2010-01-26

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/iconv/iconv_prog.c
    fsf/trunk/libc/localedata/ChangeLog
    fsf/trunk/libc/localedata/locales/i18n

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Tue Jan 26 00:03:06 2010
@@ -1,3 +1,7 @@
+2010-01-25  Andreas Schwab  <schwab@xxxxxxxxxx>
+
+	* iconv/iconv_prog.c (write_output): Fix check for open failure.
+
 2010-01-22  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	[BZ #11200]

Modified: fsf/trunk/libc/iconv/iconv_prog.c
==============================================================================
--- fsf/trunk/libc/iconv/iconv_prog.c (original)
+++ fsf/trunk/libc/iconv/iconv_prog.c Tue Jan 26 00:03:06 2010
@@ -442,7 +442,7 @@
       if (output_file != NULL && strcmp (output_file, "-") != 0)
 	{
 	  *output = fopen (output_file, "w");
-	  if (output == NULL)
+	  if (*output == NULL)
 	    error (EXIT_FAILURE, errno, _("cannot open output file"));
 	}
       else

Modified: fsf/trunk/libc/localedata/ChangeLog
==============================================================================
--- fsf/trunk/libc/localedata/ChangeLog (original)
+++ fsf/trunk/libc/localedata/ChangeLog Tue Jan 26 00:03:06 2010
@@ -1,3 +1,7 @@
+2010-01-25  Andreas Schwab  <schwab@xxxxxxxxxx>
+
+	* locales/i18n: Don't map U00DF to U1E9E in toupper table.
+
 2009-11-24  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	* locales/hsb_DE: Define week, first_weekday, and first_workday.

Modified: fsf/trunk/libc/localedata/locales/i18n
==============================================================================
--- fsf/trunk/libc/localedata/locales/i18n (original)
+++ fsf/trunk/libc/localedata/locales/i18n Tue Jan 26 00:03:06 2010
@@ -928,8 +928,7 @@
    (<U006D>,<U004D>);(<U006E>,<U004E>);(<U006F>,<U004F>);(<U0070>,<U0050>);/
    (<U0071>,<U0051>);(<U0072>,<U0052>);(<U0073>,<U0053>);(<U0074>,<U0054>);/
    (<U0075>,<U0055>);(<U0076>,<U0056>);(<U0077>,<U0057>);(<U0078>,<U0058>);/
-   (<U0079>,<U0059>);(<U007A>,<U005A>);(<U00B5>,<U039C>);(<U00DF>,<U1E9E>);/
-   (<U00E0>,<U00C0>);/
+   (<U0079>,<U0059>);(<U007A>,<U005A>);(<U00B5>,<U039C>);(<U00E0>,<U00C0>);/
    (<U00E1>,<U00C1>);(<U00E2>,<U00C2>);(<U00E3>,<U00C3>);(<U00E4>,<U00C4>);/
    (<U00E5>,<U00C5>);(<U00E6>,<U00C6>);(<U00E7>,<U00C7>);(<U00E8>,<U00C8>);/
    (<U00E9>,<U00C9>);(<U00EA>,<U00CA>);(<U00EB>,<U00CB>);(<U00EC>,<U00CC>);/