From 35fb51272863c8723a40e59d2024c7f4c9ec8946 Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Wed, 1 Nov 2006 09:16:49 +0000 Subject: PID should be stored in pid_t, not int or long. find_pid_by_name() was returning 0 or -1 in last array element, but -1 was never checked. We can use just 0 intead. --- init/halt.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) (limited to 'init/halt.c') diff --git a/init/halt.c b/init/halt.c index 3ab41f1f2..a6cf48bbe 100644 --- a/init/halt.c +++ b/init/halt.c @@ -25,29 +25,34 @@ RB_POWERDOWN, #endif RB_AUTOBOOT }; - static const int signals[] = {SIGUSR1, SIGUSR2, SIGTERM}; + static const int signals[] = { SIGUSR1, SIGUSR2, SIGTERM }; - char *delay = "hpr"; + char *delay; int which, flags, rc = 1; /* Figure out which applet we're running */ - for(which=0;delay[which]!=*applet_name;which++); + for (which = 0; "hpr"[which] != *applet_name; which++); /* Parse and handle arguments */ flags = getopt32(argc, argv, "d:nf", &delay); - if (flags&1) sleep(xatou(delay)); - if (!(flags&2)) sync(); + if (flags & 1) sleep(xatou(delay)); + if (!(flags & 2)) sync(); /* Perform action. */ if (ENABLE_INIT && !(flags & 4)) { if (ENABLE_FEATURE_INITRD) { - long *pidlist=find_pid_by_name("linuxrc"); - if (*pidlist>0) rc = kill(*pidlist,signals[which]); - if (ENABLE_FEATURE_CLEAN_UP) free(pidlist); + pid_t *pidlist = find_pid_by_name("linuxrc"); + if (pidlist[0] > 0) + rc = kill(pidlist[0], signals[which]); + if (ENABLE_FEATURE_CLEAN_UP) + free(pidlist); } - if (rc) rc = kill(1,signals[which]); - } else rc = reboot(magic[which]); + if (rc) + rc = kill(1, signals[which]); + } else + rc = reboot(magic[which]); - if (rc) bb_error_msg("no"); + if (rc) + bb_error_msg("no"); return rc; } -- cgit v1.2.3