From 8b748aed2a9ab4b964faa5722f7a182a060e475c Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Fri, 9 Nov 2012 22:13:45 +0000 Subject: Support --with-pkgversion and --with-bugurl. --- login/programs/pt_chown.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'login') diff --git a/login/programs/pt_chown.c b/login/programs/pt_chown.c index fe98964c33..34e09fb0a6 100644 --- a/login/programs/pt_chown.c +++ b/login/programs/pt_chown.c @@ -58,7 +58,7 @@ static struct argp argp = static void print_version (FILE *stream, struct argp_state *state) { - fprintf (stream, "pt_chown (GNU %s) %s\n", PACKAGE, VERSION); + fprintf (stream, "pt_chown %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\ @@ -70,6 +70,7 @@ static char * more_help (int key, const char *text, void *input) { char *cp; + char *tp; switch (key) { @@ -84,13 +85,19 @@ Set the owner, group and access permission of the slave pseudo\ return cp; case ARGP_KEY_HELP_EXTRA: /* We print some extra information. */ - asprintf (&cp, gettext ("\ + if (asprintf (&tp, gettext ("\ +For bug reporting instructions, please see:\n\ +%s.\n"), REPORT_BUGS_TO) < 0) + return NULL; + if (asprintf (&cp, gettext ("\ The owner is set to the current user, the group is set to `%s',\ and the access permission is set to `%o'.\n\n\ %s"), - TTY_GROUP, S_IRUSR|S_IWUSR|S_IWGRP, gettext ("\ -For bug reporting instructions, please see:\n\ -.\n")); + TTY_GROUP, S_IRUSR|S_IWUSR|S_IWGRP, tp) < 0) + { + free (tp); + return NULL; + } return cp; default: break; -- cgit 1.4.1