diff options
Diffstat (limited to 'init')
| -rw-r--r-- | init/halt.c | 7 | ||||
| -rw-r--r-- | init/init.c | 8 |
2 files changed, 8 insertions, 7 deletions
diff --git a/init/halt.c b/init/halt.c index 1f0fae302..c14f0f221 100644 --- a/init/halt.c +++ b/init/halt.c @@ -33,7 +33,7 @@ RB_AUTOBOOT }; static const smallint signals[] = { SIGUSR1, SIGUSR2, SIGTERM }; - char *delay; + int delay = 0; int which, flags, rc = 1; #if ENABLE_FEATURE_WTMP struct utmp utmp; @@ -46,9 +46,10 @@ RB_AUTOBOOT continue; /* Parse and handle arguments */ + opt_complementary = "d+"; /* -d N */ flags = getopt32(argv, "d:nfw", &delay); - if (flags & 1) - sleep(xatou(delay)); + + sleep(delay); #if ENABLE_FEATURE_WTMP if (access(bb_path_wtmp_file, R_OK|W_OK) == -1) { diff --git a/init/init.c b/init/init.c index 1145c0490..6d4969c4b 100644 --- a/init/init.c +++ b/init/init.c @@ -818,14 +818,14 @@ static void reload_signal(int sig ATTRIBUTE_UNUSED) } int init_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -int init_main(int argc, char **argv) +int init_main(int argc ATTRIBUTE_UNUSED, char **argv) { struct init_action *a; pid_t wpid; die_sleep = 30 * 24*60*60; /* if xmalloc will ever die... */ - if (argc > 1 && !strcmp(argv[1], "-q")) { + if (argv[1] && !strcmp(argv[1], "-q")) { return kill(1, SIGHUP); } @@ -868,7 +868,7 @@ int init_main(int argc, char **argv) putenv((char *) *e); } - if (argc > 1) setenv("RUNLEVEL", argv[1], 1); + if (argv[1]) setenv("RUNLEVEL", argv[1], 1); /* Hello world */ message(MAYBE_CONSOLE | L_LOG, "init started: %s", bb_banner); @@ -890,7 +890,7 @@ int init_main(int argc, char **argv) } /* Check if we are supposed to be in single user mode */ - if (argc > 1 + if (argv[1] && (!strcmp(argv[1], "single") || !strcmp(argv[1], "-s") || LONE_CHAR(argv[1], '1')) ) { /* Start a shell on console */ |