From 61b6427638992956537714274d80d784b07dfcbc Mon Sep 17 00:00:00 2001 From: Sami Kerola Date: Sat, 3 Oct 2015 19:31:04 +0100 Subject: [PATCH] uuidd: slice up the usage text and normalize its layout Signed-off-by: Sami Kerola --- misc-utils/uuidd.c | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/misc-utils/uuidd.c b/misc-utils/uuidd.c index 9d6d08d9f..76f5e4131 100644 --- a/misc-utils/uuidd.c +++ b/misc-utils/uuidd.c @@ -69,28 +69,26 @@ struct uuidd_cxt_t { static void __attribute__ ((__noreturn__)) usage(FILE * out) { fputs(USAGE_HEADER, out); - fprintf(out, - _(" %s [options]\n"), program_invocation_short_name); - + fprintf(out, _(" %s [options]\n"), program_invocation_short_name); fputs(USAGE_SEPARATOR, out); fputs(_("A daemon for generating UUIDs.\n"), out); - fputs(USAGE_OPTIONS, out); - fputs(_(" -p, --pid path to pid file\n" - " -s, --socket path to socket\n" - " -T, --timeout specify inactivity timeout\n" - " -k, --kill kill running daemon\n" - " -r, --random test random-based generation\n" - " -t, --time test time-based generation\n" - " -n, --uuids request number of uuids\n" - " -P, --no-pid do not create pid file\n" - " -F, --no-fork do not daemonize using double-fork\n" - " -S, --socket-activation do not create listening socket\n" - " -d, --debug run in debugging mode\n" - " -q, --quiet turn on quiet mode\n" - " -V, --version output version information and exit\n" - " -h, --help display this help and exit\n\n"), out); - + fputs(_(" -p, --pid path to pid file\n"), out); + fputs(_(" -s, --socket path to socket\n"), out); + fputs(_(" -T, --timeout specify inactivity timeout\n"), out); + fputs(_(" -k, --kill kill running daemon\n"), out); + fputs(_(" -r, --random test random-based generation\n"), out); + fputs(_(" -t, --time test time-based generation\n"), out); + fputs(_(" -n, --uuids request number of uuids\n"), out); + fputs(_(" -P, --no-pid do not create pid file\n"), out); + fputs(_(" -F, --no-fork do not daemonize using double-fork\n"), out); + fputs(_(" -S, --socket-activation do not create listening socket\n"), out); + fputs(_(" -d, --debug run in debugging mode\n"), out); + fputs(_(" -q, --quiet turn on quiet mode\n"), out); + fputs(USAGE_SEPARATOR, out); + fputs(USAGE_HELP, out); + fputs(USAGE_VERSION, out); + fprintf(out, USAGE_MAN_TAIL("uuidd(8)")); exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS); }