From: Sami Kerola <kerolasa@iki.fi>
Date: Wed, 6 Mar 2013 22:07:42 +0000 (+0000)
Subject: kill: add long options
X-Git-Tag: v2.23-rc1~78
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=daa54393bcef249a0b9a9e4785033b3720d90987;p=thirdparty%2Futil-linux.git

kill: add long options

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
---

diff --git a/misc-utils/kill.c b/misc-utils/kill.c
index 10730a3113..e43f23aaf0 100644
--- a/misc-utils/kill.c
+++ b/misc-utils/kill.c
@@ -193,11 +193,11 @@ int main (int argc, char *argv[])
 	    printf(UTIL_LINUX_VERSION);
 	    return 0;
 	}
-	if (! strcmp (arg, "-a")) {
+	if (! strcmp (arg, "-a") || ! strcmp (arg, "--all")) {
 	    check_all++;
 	    continue;
 	}
-	if (! strcmp (arg, "-l")) {
+	if (! strcmp (arg, "-l") || ! strcmp (arg, "--list")) {
 	    if (argc < 2) {
 		printsignals (stdout);
 		return 0;
@@ -214,13 +214,13 @@ int main (int argc, char *argv[])
 	    printsig (numsig);
 	    return 0;
 	}
-	if (! strcmp (arg, "-p")) {
+	if (! strcmp (arg, "-p") || ! strcmp (arg, "--pid")) {
 	    do_pid++;
 	    if (do_kill)
 		return usage (1);
 	    continue;
 	}
-	if (! strcmp (arg, "-s")) {
+	if (! strcmp (arg, "-s") || ! strcmp (arg, "--signal")) {
 	    if (argc < 2) {
 		return usage (1);
 	    }
@@ -235,7 +235,7 @@ int main (int argc, char *argv[])
 	    }
 	    continue;
 	}
-	if (! strcmp (arg, "-q")) {
+	if (! strcmp (arg, "-q") || ! strcmp (arg, "--queue")) {
 	    if (argc < 2)
 		return usage (1);
 	    argc--, argv++;