diff options
| author | Denis Vlasenko | 2008-03-17 09:09:09 +0000 |
|---|---|---|
| committer | Denis Vlasenko | 2008-03-17 09:09:09 +0000 |
| commit | 1d42665b6b0571b9fa5d3b10fbf2dd03382f0ba2 (patch) | |
| tree | 7ec8969fc2b07a2b7dc37f96435e5eddf7daf7fd /editors | |
| parent | 62a90cdd7435f09f4bb8673e8b7b213067f9d5cc (diff) | |
| download | busybox-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 'editors')
| -rw-r--r-- | editors/diff.c | 9 | ||||
| -rw-r--r-- | editors/ed.c | 4 |
2 files changed, 5 insertions, 8 deletions
diff --git a/editors/diff.c b/editors/diff.c index f9e82ba..4860778 100644 --- a/editors/diff.c +++ b/editors/diff.c @@ -1208,17 +1208,16 @@ int diff_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int diff_main(int argc ATTRIBUTE_UNUSED, char **argv) { bool gotstdin = 0; - char *U_opt; char *f1, *f2; llist_t *L_arg = NULL; INIT_G(); - /* exactly 2 params; collect multiple -L <label> */ - opt_complementary = "=2:L::"; + /* exactly 2 params; collect multiple -L <label>; -U N */ + opt_complementary = "=2:L::U+"; getopt32(argv, "abdiL:NqrsS:tTU:wu" "p" /* ignored (for compatibility) */, - &L_arg, &start, &U_opt); + &L_arg, &start, &context); /*argc -= optind;*/ argv += optind; while (L_arg) { @@ -1233,8 +1232,6 @@ int diff_main(int argc ATTRIBUTE_UNUSED, char **argv) /* we leak L_arg here... */ L_arg = L_arg->link; } - if (option_mask32 & FLAG_U) - context = xatoi_u(U_opt); /* * Do sanity checks, fill in stb1 and stb2 and call the appropriate diff --git a/editors/ed.c b/editors/ed.c index 15f0147..9606cfd 100644 --- a/editors/ed.c +++ b/editors/ed.c @@ -89,7 +89,7 @@ static char *skip_blank(const char *cp) int ed_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -int ed_main(int argc, char **argv) +int ed_main(int argc ATTRIBUTE_UNUSED, char **argv) { INIT_G(); @@ -99,7 +99,7 @@ int ed_main(int argc, char **argv) lines.next = &lines; lines.prev = &lines; - if (argc > 1) { + if (argv[1]) { fileName = xstrdup(argv[1]); if (!readLines(fileName, 1)) { return EXIT_SUCCESS; |