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 /malloc | |
| parent | e2e390fad8271da33a51075cc2bf27c9fe78861b (diff) | |
| download | glibc-cbbcaf2369b2111d9388ce54ea18854319dbfab3.zip glibc-cbbcaf2369b2111d9388ce54ea18854319dbfab3.tar.gz glibc-cbbcaf2369b2111d9388ce54ea18854319dbfab3.tar.bz2 | |
* 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 'malloc')
| -rwxr-xr-x | malloc/memusage.sh | 6 | ||||
| -rw-r--r-- | malloc/memusagestat.c | 22 |
2 files changed, 25 insertions, 3 deletions
diff --git a/malloc/memusage.sh b/malloc/memusage.sh index 1c906a1..8b372e4 100755 --- a/malloc/memusage.sh +++ b/malloc/memusage.sh @@ -61,8 +61,10 @@ Profile memory usage of PROGRAM. Mandatory arguments to long options are also mandatory for any corresponding short options. -For bug reporting instructions, please see: -<http://www.gnu.org/software/libc/bugs.html>." +" + print $"For bug reporting instructions, please see: +<http://www.gnu.org/software/libc/bugs.html>. +" exit 0 } diff --git a/malloc/memusagestat.c b/malloc/memusagestat.c index 779d5c0..bf33175 100644 --- a/malloc/memusagestat.c +++ b/malloc/memusagestat.c @@ -1,5 +1,6 @@ /* Generate graphic from memory profiling data. - Copyright (C) 1998, 1999, 2000, 2005, 2006 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2000, 2005, 2006, + 2009 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -38,6 +39,8 @@ #include <gdfontl.h> #include <gdfonts.h> +#include "../version.h" +#define PACKAGE _libc_intl_domainname /* Default size of the generated image. */ #define XSIZE 800 @@ -73,6 +76,10 @@ static error_t parse_opt (int key, char *arg, struct argp_state *state); /* Function to print some extra text in the help message. */ static char *more_help (int key, const char *text, void *input); +/* Name and version of program. */ +static void print_version (FILE *stream, struct argp_state *state); +void (*argp_program_version_hook) (FILE *, struct argp_state *) = print_version; + /* Data structure to communicate with argp functions. */ static struct argp argp = { @@ -535,3 +542,16 @@ For bug reporting instructions, please see:\n\ } return (char *) text; } + +/* Print the version information. */ +static void +print_version (FILE *stream, struct argp_state *state) +{ + fprintf (stream, "memusagestat (GNU %s) %s\n", PACKAGE, VERSION); + fprintf (stream, 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 (stream, gettext ("Written by %s.\n"), "Ulrich Drepper"); +} |