aboutsummaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorGravatar Denis Vlasenko <vda.linux@googlemail.com>2006-11-01 09:16:49 +0000
committerGravatar Denis Vlasenko <vda.linux@googlemail.com>2006-11-01 09:16:49 +0000
commit35fb51272863c8723a40e59d2024c7f4c9ec8946 (patch)
treea97deb26bca43e394a603840039846cd9d89cae9 /init
parentd3ada3228551e2556afb9de6d3126fd016df1fb1 (diff)
downloadbusybox-35fb51272863c8723a40e59d2024c7f4c9ec8946.tar.gz
busybox-35fb51272863c8723a40e59d2024c7f4c9ec8946.tar.bz2
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.
Diffstat (limited to 'init')
-rw-r--r--init/halt.c27
1 files changed, 16 insertions, 11 deletions
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;
}