diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2012-11-09 22:13:45 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2012-11-09 22:13:45 +0000 |
| commit | 8b748aed2a9ab4b964faa5722f7a182a060e475c (patch) | |
| tree | 61bc3fd494c9230f44c3c84a4ac51a32711223ed /locale/programs | |
| parent | 92e4b6a92716f8b2457376291171a6330d072b0d (diff) | |
| download | glibc-8b748aed2a9ab4b964faa5722f7a182a060e475c.tar.gz glibc-8b748aed2a9ab4b964faa5722f7a182a060e475c.tar.xz glibc-8b748aed2a9ab4b964faa5722f7a182a060e475c.zip | |
Support --with-pkgversion and --with-bugurl.
Diffstat (limited to 'locale/programs')
| -rw-r--r-- | locale/programs/locale.c | 9 | ||||
| -rw-r--r-- | locale/programs/localedef.c | 16 |
2 files changed, 17 insertions, 8 deletions
diff --git a/locale/programs/locale.c b/locale/programs/locale.c index 247265e2e9..6bbd9d6840 100644 --- a/locale/programs/locale.c +++ b/locale/programs/locale.c @@ -271,13 +271,16 @@ parse_opt (int key, char *arg, struct argp_state *state) static char * more_help (int key, const char *text, void *input) { + char *tp = NULL; switch (key) { case ARGP_KEY_HELP_EXTRA: /* We print some extra information. */ - return strdup (gettext ("\ + if (asprintf (&tp, gettext ("\ For bug reporting instructions, please see:\n\ -<http://www.gnu.org/software/libc/bugs.html>.\n")); +%s.\n"), REPORT_BUGS_TO) < 0) + return NULL; + return tp; default: break; } @@ -289,7 +292,7 @@ For bug reporting instructions, please see:\n\ static void print_version (FILE *stream, struct argp_state *state) { - fprintf (stream, "locale (GNU %s) %s\n", PACKAGE, VERSION); + fprintf (stream, "locale %s%s\n", PKGVERSION, 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\ diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c index 5dc35ca695..864fc55f38 100644 --- a/locale/programs/localedef.c +++ b/locale/programs/localedef.c @@ -354,20 +354,26 @@ static char * more_help (int key, const char *text, void *input) { char *cp; + char *tp; switch (key) { case ARGP_KEY_HELP_EXTRA: /* We print some extra information. */ + if (asprintf (&tp, gettext ("\ +For bug reporting instructions, please see:\n\ +%s.\n"), REPORT_BUGS_TO) < 0) + return NULL; if (asprintf (&cp, gettext ("\ System's directory for character maps : %s\n\ repertoire maps: %s\n\ locale path : %s\n\ %s"), - CHARMAP_PATH, REPERTOIREMAP_PATH, LOCALE_PATH, gettext ("\ -For bug reporting instructions, please see:\n\ -<http://www.gnu.org/software/libc/bugs.html>.\n")) < 0) - return NULL; + CHARMAP_PATH, REPERTOIREMAP_PATH, LOCALE_PATH, tp) < 0) + { + free (tp); + return NULL; + } return cp; default: break; @@ -379,7 +385,7 @@ For bug reporting instructions, please see:\n\ static void print_version (FILE *stream, struct argp_state *state) { - fprintf (stream, "localedef (GNU %s) %s\n", PACKAGE, VERSION); + fprintf (stream, "localedef %s%s\n", PKGVERSION, 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\ |