[PATCH] Fix inconsistent use of bug reporting message

[Andreas Schwab <aschwab at redhat dot com>]

While the bug reporting message is now unified between all programs, its
use is inconsistent, some treat it as a format string while it is not
supposed to be.

Andreas.

2009-06-15  Andreas Schwab  <aschwab@redhat.com>

	* debug/xtrace.sh (do_help): Don't treat bug reporting message as
	a format string.
	* elf/sln.c (usage): Likewise.
	* malloc/memusage.sh (do_help): Likewise.
	* nss/getent.c (more_help): Likewise.
	* posix/getconf.c (main): Likewise.
	* sunrpc/rpcinfo.c (usage): Likewise.
	* sysdeps/unix/sysv/linux/lddlibc4.c (main): Likewise.

diff --git a/debug/xtrace.sh b/debug/xtrace.sh
index e3b9daa..8ef507e 100755
--- a/debug/xtrace.sh
+++ b/debug/xtrace.sh
@@ -55,7 +55,7 @@ Mandatory arguments to long options are also mandatory for any corresponding
 short options.
 
 "
-  printf $"For bug reporting instructions, please see:
+  echo $"For bug reporting instructions, please see:
 <http://www.gnu.org/software/libc/bugs.html>.
 "
   exit 0
diff --git a/elf/sln.c b/elf/sln.c
index a8210c1..71707f5 100644
--- a/elf/sln.c
+++ b/elf/sln.c
@@ -83,8 +83,8 @@ static void
 usage (void)
 {
   printf (_("Usage: sln src dest|file\n\n"));
-  printf (_("For bug reporting instructions, please see:\n\
-<http://www.gnu.org/software/libc/bugs.html>.\n"));
+  fputs (_("For bug reporting instructions, please see:\n\
+<http://www.gnu.org/software/libc/bugs.html>.\n"), stdout);
 }
 
 static int
diff --git a/malloc/memusage.sh b/malloc/memusage.sh
index 8b372e4..9fab0a3 100755
--- a/malloc/memusage.sh
+++ b/malloc/memusage.sh
@@ -62,7 +62,7 @@ Mandatory arguments to long options are also mandatory for any corresponding
 short options.
 
 "
-  print $"For bug reporting instructions, please see:
+  echo $"For bug reporting instructions, please see:
 <http://www.gnu.org/software/libc/bugs.html>.
 "
   exit 0
diff --git a/nss/getent.c b/nss/getent.c
index ea5608f..84e5e0b 100644
--- a/nss/getent.c
+++ b/nss/getent.c
@@ -839,9 +839,9 @@ more_help (int key, const char *text, void *input)
 
 	  fputs ("\n\n", fp);
 
-	  fprintf (fp, gettext ("\
+	  fputs (gettext ("\
 For bug reporting instructions, please see:\n\
-<http://www.gnu.org/software/libc/bugs.html>.\n"));
+<http://www.gnu.org/software/libc/bugs.html>.\n"), fp);
 
 	  if (fclose (fp) == 0)
 	    return doc;
diff --git a/posix/getconf.c b/posix/getconf.c
index 59ccab6..c9e1300 100644
--- a/posix/getconf.c
+++ b/posix/getconf.c
@@ -1118,8 +1118,8 @@ Usage: getconf [-v SPEC] VAR\n\
 Get the configuration value for variable VAR, or for variable PATH_VAR\n\
 for path PATH.  If SPEC is given, give values for compilation\n\
 environment SPEC.\n\n"));
-      printf (gettext ("For bug reporting instructions, please see:\n\
-<http://www.gnu.org/software/libc/bugs.html>.\n"));
+      fputs (gettext ("For bug reporting instructions, please see:\n\
+<http://www.gnu.org/software/libc/bugs.html>.\n"), stdout);
       return 0;
     }
 
diff --git a/sunrpc/rpcinfo.c b/sunrpc/rpcinfo.c
index 5e00be9..6020cd5 100644
--- a/sunrpc/rpcinfo.c
+++ b/sunrpc/rpcinfo.c
@@ -688,9 +688,9 @@ usage (FILE *stream)
   fputs (_("       rpcinfo -b prognum versnum\n"), stream);
   fputs (_("       rpcinfo -d prognum versnum\n"), stream);
   fputc ('\n', stream);
-  fprintf (stream, _("\
+  fputs (_("\
 For bug reporting instructions, please see:\n\
-<http://www.gnu.org/software/libc/bugs.html>.\n"));
+<http://www.gnu.org/software/libc/bugs.html>.\n"), stream);
 }
 
 static void
diff --git a/sysdeps/unix/sysv/linux/lddlibc4.c b/sysdeps/unix/sysv/linux/lddlibc4.c
index 694d129..6d57190 100644
--- a/sysdeps/unix/sysv/linux/lddlibc4.c
+++ b/sysdeps/unix/sysv/linux/lddlibc4.c
@@ -59,8 +59,8 @@ main (int argc, char *argv[])
   if (strcmp (argv[1], "--help") == 0)
     {
       printf (gettext ("Usage: lddlibc4 FILE\n\n"));
-      printf (gettext ("For bug reporting instructions, please see:\n\
-<http://www.gnu.org/software/libc/bugs.html>.\n"));
+      fputs (gettext ("For bug reporting instructions, please see:\n\
+<http://www.gnu.org/software/libc/bugs.html>.\n"), stdout);
       return 0;
     }
   else if (strcmp (argv[1], "--version") == 0)

-- 
Andreas Schwab, aschwab@redhat.com
GPG Key fingerprint = D4E8 DBE3 3813 BB5D FA84  5EC7 45C6 250E 6F00 984E
"And now for something completely different."