diff options
| author | Andreas Schwab <aschwab@redhat.com> | 2009-06-16 20:34:55 -0700 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2009-06-16 20:34:55 -0700 |
| commit | f60ddf9bf737e015f7da866ca7f46006b4ce9700 (patch) | |
| tree | 8b2e94779e55e947e1de64d17f64b108d78eb7c3 | |
| parent | 8a909c6430e8b6ad76304f749d36fdd6e40e8046 (diff) | |
| download | glibc-f60ddf9bf737e015f7da866ca7f46006b4ce9700.tar.gz glibc-f60ddf9bf737e015f7da866ca7f46006b4ce9700.tar.xz glibc-f60ddf9bf737e015f7da866ca7f46006b4ce9700.zip | |
Don't treat bug reporting message as a format string.
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rwxr-xr-x | debug/xtrace.sh | 2 | ||||
| -rw-r--r-- | elf/sln.c | 4 | ||||
| -rwxr-xr-x | malloc/memusage.sh | 2 | ||||
| -rw-r--r-- | nss/getent.c | 4 | ||||
| -rw-r--r-- | posix/getconf.c | 4 | ||||
| -rw-r--r-- | sunrpc/rpcinfo.c | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/lddlibc4.c | 4 |
8 files changed, 23 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog index 70395b740e..c91fe1f922 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +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. + 2009-06-16 Ulrich Drepper <drepper@redhat.com> * login/programs/pt_chown.c: Use libcap to drop privileges other than diff --git a/debug/xtrace.sh b/debug/xtrace.sh index e3b9daa433..8ef507ef38 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 a8210c1fc0..71707f5d30 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 8b372e4b8e..9fab0a3b8b 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 dbcae26809..3a9430fd66 100644 --- a/nss/getent.c +++ b/nss/getent.c @@ -905,9 +905,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 59ccab606c..c9e1300e49 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 5e00be9f78..6020cd5b9d 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 694d1291cd..6d57190508 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) |