diff --git a/free.c b/free.c index 0667b419..0ff64b11 100644 --- a/free.c +++ b/free.c @@ -56,18 +56,18 @@ static void __attribute__ ((__noreturn__)) fprintf(out, _(" %s [options]\n"), program_invocation_short_name); fputs(USAGE_OPTIONS, out); - fputs(_(" -b, --bytes show output in bytes\n"), out); - fputs(_(" -k, --kilo show output in kilobytes\n"), out); - fputs(_(" -m, --mega show output in megabytes\n"), out); - fputs(_(" -g, --giga show output in gigabytes\n"), out); - fputs(_(" --tera show output in terabytes\n"), out); - fputs(_(" -h, --human show human readable output\n"), out); - fputs(_(" --si use powers of 1000 not 1024\n"), out); - fputs(_(" -l, --lohi show detailed low and high memory statistics\n"), out); - fputs(_(" -o, --old use old format (no -/+buffers/cache line)\n"), out); - fputs(_(" -t, --total show total for RAM + swap\n"), out); - fputs(_(" -s N, --seconds N repeat printing every N seconds\n"), out); - fputs(_(" -c N, --count N repeat printing N times\n"), out); + fputs(_(" -b, --bytes show output in bytes\n" + " -k, --kilo show output in kilobytes\n" + " -m, --mega show output in megabytes\n" + " -g, --giga show output in gigabytes\n" + " --tera show output in terabytes\n" + " -h, --human show human readable output\n" + " --si use powers of 1000 not 1024\n" + " -l, --lohi show detailed low and high memory statistics\n" + " -o, --old use old format (no -/+buffers/cache line)\n" + " -t, --total show total for RAM + swap\n" + " -s N, --seconds N repeat printing every N seconds\n" + " -c N, --count N repeat printing N times\n"), out); fputs(USAGE_SEPARATOR, out); fputs(_(" --help display this help text\n"), out); fputs(USAGE_VERSION, out); diff --git a/pgrep.c b/pgrep.c index 9d8d825e..9575d053 100644 --- a/pgrep.c +++ b/pgrep.c @@ -84,27 +84,27 @@ static int __attribute__ ((__noreturn__)) usage(int opt) fprintf(fp, _(" %s [options] \n"), program_invocation_short_name); fputs(USAGE_OPTIONS, fp); if (i_am_pkill == 0) { - fputs(_(" -c, --count count of matching processes\n"), fp); - fputs(_(" -d, --delimeter update delay in seconds\n"), fp); - fputs(_(" -l, --list-name list PID and process name\n"), fp); + fputs(_(" -c, --count count of matching processes\n" + " -d, --delimeter update delay in seconds\n" + " -l, --list-name list PID and process name\n"), fp); } if (i_am_pkill == 1) { fputs(_(" -, --signal signal to send (either number or name)\n"), fp); } - fputs(_(" -f, --full use full process name to match\n"), fp); - fputs(_(" -g, --pgroup match listed process group IDs\n"), fp); - fputs(_(" -G, --group match real group IDs\n"), fp); - fputs(_(" -n, --newest select most recently started\n"), fp); - fputs(_(" -o, --oldest select least recently started\n"), fp); - fputs(_(" -P, --parent match only childs of given parent\n"), fp); - fputs(_(" -s, --session match session IDs\n"), fp); - fputs(_(" -t, --terminal match by controlling terminal\n"), fp); - fputs(_(" -u, --euid match by effective IDs\n"), fp); - fputs(_(" -U, --uid match by real IDs\n"), fp); - fputs(_(" -v, --inverse negates the matching\n"), fp); - fputs(_(" -x, --exact match exectly with command name\n"), fp); - fputs(_(" -F, --pidfile read PIDs from file\n"), fp); - fputs(_(" -L, --logpidfile fail if PID file is not locked\n"), fp); + fputs(_(" -f, --full use full process name to match\n" + " -g, --pgroup match listed process group IDs\n" + " -G, --group match real group IDs\n" + " -n, --newest select most recently started\n" + " -o, --oldest select least recently started\n" + " -P, --parent match only childs of given parent\n" + " -s, --session match session IDs\n" + " -t, --terminal match by controlling terminal\n" + " -u, --euid match by effective IDs\n" + " -U, --uid match by real IDs\n" + " -v, --inverse negates the matching\n" + " -x, --exact match exectly with command name\n" + " -F, --pidfile read PIDs from file\n" + " -L, --logpidfile fail if PID file is not locked\n"), fp); fputs(USAGE_SEPARATOR, fp); fputs(USAGE_HELP, fp); fputs(USAGE_VERSION, fp); diff --git a/pmap.c b/pmap.c index 998080e8..8b816572 100644 --- a/pmap.c +++ b/pmap.c @@ -37,10 +37,10 @@ static void __attribute__ ((__noreturn__)) fprintf(out, _(" %s [options] pid [pid ...]\n"), program_invocation_short_name); fputs(USAGE_OPTIONS, out); - fputs(_(" -x, --extended show details\n"), out); - fputs(_(" -d, --device show the device format\n"), out); - fputs(_(" -q, --quiet do not display header and footer\n"), out); - fputs(_(" -A, --range=[,] limit results to the given range\n"), out); + fputs(_(" -x, --extended show details\n" + " -d, --device show the device format\n" + " -q, --quiet do not display header and footer\n" + " -A, --range=[,] limit results to the given range\n"), out); fputs(USAGE_SEPARATOR, out); fputs(USAGE_HELP, out); fputs(USAGE_VERSION, out); diff --git a/ps/help.c b/ps/help.c index a103c798..dc68f19b 100644 --- a/ps/help.c +++ b/ps/help.c @@ -19,80 +19,80 @@ void __attribute__ ((__noreturn__)) usage(FILE * out, int section) { fputs(USAGE_HEADER, out); fprintf(out, - _(" %s [options]\n"), program_invocation_short_name); + _(" %s [options]\n"), program_invocation_short_name); if (section == USAGE_SELECTION || section == USAGE_ALL) { - fputs(_("\nSimple options:\n"), out); - fputs(_(" -A all processes\n"), out); - fputs(_(" -N, --deselect negate selection\n"), out); - fputs(_(" -a all without tty and session leader\n"), out); - fputs(_(" -d all except session leader\n"), out); - fputs(_(" -e all processes\n"), out); - fputs(_(" T all processes on this terminal\n"), out); - fputs(_(" a all without tty, including other users\n"), out); - fputs(_(" g obsolete, do not use\n"), out); - fputs(_(" r only running processes\n"), out); - fputs(_(" x processes without controlling ttys\n"), out); + fputs(_("\nSimple options:\n" + " -A all processes\n" + " -N, --deselect negate selection\n" + " -a all without tty and session leader\n" + " -d all except session leader\n" + " -e all processes\n" + " T all processes on this terminal\n" + " a all without tty, including other users\n" + " g obsolete, do not use\n" + " r only running processes\n" + " x processes without controlling ttys\n"), out); } if (section == USAGE_LIST || section == USAGE_ALL) { - fputs(_("\nSelection by list:\n"), out); - fputs(_(" -C command name\n"), out); - fputs(_(" U, -u, --user effective user id or name\n"), out); - fputs(_(" -U, --User real user id or name\n"), out); - fputs(_(" -G, --Group real group id or name\n"), out); - fputs(_(" -g, --group session or effective group name\n"), out); - fputs(_(" -p, --pid process id\n"), out); - fputs(_(" --ppid select by parent process id\n"), out); - fputs(_(" -s, --sid session id\n"), out); - fputs(_(" t, -t, --tty terminal\n"), out); - fputs(_("\n selection take csv list e.g. `-u root,nobody'\n"), out); + fputs(_("\nSelection by list:\n" + " -C command name\n" + " U, -u, --user effective user id or name\n" + " -U, --User real user id or name\n" + " -G, --Group real group id or name\n" + " -g, --group session or effective group name\n" + " -p, --pid process id\n" + " --ppid select by parent process id\n" + " -s, --sid session id\n" + " t, -t, --tty terminal\n" + "\n selection take csv list e.g. `-u root,nobody'\n"), out); } if (section == USAGE_OUTPUT || section == USAGE_ALL) { - fputs(_("\nOutput formats:\n"), out); - fputs(_(" o, -o, --format "), out); - fputs(_(" user defined format\n"), out); - fputs(_(" O preloaded -o allowing sorting\n"), out); - fputs(_(" -O preloaded, with default columns, allowing sorting\n"), out); - fputs(_(" -j jobs format\n"), out); - fputs(_(" j BSD job control format\n"), out); - fputs(_(" -l long format\n"), out); - fputs(_(" l BSD long format\n"), out); - fputs(_(" y do not show flags, show rrs in place addr (used with -l)\n"), out); - fputs(_(" -f full-format\n"), out); - fputs(_(" -F extra full\n"), out); - fputs(_(" s signal format\n"), out); - fputs(_(" v virtual memory\n"), out); - fputs(_(" u user-oriented format\n"), out); - fputs(_(" X register format\n"), out); - fputs(_(" Z, -M security data (for SE Linux)\n"), out); - fputs(_(" f, --forest ascii art process tree\n"), out); - fputs(_(" -H show process hierarchy\n"), out); - fputs(_(" --context display security context (for SE Linux)\n"), out); - fputs(_(" --heading repeat header lines\n"), out); - fputs(_(" --no-headers do not print header at all\n"), out); - fputs(_(" --cols set screen width\n"), out); - fputs(_(" --rows set screen height\n"), out); + fputs(_("\nOutput formats:\n" + " o, -o, --format " + " user defined format\n" + " O preloaded -o allowing sorting\n" + " -O preloaded, with default columns, allowing sorting\n" + " -j jobs format\n" + " j BSD job control format\n" + " -l long format\n" + " l BSD long format\n" + " y do not show flags, show rrs in place addr (used with -l)\n" + " -f full-format\n" + " -F extra full\n" + " s signal format\n" + " v virtual memory\n" + " u user-oriented format\n" + " X register format\n" + " Z, -M security data (for SE Linux)\n" + " f, --forest ascii art process tree\n" + " -H show process hierarchy\n" + " --context display security context (for SE Linux)\n" + " --heading repeat header lines\n" + " --no-headers do not print header at all\n" + " --cols set screen width\n" + " --rows set screen height\n"), out); } if (section == USAGE_THREADS || section == USAGE_ALL) { - fputs(_("\nShow threads:\n"), out); - fputs(_(" H as if they where processes\n"), out); - fputs(_(" -L possibly with LWP and NLWP columns\n"), out); - fputs(_(" -T possibly with SPID column\n"), out); - fputs(_(" m, -m after processes\n"), out); + fputs(_("\nShow threads:\n" + " H as if they where processes\n" + " -L possibly with LWP and NLWP columns\n" + " -T possibly with SPID column\n" + " m, -m after processes\n"), out); } if (section == USAGE_MISC || section == USAGE_ALL) { - fputs(_("\nMisc options:\n"), out); - fputs(_(" w, -w unlimited output width\n"), out); - fputs(_(" L list format codes\n"), out); - fputs(_(" c true command name\n"), out); - fputs(_(" n display numeric uid and wchan\n"), out); - fputs(_(" -y do not show flags, show rss (only with -l)\n"), out); - fputs(_(" -c show scheduling class\n"), out); - fputs(_(" --sort specify sort order, can be a csv list\n"), out); - fputs(_(" S, --cumulative include some dead child process data\n"), out); - fputs(_(" --info print debuggin information\n"), out); - fputs(_(" V,-V, --version display version information and exit\n"), out); - fputs(_(" --help \n"), out); - fputs(_(" display help\n"), out); + fputs(_("\nMisc options:\n" + " w, -w unlimited output width\n" + " L list format codes\n" + " c true command name\n" + " n display numeric uid and wchan\n" + " -y do not show flags, show rss (only with -l)\n" + " -c show scheduling class\n" + " --sort specify sort order, can be a csv list\n" + " S, --cumulative include some dead child process data\n" + " --info print debuggin information\n" + " V,-V, --version display version information and exit\n" + " --help \n" + " display help\n"), out); } if (section == USAGE_DEFAULT) diff --git a/skill.c b/skill.c index 798497d7..e9ce5ddc 100644 --- a/skill.c +++ b/skill.c @@ -265,11 +265,11 @@ static void __attribute__ ((__noreturn__)) kill_usage(FILE * out) fprintf(out, _(" %s [options] [...]\n"), program_invocation_short_name); fputs(USAGE_OPTIONS, out); - fputs(_(" [...] send signal to every listed\n"), out); - fputs(_(" -, -s, --signal \n"), out); - fputs(_(" specify the to be sent\n"), out); - fputs(_(" -l, --list=[] list all signal names, or convert one to a name\n"), out); - fputs(_(" -L, --table list all signal names in a nice table\n"), out); + fputs(_(" [...] send signal to every listed\n" + " -, -s, --signal \n" + " specify the to be sent\n" + " -l, --list=[] list all signal names, or convert one to a name\n" + " -L, --table list all signal names in a nice table\n"), out); fputs(USAGE_SEPARATOR, out); fputs(USAGE_HELP, out); fputs(USAGE_VERSION, out); @@ -292,20 +292,20 @@ static void __attribute__ ((__noreturn__)) skillsnice_usage(FILE * out) program_invocation_short_name); } fputs(USAGE_OPTIONS, out); - fputs(_(" -f, --fast fast mode (not implemented)\n"), out); - fputs(_(" -i, --interactive interactive\n"), out); - fputs(_(" -l, --list list all signal names\n"), out); - fputs(_(" -L, --table list all signal names in a nice table\n"), out); - fputs(_(" -n, --no-action no action\n"), out); - fputs(_(" -v, --verbose explain what is being done\n"), out); - fputs(_(" -w, --warnings enable warnings (not implemented)\n"), out); + fputs(_(" -f, --fast fast mode (not implemented)\n" + " -i, --interactive interactive\n" + " -l, --list list all signal names\n" + " -L, --table list all signal names in a nice table\n" + " -n, --no-action no action\n" + " -v, --verbose explain what is being done\n" + " -w, --warnings enable warnings (not implemented)\n"), out); fputs(USAGE_SEPARATOR, out); - fputs(_("Expression can be: terminal, user, pid, command.\n"), out); - fputs(_("The options below may be used to ensure correct interpretation.\n"), out); - fputs(_(" -c, --command expression is a command name\n"), out); - fputs(_(" -p, --pid expression is a process id number\n"), out); - fputs(_(" -t, --tty expression is a terminal\n"), out); - fputs(_(" -u, --user expression is a username\n"), out); + fputs(_("Expression can be: terminal, user, pid, command.\n" + "The options below may be used to ensure correct interpretation.\n" + " -c, --command expression is a command name\n" + " -p, --pid expression is a process id number\n" + " -t, --tty expression is a terminal\n" + " -u, --user expression is a username\n"), out); fputs(USAGE_SEPARATOR, out); fputs(USAGE_HELP, out); fputs(USAGE_VERSION, out); diff --git a/slabtop.c b/slabtop.c index df3b6cf4..6647b2ce 100644 --- a/slabtop.c +++ b/slabtop.c @@ -175,24 +175,24 @@ static void __attribute__((__noreturn__)) usage(FILE *out) fputs(USAGE_HEADER, out); fprintf(out, _(" %s [options]\n"), program_invocation_short_name); fputs(USAGE_OPTIONS, out); - fprintf(out, _(" -d, --delay delay updates\n")); - fprintf(out, _(" -o, --once only display once, then exit\n")); - fprintf(out, _(" -s, --sort specify sort criteria by character (see below)\n")); + fputs(_(" -d, --delay delay updates\n" + " -o, --once only display once, then exit\n" + " -s, --sort specify sort criteria by character (see below)\n"), out); fputs(USAGE_SEPARATOR, out); fputs(USAGE_HELP, out); fputs(USAGE_VERSION, out); - fprintf(out, _("\nThe following are valid sort criteria:\n")); - fprintf(out, _(" a: sort by number of active objects\n")); - fprintf(out, _(" b: sort by objects per slab\n")); - fprintf(out, _(" c: sort by cache size\n")); - fprintf(out, _(" l: sort by number of slabs\n")); - fprintf(out, _(" v: sort by number of active slabs\n")); - fprintf(out, _(" n: sort by name\n")); - fprintf(out, _(" o: sort by number of objects (the default)\n")); - fprintf(out, _(" p: sort by pages per slab\n")); - fprintf(out, _(" s: sort by object size\n")); - fprintf(out, _(" u: sort by cache utilization\n")); + fputs(_("\nThe following are valid sort criteria:\n" + " a: sort by number of active objects\n" + " b: sort by objects per slab\n" + " c: sort by cache size\n" + " l: sort by number of slabs\n" + " v: sort by number of active slabs\n" + " n: sort by name\n" + " o: sort by number of objects (the default)\n" + " p: sort by pages per slab\n" + " s: sort by object size\n" + " u: sort by cache utilization\n"), out); fprintf(out, USAGE_MAN_TAIL("slabtop(1)")); exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS); diff --git a/sysctl.c b/sysctl.c index b4e0dea7..cde270b6 100644 --- a/sysctl.c +++ b/sysctl.c @@ -92,23 +92,23 @@ static void __attribute__ ((__noreturn__)) fprintf(out, _(" %s [options] [variable[=value] ...]\n"), program_invocation_short_name); fputs(USAGE_OPTIONS, out); - fputs(_(" -a, --all display all variables\n"), out); - fputs(_(" -A alias of -a\n"), out); - fputs(_(" -X alias of -a\n"), out); - fputs(_(" -b, --binary print value without new line\n"), out); - fputs(_(" -e, --ignore ignore unknown variables errors\n"), out); - fputs(_(" -N, --names print variable names without values\n"), out); - fputs(_(" -n, --values print only values of a variables\n"), out); - fputs(_(" -p, --load[=] read values from file\n"), out); - fputs(_(" -f alias of -p\n"), out); - fputs(_(" --system read values from all system directories\n"), out); - fputs(_(" -r, --pattern \n"), out); - fputs(_(" select setting that match expression\n"), out); - fputs(_(" -q, --quiet do not echo variable set\n"), out); - fputs(_(" -w, --write enable writing a value to variable\n"), out); - fputs(_(" -o does nothing\n"), out); - fputs(_(" -x does nothing\n"), out); - fputs(_(" -d alias of -h\n"), out); + fputs(_(" -a, --all display all variables\n" + " -A alias of -a\n" + " -X alias of -a\n" + " -b, --binary print value without new line\n" + " -e, --ignore ignore unknown variables errors\n" + " -N, --names print variable names without values\n" + " -n, --values print only values of a variables\n" + " -p, --load[=] read values from file\n" + " -f alias of -p\n" + " --system read values from all system directories\n" + " -r, --pattern \n" + " select setting that match expression\n" + " -q, --quiet do not echo variable set\n" + " -w, --write enable writing a value to variable\n" + " -o does nothing\n" + " -x does nothing\n" + " -d alias of -h\n"), out); fputs(USAGE_SEPARATOR, out); fputs(USAGE_HELP, out); fputs(USAGE_VERSION, out); diff --git a/tload.c b/tload.c index 4fe57add..784f69d0 100644 --- a/tload.c +++ b/tload.c @@ -72,8 +72,8 @@ static void __attribute__ ((__noreturn__)) usage(FILE * out) fprintf(out, _(" %s [options] [tty]\n"), program_invocation_short_name); fputs(USAGE_OPTIONS, out); - fputs(_(" -d, --delay update delay in seconds\n"), out); - fputs(_(" -s, --scale vertical scale\n"), out); + fputs(_(" -d, --delay update delay in seconds\n" + " -s, --scale vertical scale\n"), out); fputs(USAGE_SEPARATOR, out); fputs(USAGE_HELP, out); fputs(USAGE_VERSION, out); diff --git a/vmstat.c b/vmstat.c index fddffbc1..34379c80 100644 --- a/vmstat.c +++ b/vmstat.c @@ -71,15 +71,15 @@ static void __attribute__ ((__noreturn__)) _(" %s [options] [delay [count]]\n"), program_invocation_short_name); fputs(USAGE_OPTIONS, out); - fputs(_(" -a, --active active/inactive memory\n"), out); - fputs(_(" -f, --forks number of forks since boot\n"), out); - fputs(_(" -m, --slabs slabinfo\n"), out); - fputs(_(" -n, --one-header do not redisplay header\n"), out); - fputs(_(" -s, --stats event counter statistics\n"), out); - fputs(_(" -d, --disk disk statistics\n"), out); - fputs(_(" -D, --disk-sum summarize disk statistics\n"), out); - fputs(_(" -p, --partition partition specific statistics\n"), out); - fputs(_(" -S, --unit define display unit\n"), out); + fputs(_(" -a, --active active/inactive memory\n" + " -f, --forks number of forks since boot\n" + " -m, --slabs slabinfo\n" + " -n, --one-header do not redisplay header\n" + " -s, --stats event counter statistics\n" + " -d, --disk disk statistics\n" + " -D, --disk-sum summarize disk statistics\n" + " -p, --partition partition specific statistics\n" + " -S, --unit define display unit\n"), out); fputs(USAGE_SEPARATOR, out); fputs(USAGE_HELP, out); fputs(USAGE_VERSION, out); diff --git a/w.c b/w.c index 0d09bc43..5b573df2 100644 --- a/w.c +++ b/w.c @@ -305,11 +305,11 @@ static void __attribute__ ((__noreturn__)) fprintf(out, _(" %s [options]\n"), program_invocation_short_name); fputs(USAGE_OPTIONS, out); - fputs(_(" -h, --no-header do not print header\n"), out); - fputs(_(" -u, --no-current ignore current process username\n"), out); - fputs(_(" -s, --short short format\n"), out); - fputs(_(" -f, --from show remote hostname field\n"), out); - fputs(_(" -o, --old-style old style output\n"), out); + fputs(_(" -h, --no-header do not print header\n" + " -u, --no-current ignore current process username\n" + " -s, --short short format\n" + " -f, --from show remote hostname field\n" + " -o, --old-style old style output\n"), out); fputs(USAGE_SEPARATOR, out); fputs(_(" --help display this help and exit\n"), out); fputs(USAGE_VERSION, out); diff --git a/watch.c b/watch.c index 8fb05b1c..af5813e3 100644 --- a/watch.c +++ b/watch.c @@ -63,16 +63,16 @@ static void __attribute__ ((__noreturn__)) fprintf(out, _(" %s [options] command\n"), program_invocation_short_name); fputs(USAGE_OPTIONS, out); - fputs(_(" -b, --beep beep if command has a non-zero exit\n"), out); - fputs(_(" -c, --color interpret ANSI color sequences\n"), out); - fputs(_(" -e, --errexit exit if command has a non-zero exit\n"), out); - fputs(_(" -f, --differences highlight changes between updates\n"), out); - fputs(_(" -n, --interval seconds to wait between updates\n"), out); - fputs(_(" -p, --precise attempt run command in precise intervals\n"), out); - fputs(_(" -t, --no-title turn off header\n"), out); - fputs(_(" -x, --exec pass command to exec instead of \"sh -c\"\n"), out); - fputs(_(" -h, --help display this help text\n"), out); - fputs(_(" -v, --version display version information and exit\n"), out); + fputs(_(" -b, --beep beep if command has a non-zero exit\n" + " -c, --color interpret ANSI color sequences\n" + " -e, --errexit exit if command has a non-zero exit\n" + " -f, --differences highlight changes between updates\n" + " -n, --interval seconds to wait between updates\n" + " -p, --precise attempt run command in precise intervals\n" + " -t, --no-title turn off header\n" + " -x, --exec pass command to exec instead of \"sh -c\"\n" + " -h, --help display this help text\n" + " -v, --version display version information and exit\n"), out); fputs(USAGE_SEPARATOR, out); fputs(USAGE_HELP, out); fputs(_(" -v, --version output version information and exit\n"), out);