emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PID should be stored in pid_t, not int or long.

Browse Source 
find_pid_by_name() was returning 0 or -1 in last array element,
but -1 was never checked. We can use just 0 intead.
This commit is contained in:
Denis Vlasenko
2006-11-01 09:16:49 +00:00
parent d3ada32285
commit 35fb512728
8 changed files with 76 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
init/halt.c
View File

@@ -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;
}