diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2009-02-06 20:13:07 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2009-02-06 20:13:07 +0000 |
| commit | cbbcaf2369b2111d9388ce54ea18854319dbfab3 (patch) | |
| tree | 0ffc9cafd19065f44923eee2d1e6fac3afb114d4 /posix | |
| parent | e2e390fad8271da33a51075cc2bf27c9fe78861b (diff) | |
* debug/xtrace.sh: Unify translatable messages.
* elf/ldd.bash.in: Likewise.
* elf/sprof.c: Likewise.
* locale/programs/locale.c: Likewise.
* malloc/memusage.sh: Likewise.
* nss/getent.c: Likewise.
2009-02-06 Joseph Myers <joseph@codesourcery.com>
* debug/pcprofiledump.c (print_version,
argp_program_version_hook): New function.
* elf/ldconfig.c (more_help): New function.
(argp): Use it.
* elf/sln.c (usage): New function.
(main): Support --help and --version.
* malloc/memusagestat.c (print_version): New function.
(argp_program_version_hook): New variable.
* nscd/nscd.c (more_help): New function.
(argp): Use it.
* posix/getconf.c (main): Send --version output to stdout.
Support --help.
* sunrpc/rpc_main.c (usage, options_usage): Take STREAM and STATUS
arguments. All callers changed.
(print_version): New function.
(parseargs): Support --help and --version.
* sunrpc/rpcinfo.c (usage): Take STREAM argument. All callers
changed.
(print_version): New function.
(main): Use getopt_long. Support --help and --version.
* sysdeps/unix/sysv/linux/lddlibc4.c (main): Support --help and
--version.
2009-02-06 Ulrich Drepper <drepper@redhat.com>
Diffstat (limited to 'posix')
| -rw-r--r-- | posix/getconf.c | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/posix/getconf.c b/posix/getconf.c index 8f5def08ad..1b5f6bc2b7 100644 --- a/posix/getconf.c +++ b/posix/getconf.c @@ -1008,13 +1008,27 @@ main (int argc, char *argv[]) if (argc > 1 && strcmp (argv[1], "--version") == 0) { - fprintf (stderr, "getconf (GNU %s) %s\n", PACKAGE, VERSION); - fprintf (stderr, gettext ("\ + printf ("getconf (GNU %s) %s\n", PACKAGE, VERSION); + printf (gettext ("\ Copyright (C) %s Free Software Foundation, Inc.\n\ This is free software; see the source for copying conditions. There is NO\n\ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ "), "2009"); - fprintf (stderr, gettext ("Written by %s.\n"), "Roland McGrath"); + printf (gettext ("Written by %s.\n"), "Roland McGrath"); + return 0; + } + + if (argc > 1 && strcmp (argv[1], "--help") == 0) + { + printf (gettext ("\ +Usage: getconf [-v SPEC] VAR\n\ + or: getconf [-v SPEC] PATH_VAR PATH\n\ +\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")); return 0; } |