aboutsummaryrefslogtreecommitdiff
path: root/toys/posix
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2014-07-06 19:14:05 -0500
committerRob Landley <rob@landley.net>2014-07-06 19:14:05 -0500
commitffa7e3b05eea2d404758758c561f534824ca77c8 (patch)
tree63c9625f690df940215b22997b8deb1e990c90b4 /toys/posix
parent36f6dea7ea3c9973910f38af61a58f20513b95c8 (diff)
downloadtoybox-ffa7e3b05eea2d404758758c561f534824ca77c8.tar.gz
Promote killall5 by merging it into kill.
Slight conflict here: this puts killall5 in the posix directory. But the commands sharing code trumps that.
Diffstat (limited to 'toys/posix')
-rw-r--r--toys/posix/kill.c109
1 files changed, 99 insertions, 10 deletions
diff --git a/toys/posix/kill.c b/toys/posix/kill.c
index 1e5e1d9f..72113878 100644
--- a/toys/posix/kill.c
+++ b/toys/posix/kill.c
@@ -3,8 +3,16 @@
* Copyright 2012 Daniel Walter <d.walter@0x90.at>
*
* See http://opengroup.org/onlinepubs/9699919799/utilities/kill.html
+ *
+ * killall5.c - Send signal to all processes outside current session.
+ *
+ * Copyright 2014 Ranjan Kumar <ranjankumar.bth@gmail.com>
+ * Copyright 2014 Kyungwan Han <asura321@gamil.com>
+ *
+ * No Standard
-USE_KILL(NEWTOY(kill, "?s: l", TOYFLAG_BIN))
+USE_KILL(NEWTOY(kill, "?ls: ", TOYFLAG_BIN))
+USE_KILLALL5(NEWTOY(killall5, "?o*ls: [!lo][!ls]", TOYFLAG_SBIN))
config KILL
bool "kill"
@@ -12,16 +20,40 @@ config KILL
help
usage: kill [-l [SIGNAL] | -s SIGNAL | -SIGNAL] pid...
- Send a signal to a process
+ Send signal to process(es).
+
+ -l List signal name(s) and number(s)
+ -s Send SIGNAL (default SIGTERM)
+
+config KILLALL5
+ bool "killall5"
+ default y
+ depends on KILL
+ help
+ usage: killall5 [-l [SIGNAL]] [-SIGNAL|-s SIGNAL] [-o PID]...
+
+ Send a signal to all processes outside current session.
+
+ -l List signal name(s) and number(s)
+ -o PID Omit PID
+ -s send SIGNAL (default SIGTERM)
*/
+// This has to match the filename:
#define FOR_kill
#include "toys.h"
GLOBALS(
char *signame;
+ struct arg_list *olist;
)
+// But kill's flags are a subset of killall5's
+
+#define CLEANUP_kill
+#define FOR_killall5
+#include "generated/flags.h"
+
void kill_main(void)
{
int signum;
@@ -53,15 +85,72 @@ void kill_main(void)
error_exit("Unknown signal '%s'", arg);
} else signum = SIGTERM;
- if (!*args) {
- toys.exithelp++;
- error_exit("missing argument");
- }
+ // is it killall5?
+ if (CFG_KILLALL5 && toys.which->name[4]=='a') {
+ DIR *dp;
+ struct dirent *entry;
+ int pid, sid;
+ long *olist = 0, ocount = 0;
+
+ // parse omit list
+ if (toys.optflags & FLAG_o) {
+ struct arg_list *ptr;
- while (*args) {
- char *arg = *(args++);
+ for (ptr = TT.olist; ptr; ptr = ptr->next) ocount++;
+ olist = xmalloc(ocount*sizeof(long));
+ ocount = 0;
+ for (ptr = TT.olist; ptr; ptr=ptr->next)
+ olist[ocount++] = atolx(ptr->arg);
+ }
- pid = strtol(arg, &tmp, 10);
- if (*tmp || kill(pid, signum) < 0) error_msg("unknown pid '%s'", arg);
+ sid = getsid(pid = getpid());
+
+ if (!(dp = opendir("/proc"))) perror_exit("/proc");
+ while ((entry = readdir(dp))) {
+ int count, procpid, procsid;
+
+ if (!(procpid = atoi(entry->d_name))) continue;
+
+ snprintf(toybuf, sizeof(toybuf), "/proc/%d/stat", procpid);
+ if (!readfile(toybuf, toybuf, sizeof(toybuf))) continue;
+ if (sscanf(toybuf, "%*d %*s %*c %*d %*d %d", &procsid) != 1) continue;
+ if (pid == procpid || sid == procsid || procpid == 1) continue;
+
+ // Check for kernel threads.
+ snprintf(toybuf, sizeof(toybuf), "/proc/%d/cmdline", procpid);
+ if (!readfile(toybuf, toybuf, sizeof(toybuf)) || !*toybuf) continue;
+
+ // Check with omit list.
+ for (count = 0; count < ocount; count++)
+ if (procpid == olist[count]) break;
+ if (count != ocount) continue;
+
+ kill(procpid, signum);
+ }
+ if (CFG_TOYBOX_FREE) {
+ closedir(dp);
+ free(olist);
+ }
+
+ // is it kill?
+ } else {
+
+ // "<1" in optstr wouldn't cover this because "-SIGNAL"
+ if (!*args) {
+ toys.exithelp++;
+ error_exit("missing argument");
+ }
+
+ while (*args) {
+ char *arg = *(args++);
+
+ pid = strtol(arg, &tmp, 10);
+ if (*tmp || kill(pid, signum) < 0) error_msg("unknown pid '%s'", arg);
+ }
}
}
+
+void killall5_main(void)
+{
+ kill_main();
+}