diff options
| author | Denis Vlasenko | 2006-09-27 14:25:33 +0000 |
|---|---|---|
| committer | Denis Vlasenko | 2006-09-27 14:25:33 +0000 |
| commit | 0bb628f4f3fbd0fc0a96d257830fcbbb14db2bd1 (patch) | |
| tree | fd0cff9651bdffc5f4b8ed5bfaee7b2671384e08 /include | |
| parent | a77947f5bb9ef38b0f1fc6a2a5b500fa6ade601e (diff) | |
| download | busybox-0bb628f4f3fbd0fc0a96d257830fcbbb14db2bd1.zip busybox-0bb628f4f3fbd0fc0a96d257830fcbbb14db2bd1.tar.gz | |
kill: implement killall5. OpenWRT folks will be happy.
However their code was unusably different from sysvinit original.
Run tested.
Diffstat (limited to 'include')
| -rw-r--r-- | include/applets.h | 1 | ||||
| -rw-r--r-- | include/usage.h | 15 |
2 files changed, 12 insertions, 4 deletions
diff --git a/include/applets.h b/include/applets.h index c75866d..e12f602 100644 --- a/include/applets.h +++ b/include/applets.h @@ -159,6 +159,7 @@ USE_IPROUTE(APPLET(iproute, _BB_DIR_BIN, _BB_SUID_NEVER)) USE_IPTUNNEL(APPLET(iptunnel, _BB_DIR_BIN, _BB_SUID_NEVER)) USE_KILL(APPLET(kill, _BB_DIR_BIN, _BB_SUID_NEVER)) USE_KILLALL(APPLET_ODDNAME(killall, kill, _BB_DIR_USR_BIN, _BB_SUID_NEVER, killall)) +USE_KILLALL5(APPLET_ODDNAME(killall5, kill, _BB_DIR_USR_BIN, _BB_SUID_NEVER, killall5)) USE_KLOGD(APPLET(klogd, _BB_DIR_SBIN, _BB_SUID_NEVER)) USE_LASH(APPLET(lash, _BB_DIR_BIN, _BB_SUID_NEVER)) USE_LAST(APPLET(last, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) diff --git a/include/usage.h b/include/usage.h index da176d1..8b8d64e 100644 --- a/include/usage.h +++ b/include/usage.h @@ -1485,9 +1485,9 @@ USE_FEATURE_DATE_ISOFMT( \ "\t\t\t[ ttl TTL ] [ tos TOS ] [ [no]pmtudisc ] [ dev PHYS_DEV ]" #define kill_trivial_usage \ - "[-signal] process-id [process-id ...]" + "[-l] [-signal] process-id [process-id ...]" #define kill_full_usage \ - "Send a signal (default is SIGTERM) to the specified process(es).\n\n" \ + "Send a signal (default is TERM) to the specified process(es).\n\n" \ "Options:\n" \ "\t-l\tList all signal names and numbers" #define kill_example_usage \ @@ -1501,15 +1501,22 @@ USE_FEATURE_DATE_ISOFMT( \ "$ kill 252\n" #define killall_trivial_usage \ - "[-q] [-signal] process-name [process-name ...]" + "[-l] [-q] [-signal] process-name [process-name ...]" #define killall_full_usage \ - "Send a signal (default is SIGTERM) to the specified process(es).\n\n" \ + "Send a signal (default is TERM) to the specified process(es).\n\n" \ "Options:\n" \ "\t-l\tList all signal names and numbers\n" \ "\t-q\tDo not complain if no processes were killed" #define killall_example_usage \ "$ killall apache\n" +#define killall5_trivial_usage \ + "[-l] [-signal]" +#define killall5_full_usage \ + "Send a signal (default is TERM) to all processes outside current session.\n\n" \ + "Options:\n" \ + "\t-l\tList all signal names and numbers\n" \ + #define klogd_trivial_usage \ "[-c n] [-n]" #define klogd_full_usage \ |