]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
mesg: sync usage() with howto-usage-function.txt
authorSami Kerola <kerolasa@iki.fi>
Sat, 17 Aug 2013 23:50:08 +0000 (00:50 +0100)
committerSami Kerola <kerolasa@iki.fi>
Thu, 29 Aug 2013 17:14:07 +0000 (18:14 +0100)
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
term-utils/mesg.c

index 430236facc0efdb181bad4666ebeb806969c5055..097fb9c932cea8fd198434dabee76e539c326090 100644 (file)
 
 static void __attribute__ ((__noreturn__)) usage(FILE * out)
 {
-       fputs(_("\nUsage:\n"), out);
+       fputs(USAGE_HEADER, out);
        /* TRANSLATORS: this program uses for y and n rpmatch(3),
         * which means they can be translated.  */
        fprintf(out,
              _(" %s [options] [y | n]\n"), program_invocation_short_name);
-
-       fputs(_("\nOptions:\n"), out);
-       fputs(_(" -v, --verbose      explain what is being done\n"
-               " -V, --version      output version information and exit\n"
-               " -h, --help         output help screen and exit\n\n"), out);
+       fputs(USAGE_OPTIONS, out);
+       fputs(_(" -v, --verbose  explain what is being done\n"), out);
+       fputs(USAGE_HELP, out);
+       fputs(USAGE_VERSION, out);
+       fprintf(out, USAGE_MAN_TAIL("mesg(1)"));
 
        exit(out == stderr ? MESG_EXIT_FAILURE : EXIT_SUCCESS);
 }
@@ -106,8 +106,7 @@ int main(int argc, char *argv[])
                        verbose = TRUE;
                        break;
                case 'V':
-                       printf(_("%s from %s\n"), program_invocation_short_name,
-                       PACKAGE_STRING);
+                       printf(UTIL_LINUX_VERSION);
                        exit(EXIT_SUCCESS);
                case 'h':
                        usage(stdout);