diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2006-09-27 14:25:33 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2006-09-27 14:25:33 +0000 |
| commit | 0bb628f4f3fbd0fc0a96d257830fcbbb14db2bd1 (patch) | |
| tree | fd0cff9651bdffc5f4b8ed5bfaee7b2671384e08 /include | |
| parent | a77947f5bb9ef38b0f1fc6a2a5b500fa6ade601e (diff) | |
| download | busybox-w32-0bb628f4f3fbd0fc0a96d257830fcbbb14db2bd1.tar.gz busybox-w32-0bb628f4f3fbd0fc0a96d257830fcbbb14db2bd1.tar.bz2 busybox-w32-0bb628f4f3fbd0fc0a96d257830fcbbb14db2bd1.zip | |
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 c75866dde..e12f6027c 100644 --- a/include/applets.h +++ b/include/applets.h | |||
| @@ -159,6 +159,7 @@ USE_IPROUTE(APPLET(iproute, _BB_DIR_BIN, _BB_SUID_NEVER)) | |||
| 159 | USE_IPTUNNEL(APPLET(iptunnel, _BB_DIR_BIN, _BB_SUID_NEVER)) | 159 | USE_IPTUNNEL(APPLET(iptunnel, _BB_DIR_BIN, _BB_SUID_NEVER)) |
| 160 | USE_KILL(APPLET(kill, _BB_DIR_BIN, _BB_SUID_NEVER)) | 160 | USE_KILL(APPLET(kill, _BB_DIR_BIN, _BB_SUID_NEVER)) |
| 161 | USE_KILLALL(APPLET_ODDNAME(killall, kill, _BB_DIR_USR_BIN, _BB_SUID_NEVER, killall)) | 161 | USE_KILLALL(APPLET_ODDNAME(killall, kill, _BB_DIR_USR_BIN, _BB_SUID_NEVER, killall)) |
| 162 | USE_KILLALL5(APPLET_ODDNAME(killall5, kill, _BB_DIR_USR_BIN, _BB_SUID_NEVER, killall5)) | ||
| 162 | USE_KLOGD(APPLET(klogd, _BB_DIR_SBIN, _BB_SUID_NEVER)) | 163 | USE_KLOGD(APPLET(klogd, _BB_DIR_SBIN, _BB_SUID_NEVER)) |
| 163 | USE_LASH(APPLET(lash, _BB_DIR_BIN, _BB_SUID_NEVER)) | 164 | USE_LASH(APPLET(lash, _BB_DIR_BIN, _BB_SUID_NEVER)) |
| 164 | USE_LAST(APPLET(last, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) | 165 | USE_LAST(APPLET(last, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) |
diff --git a/include/usage.h b/include/usage.h index da176d156..8b8d64e84 100644 --- a/include/usage.h +++ b/include/usage.h | |||
| @@ -1485,9 +1485,9 @@ USE_FEATURE_DATE_ISOFMT( \ | |||
| 1485 | "\t\t\t[ ttl TTL ] [ tos TOS ] [ [no]pmtudisc ] [ dev PHYS_DEV ]" | 1485 | "\t\t\t[ ttl TTL ] [ tos TOS ] [ [no]pmtudisc ] [ dev PHYS_DEV ]" |
| 1486 | 1486 | ||
| 1487 | #define kill_trivial_usage \ | 1487 | #define kill_trivial_usage \ |
| 1488 | "[-signal] process-id [process-id ...]" | 1488 | "[-l] [-signal] process-id [process-id ...]" |
| 1489 | #define kill_full_usage \ | 1489 | #define kill_full_usage \ |
| 1490 | "Send a signal (default is SIGTERM) to the specified process(es).\n\n" \ | 1490 | "Send a signal (default is TERM) to the specified process(es).\n\n" \ |
| 1491 | "Options:\n" \ | 1491 | "Options:\n" \ |
| 1492 | "\t-l\tList all signal names and numbers" | 1492 | "\t-l\tList all signal names and numbers" |
| 1493 | #define kill_example_usage \ | 1493 | #define kill_example_usage \ |
| @@ -1501,15 +1501,22 @@ USE_FEATURE_DATE_ISOFMT( \ | |||
| 1501 | "$ kill 252\n" | 1501 | "$ kill 252\n" |
| 1502 | 1502 | ||
| 1503 | #define killall_trivial_usage \ | 1503 | #define killall_trivial_usage \ |
| 1504 | "[-q] [-signal] process-name [process-name ...]" | 1504 | "[-l] [-q] [-signal] process-name [process-name ...]" |
| 1505 | #define killall_full_usage \ | 1505 | #define killall_full_usage \ |
| 1506 | "Send a signal (default is SIGTERM) to the specified process(es).\n\n" \ | 1506 | "Send a signal (default is TERM) to the specified process(es).\n\n" \ |
| 1507 | "Options:\n" \ | 1507 | "Options:\n" \ |
| 1508 | "\t-l\tList all signal names and numbers\n" \ | 1508 | "\t-l\tList all signal names and numbers\n" \ |
| 1509 | "\t-q\tDo not complain if no processes were killed" | 1509 | "\t-q\tDo not complain if no processes were killed" |
| 1510 | #define killall_example_usage \ | 1510 | #define killall_example_usage \ |
| 1511 | "$ killall apache\n" | 1511 | "$ killall apache\n" |
| 1512 | 1512 | ||
| 1513 | #define killall5_trivial_usage \ | ||
| 1514 | "[-l] [-signal]" | ||
| 1515 | #define killall5_full_usage \ | ||
| 1516 | "Send a signal (default is TERM) to all processes outside current session.\n\n" \ | ||
| 1517 | "Options:\n" \ | ||
| 1518 | "\t-l\tList all signal names and numbers\n" \ | ||
| 1519 | |||
| 1513 | #define klogd_trivial_usage \ | 1520 | #define klogd_trivial_usage \ |
| 1514 | "[-c n] [-n]" | 1521 | "[-c n] [-n]" |
| 1515 | #define klogd_full_usage \ | 1522 | #define klogd_full_usage \ |