aboutsummaryrefslogtreecommitdiff
path: root/procps
diff options
context:
space:
mode:
authorErik Andersen <andersen@codepoet.org>2000-04-07 06:00:07 +0000
committerErik Andersen <andersen@codepoet.org>2000-04-07 06:00:07 +0000
commit825aead68b26a5857330972bd1c6adb9f78047ab (patch)
tree41cb71183c7a9bc0812a51f4a16714e400f63170 /procps
parent93d6513d9315fa72d7af4ac2435f8c1e243273cb (diff)
downloadbusybox-w32-825aead68b26a5857330972bd1c6adb9f78047ab.tar.gz
busybox-w32-825aead68b26a5857330972bd1c6adb9f78047ab.tar.bz2
busybox-w32-825aead68b26a5857330972bd1c6adb9f78047ab.zip
Patch to make killall actually kill all PIDs with the specified name,
rather then busylooping trying to kill the first one until it dies. Should be more efficient now, and will only send one signal to each specified process. -Erik
Diffstat (limited to 'procps')
-rw-r--r--procps/kill.c16
1 files changed, 11 insertions, 5 deletions
diff --git a/procps/kill.c b/procps/kill.c
index 260f4a074..c6dc79f65 100644
--- a/procps/kill.c
+++ b/procps/kill.c
@@ -224,12 +224,18 @@ extern int kill_main(int argc, char **argv)
224 else { 224 else {
225 /* Looks like they want to do a killall. Do that */ 225 /* Looks like they want to do a killall. Do that */
226 while (--argc >= 0) { 226 while (--argc >= 0) {
227 int pid; 227 pid_t* pidList;
228 228
229 while((pid = findPidByName( *argv))) { 229 pidList = findPidByName( *argv);
230 if (kill(pid, sig) != 0) 230 for(; pidList && pidList!=0; pidList++) {
231 fatalError( "Could not kill pid '%d': %s\n", pid, strerror(errno)); 231 if (kill(*pidList, sig) != 0)
232 fatalError( "Could not kill pid '%d': %s\n", *pidList, strerror(errno));
233 else
234 errorMsg( "killed pid '%d'\n", *pidList);
232 } 235 }
236 /* Note that we don't bother to free the memory
237 * allocated in findPidByName(). It will be freed
238 * upon exit, so we can save a byte or two */
233 argv++; 239 argv++;
234 } 240 }
235 } 241 }