[commits] r14388 - in /fsf/glibc-2_14-branch/libc: ChangeLog debug/xtrace.sh malloc/memusage.sh

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Fri Jul  1 00:04:34 2011
New Revision: 14388

Log:
Import glibc-2.14 for 2011-07-01

Modified:
    fsf/glibc-2_14-branch/libc/ChangeLog
    fsf/glibc-2_14-branch/libc/debug/xtrace.sh
    fsf/glibc-2_14-branch/libc/malloc/memusage.sh

Modified: fsf/glibc-2_14-branch/libc/ChangeLog
==============================================================================
--- fsf/glibc-2_14-branch/libc/ChangeLog (original)
+++ fsf/glibc-2_14-branch/libc/ChangeLog Fri Jul  1 00:04:34 2011
@@ -1,3 +1,9 @@
+2011-06-28  Ulrich Drepper  <drepper@xxxxxxxxx>
+
+	[BZ #12935]
+	* malloc/memusage.sh: Fix quoting in message.
+	* debug/xtrace.sh: Likewise.
+
 2011-06-27  Andreas Schwab  <schwab@xxxxxxxxxx>
 
 	* iconvdata/gb18030.c (BODY for TO_LOOP): Fix encoding of non-BMP

Modified: fsf/glibc-2_14-branch/libc/debug/xtrace.sh
==============================================================================
--- fsf/glibc-2_14-branch/libc/debug/xtrace.sh (original)
+++ fsf/glibc-2_14-branch/libc/debug/xtrace.sh Fri Jul  1 00:04:34 2011
@@ -30,7 +30,7 @@
 
 # Refer to --help option.
 help_info() {
-  printf >&2 $"Try \`%s --help' or `%s --usage' for more information.\n" xtrace xtrace
+  printf >&2 $"Try \`%s --help' or \`%s --usage' for more information.\n" xtrace xtrace
   exit 1
 }
 

Modified: fsf/glibc-2_14-branch/libc/malloc/memusage.sh
==============================================================================
--- fsf/glibc-2_14-branch/libc/malloc/memusage.sh (original)
+++ fsf/glibc-2_14-branch/libc/malloc/memusage.sh Fri Jul  1 00:04:34 2011
@@ -24,7 +24,7 @@
 
 # Print usage message.
 do_usage() {
-  printf >&2 $"Try \`%s --help' or `%s --usage' for more information.\n" memusage memusage
+  printf >&2 $"Try \`%s --help' or \`%s --usage' for more information.\n" memusage memusage
   exit 1
 }