From 1d42665b6b0571b9fa5d3b10fbf2dd03382f0ba2 Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Mon, 17 Mar 2008 09:09:09 +0000 Subject: *: 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 --- runit/sv.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'runit/sv.c') diff --git a/runit/sv.c b/runit/sv.c index 45d5572f8..d5a9bd9cf 100644 --- a/runit/sv.c +++ b/runit/sv.c @@ -422,7 +422,7 @@ int sv_main(int argc, char **argv) char **servicex; unsigned waitsec = 7; smallint kll = 0; - smallint verbose = 0; + int verbose = 0; int (*act)(const char*); int (*cbk)(const char*); int curdir; @@ -436,9 +436,8 @@ int sv_main(int argc, char **argv) x = getenv("SVWAIT"); if (x) waitsec = xatou(x); - opt = getopt32(argv, "w:v", &x); - if (opt & 1) waitsec = xatou(x); // -w - if (opt & 2) verbose = 1; // -v + opt_complementary = "w+:vv"; /* -w N, -v is a counter */ + opt = getopt32(argv, "w:v", &waitsec, &verbose); argc -= optind; argv += optind; action = *argv++; -- cgit v1.2.3