Skip to content

Commit

Permalink
Don't treat bug reporting message as a format string.
Browse files Browse the repository at this point in the history
  • Loading branch information
Andreas Schwab authored and Ulrich Drepper committed Jun 17, 2009
1 parent 8a909c6 commit f60ddf9
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 12 deletions.
11 changes: 11 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion debug/xtrace.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions elf/sln.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion malloc/memusage.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions nss/getent.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions posix/getconf.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
4 changes: 2 additions & 2 deletions sunrpc/rpcinfo.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions sysdeps/unix/sysv/linux/lddlibc4.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit f60ddf9

Please sign in to comment.