Signed-off-by: Sami Kerola <kerolasa@xxxxxx>
---
misc-utils/kill.c | 25 ++++++++++++++++++-------
1 file changed, 18 insertions(+), 7 deletions(-)
diff --git a/misc-utils/kill.c b/misc-utils/kill.c
index e43f23a..2b6256c 100644
--- a/misc-utils/kill.c
+++ b/misc-utils/kill.c
@@ -405,14 +405,25 @@ static void printsignals (FILE *fp)
fputc ('\n', fp);
}
-static int usage (int status)
+static int usage(int status)
{
- FILE *fp;
-
- fp = (status == 0 ? stdout : stderr);
- fprintf (fp, _("usage: %s [ -s signal | -p ] [ -a ] pid ...\n"), progname);
- fprintf (fp, _(" %s -l [ signal ]\n"), progname);
- return status;
+ FILE *out;
+ out = (status == 0 ? stdout : stderr);
+
+ fputs(USAGE_HEADER, out);
+ fprintf(out, _(" %s [options] <pid | commandname> [...]\n"), program_invocation_short_name);
+ fputs(USAGE_OPTIONS, out);
+ fputs(_(" -a, --all all commands including not same uid as parent process\n"), out);
+ fputs(_(" -s, --signal <sig> send specified signal\n"), out);
+ fputs(_(" -q, --queue <sig> use sigqueue(2) rather than kill(2)\n"), out);
+ fputs(_(" -p, --pid print pids without signaling them\n"), out);
+ fputs(_(" -l, --list <name> list signal names\n"), out);
+ fputs(USAGE_SEPARATOR, out);
+ fputs(USAGE_HELP, out);
+ fputs(USAGE_VERSION, out);
+ fprintf(out, USAGE_MAN_TAIL("kill(1)"));
+
+ return status;
}
static int kill_verbose (char *procname, int pid, int sig)
--
1.8.1.5
--
To unsubscribe from this list: send the line "unsubscribe util-linux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
