summaryrefslogtreecommitdiff
path: root/procps/kill.c
diff options
context:
space:
mode:
authorDenis Vlasenko2008-05-15 21:30:45 +0000
committerDenis Vlasenko2008-05-15 21:30:45 +0000
commit6b06cb80be64fcf207bee734cc678c25434ed1a4 (patch)
treeaebc37ae3a2658fba3f57003102fa0dfb1a10ac8 /procps/kill.c
parent43d5d429fd7a80ca02eb8388f058fd9654cc118d (diff)
downloadbusybox-6b06cb80be64fcf207bee734cc678c25434ed1a4.zip
busybox-6b06cb80be64fcf207bee734cc678c25434ed1a4.tar.gz
more of -Wall fixes from Cristian Ionescu-Idbohrn.
Some are fixing real bugs. function old new delta syslogd_main 938 958 +20 get_signum 136 143 +7 obj_load 777 782 +5 recv_from_to 210 214 +4 get_next_block 1795 1799 +4 display_topmem_process_list 1117 1121 +4 logread_main 484 487 +3 buffer_fill_and_print 73 76 +3 kill_main 687 689 +2 ll_remember_index 240 241 +1 do_stats 452 453 +1 if_readconf 166 165 -1 display_process_list 1192 1191 -1 run_applet_and_exit 507 505 -2 print_signames 33 31 -2 parse_one_line 1092 1090 -2 find_out_spec 57 55 -2 add_ksymoops_symbols 421 419 -2 ash_main 1407 1402 -5 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 11/8 up/down: 54/-17) Total: 37 bytes
Diffstat (limited to 'procps/kill.c')
-rw-r--r--procps/kill.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/procps/kill.c b/procps/kill.c
index b839b38..ed659af 100644
--- a/procps/kill.c
+++ b/procps/kill.c
@@ -106,19 +106,19 @@ int kill_main(int argc, char **argv)
argc--;
do_it_now:
+ pid = getpid();
if (killall5) {
pid_t sid;
procps_status_t* p = NULL;
- /* Now stop all processes */
- kill(-1, SIGSTOP);
/* Find out our own session id */
- pid = getpid();
sid = getsid(pid);
+ /* Now stop all processes */
+ kill(-1, SIGSTOP);
/* Now kill all processes except our session */
while ((p = procps_scan(p, PSSCAN_PID|PSSCAN_SID))) {
- if (p->sid != sid && p->pid != pid && p->pid != 1)
+ if (p->sid != (unsigned)sid && p->pid != (unsigned)pid && p->pid != 1)
kill(p->pid, signo);
}
/* And let them continue */
@@ -134,7 +134,6 @@ do_it_now:
if (killall) {
/* Looks like they want to do a killall. Do that */
- pid = getpid();
while (arg) {
pid_t* pidList;