summaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorDenis Vlasenko2008-03-17 09:09:09 +0000
committerDenis Vlasenko2008-03-17 09:09:09 +0000
commit1d42665b6b0571b9fa5d3b10fbf2dd03382f0ba2 (patch)
tree7ec8969fc2b07a2b7dc37f96435e5eddf7daf7fd /init
parent62a90cdd7435f09f4bb8673e8b7b213067f9d5cc (diff)
downloadbusybox-1d42665b6b0571b9fa5d3b10fbf2dd03382f0ba2.zip
busybox-1d42665b6b0571b9fa5d3b10fbf2dd03382f0ba2.tar.gz
*: shrink: use Vladimir's "o+" specifier instead of xatou(opt_param)
function old new delta getopt32 1370 1385 +15 sulogin_main 490 494 +4 realpath_main 84 86 +2 sleep_main 76 77 +1 mt_main 256 257 +1 printenv_main 75 74 -1 fdformat_main 546 545 -1 usleep_main 44 42 -2 setlogcons_main 77 75 -2 ed_main 2654 2649 -5 deallocvt_main 69 64 -5 addgroup_main 373 368 -5 mkfs_minix_main 2989 2982 -7 tail_main 1221 1213 -8 sv_main 1254 1241 -13 du_main 348 328 -20 tftp_main 325 302 -23 split_main 581 558 -23 nc_main 1000 977 -23 diff_main 891 868 -23 arping_main 1797 1770 -27 ls_main 893 847 -46 od_main 2797 2750 -47 readprofile_main 1944 1895 -49 tcpudpsvd_main 1973 1922 -51 udhcpc_main 2590 2513 -77 grep_main 824 722 -102 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 5/22 up/down: 23/-560) Total: -537 bytes text data bss dec hex filename 796973 658 7428 805059 c48c3 busybox_old 796479 662 7420 804561 c46d1 busybox_unstripped
Diffstat (limited to 'init')
-rw-r--r--init/halt.c7
-rw-r--r--init/init.c8
2 files changed, 8 insertions, 7 deletions
diff --git a/init/halt.c b/init/halt.c
index 1f0fae3..c14f0f2 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 1145c04..6d4969c 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 */