summaryrefslogtreecommitdiff
path: root/openwrt/package/busybox/patches/100-killall5.patch
blob: 161b7e6f25db956d0b4118611ca046e20192d322 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
diff -urN busybox-dist/include/applets.h busybox/include/applets.h
--- busybox-dist/include/applets.h	2004-03-13 02:33:09.000000000 -0600
+++ busybox/include/applets.h	2004-03-16 09:45:29.000000000 -0600
@@ -313,6 +313,9 @@
 #ifdef CONFIG_KILLALL
 	APPLET(killall, kill_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)
 #endif
+#ifdef CONFIG_KILLALL5
+	APPLET(killall5, kill_main, _BB_DIR_USR_BIN, _BB_SUID_NEVER)
+#endif
 #ifdef CONFIG_KLOGD
 	APPLET(klogd, klogd_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
 #endif
diff -urN busybox-dist/include/usage.h busybox/include/usage.h
--- busybox-dist/include/usage.h	2004-03-13 02:33:09.000000000 -0600
+++ busybox/include/usage.h	2004-03-16 09:45:29.000000000 -0600
@@ -1389,6 +1389,13 @@
 #define killall_example_usage \
 	"$ killall apache\n"
 
+#define killall5_trivial_usage \
+	""
+#define killall5_full_usage \
+	""
+#define killall5_example_usage \
+	""
+
 #define klogd_trivial_usage \
 	"[-c n] [-n]"
 #define klogd_full_usage \
diff -urN busybox-dist/procps/Config.in busybox/procps/Config.in
--- busybox-dist/procps/Config.in	2003-12-24 00:02:11.000000000 -0600
+++ busybox/procps/Config.in	2004-03-16 09:45:29.000000000 -0600
@@ -30,6 +30,11 @@
 	  specified commands.  If no signal name is specified, SIGTERM is
 	  sent.
 
+config CONFIG_KILLALL5
+	bool "killall5"
+	default n
+	depends on CONFIG_KILL
+	
 config CONFIG_PIDOF
 	bool "pidof"
 	default n
diff -urN busybox-dist/procps/kill.c busybox/procps/kill.c
--- busybox-dist/procps/kill.c	2004-03-15 02:29:03.000000000 -0600
+++ busybox/procps/kill.c	2004-03-16 09:45:29.000000000 -0600
@@ -34,6 +34,7 @@
 
 #define KILL 0
 #define KILLALL 1
+#define KILLALL5 2
 
 extern int kill_main(int argc, char **argv)
 {
@@ -47,6 +48,9 @@
 #else
 	whichApp = KILL;
 #endif
+#ifdef CONFIG_KILLALL5
+	whichApp = (strcmp(bb_applet_name, "killall5") == 0)? KILLALL5 : whichApp;
+#endif
 
 	/* Parse any options */
 	if (argc < 2)
@@ -119,6 +123,20 @@
 		}
 
 	}
+#ifdef CONFIG_KILLALL5
+	else if (whichApp == KILLALL5) {
+		procps_status_t * p;
+		pid_t myPid=getpid();
+		while ((p = procps_scan(0)) != 0) {
+			if (p->pid != 1 && p->pid != myPid && p->pid != p->ppid) {
+				if (kill(p->pid, signo) != 0) {
+					bb_perror_msg( "Could not kill pid '%d'", p->pid);
+					errors++;
+				}
+			}
+		}
+	}
+#endif
 #ifdef CONFIG_KILLALL
 	else {
 		pid_t myPid=getpid();