diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2006-11-01 09:16:49 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2006-11-01 09:16:49 +0000 |
| commit | 35fb51272863c8723a40e59d2024c7f4c9ec8946 (patch) | |
| tree | a97deb26bca43e394a603840039846cd9d89cae9 /init | |
| parent | d3ada3228551e2556afb9de6d3126fd016df1fb1 (diff) | |
| download | busybox-w32-35fb51272863c8723a40e59d2024c7f4c9ec8946.tar.gz busybox-w32-35fb51272863c8723a40e59d2024c7f4c9ec8946.tar.bz2 busybox-w32-35fb51272863c8723a40e59d2024c7f4c9ec8946.zip | |
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.c | 27 |
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, | |||
| 25 | #endif | 25 | #endif |
| 26 | RB_AUTOBOOT | 26 | RB_AUTOBOOT |
| 27 | }; | 27 | }; |
| 28 | static const int signals[] = {SIGUSR1, SIGUSR2, SIGTERM}; | 28 | static const int signals[] = { SIGUSR1, SIGUSR2, SIGTERM }; |
| 29 | 29 | ||
| 30 | char *delay = "hpr"; | 30 | char *delay; |
| 31 | int which, flags, rc = 1; | 31 | int which, flags, rc = 1; |
| 32 | 32 | ||
| 33 | /* Figure out which applet we're running */ | 33 | /* Figure out which applet we're running */ |
| 34 | for(which=0;delay[which]!=*applet_name;which++); | 34 | for (which = 0; "hpr"[which] != *applet_name; which++); |
| 35 | 35 | ||
| 36 | /* Parse and handle arguments */ | 36 | /* Parse and handle arguments */ |
| 37 | flags = getopt32(argc, argv, "d:nf", &delay); | 37 | flags = getopt32(argc, argv, "d:nf", &delay); |
| 38 | if (flags&1) sleep(xatou(delay)); | 38 | if (flags & 1) sleep(xatou(delay)); |
| 39 | if (!(flags&2)) sync(); | 39 | if (!(flags & 2)) sync(); |
| 40 | 40 | ||
| 41 | /* Perform action. */ | 41 | /* Perform action. */ |
| 42 | if (ENABLE_INIT && !(flags & 4)) { | 42 | if (ENABLE_INIT && !(flags & 4)) { |
| 43 | if (ENABLE_FEATURE_INITRD) { | 43 | if (ENABLE_FEATURE_INITRD) { |
| 44 | long *pidlist=find_pid_by_name("linuxrc"); | 44 | pid_t *pidlist = find_pid_by_name("linuxrc"); |
| 45 | if (*pidlist>0) rc = kill(*pidlist,signals[which]); | 45 | if (pidlist[0] > 0) |
| 46 | if (ENABLE_FEATURE_CLEAN_UP) free(pidlist); | 46 | rc = kill(pidlist[0], signals[which]); |
| 47 | if (ENABLE_FEATURE_CLEAN_UP) | ||
| 48 | free(pidlist); | ||
| 47 | } | 49 | } |
| 48 | if (rc) rc = kill(1,signals[which]); | 50 | if (rc) |
| 49 | } else rc = reboot(magic[which]); | 51 | rc = kill(1, signals[which]); |
| 52 | } else | ||
| 53 | rc = reboot(magic[which]); | ||
| 50 | 54 | ||
| 51 | if (rc) bb_error_msg("no"); | 55 | if (rc) |
| 56 | bb_error_msg("no"); | ||
| 52 | return rc; | 57 | return rc; |
| 53 | } | 58 | } |