From: Benno Schulenberg Date: Wed, 24 Dec 2014 16:56:02 +0000 (+0100) Subject: ipcs: in usage show resource option as nonoptional when used with -i X-Git-Tag: v2.26-rc1~90 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=afd86656dee69a297b832e4e94efa58987fe4aa1;p=thirdparty%2Futil-linux.git ipcs: in usage show resource option as nonoptional when used with -i Also, the resource option -a is not valid with -i, so show the valid ones explicitly. Also gettextize the synopsis as a single string, as the two lines are tightly related and other synopses do this too. Signed-off-by: Benno Schulenberg --- diff --git a/sys-utils/ipcs.c b/sys-utils/ipcs.c index 3bfba0a7b7..0542e2738f 100644 --- a/sys-utils/ipcs.c +++ b/sys-utils/ipcs.c @@ -50,13 +50,13 @@ static void print_msg (int id, int unit); static void __attribute__ ((__noreturn__)) usage(FILE * out) { fprintf(out, USAGE_HEADER); - fprintf(out, " %s [resource ...] [output-format]\n", program_invocation_short_name); - fprintf(out, " %s [resource] -i \n", program_invocation_short_name); + fprintf(out, _(" %1$s [resource-option...] [output-option]\n" + " %1$s -m|-q|-s -i \n"), program_invocation_short_name); fputs(USAGE_SEPARATOR, out); fputs(_("Show information on IPC facilities.\n"), out); - fputs(USAGE_OPTIONS, out); + fprintf(out, USAGE_OPTIONS); fputs(_(" -i, --id print details on resource identified by \n"), out); fprintf(out, USAGE_HELP); fprintf(out, USAGE_VERSION); @@ -67,7 +67,7 @@ static void __attribute__ ((__noreturn__)) usage(FILE * out) fputs(_(" -s, --semaphores semaphores\n"), out); fputs(_(" -a, --all all (default)\n"), out); fprintf(out, USAGE_SEPARATOR); - fputs(_("Output format:\n"), out); + fputs(_("Output options:\n"), out); fputs(_(" -t, --time show attach, detach and change times\n"), out); fputs(_(" -p, --pid show PIDs of creator and last operator\n"), out); fputs(_(" -c, --creator show creator and owner\n"), out);