aboutsummaryrefslogtreecommitdiff
path: root/editors/sed.c
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2008-03-17 09:07:36 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2008-03-17 09:07:36 +0000
commit62a90cdd7435f09f4bb8673e8b7b213067f9d5cc (patch)
treeac7f86c4de0ce0c095b59820c7ba238369c65f71 /editors/sed.c
parentd02db892440499a072ea8c83c2370e9d9c103098 (diff)
downloadbusybox-w32-62a90cdd7435f09f4bb8673e8b7b213067f9d5cc.tar.gz
busybox-w32-62a90cdd7435f09f4bb8673e8b7b213067f9d5cc.tar.bz2
busybox-w32-62a90cdd7435f09f4bb8673e8b7b213067f9d5cc.zip
*: shrink by using [f]open_or_warn_stdin where appropriate
function old new delta lsattr_main 62 143 +81 open_or_warn_stdin - 36 +36 fclose_if_not_stdin 20 47 +27 xfopen_stdin - 20 +20 tac_main 336 356 +20 cksum_main 249 259 +10 bb_argv_dash - 8 +8 su_main 448 455 +7 cmp_main 630 633 +3 passwd_main 1072 1074 +2 uudecode_main 317 315 -2 text_yank 110 108 -2 handle_incoming_and_exit 2653 2651 -2 flags 5 1 -4 write_leases 235 230 -5 fopen_or_warn_stdin 48 42 -6 fold_main 648 642 -6 static.argv_dash 8 - -8 sum_main 142 128 -14 tail_main 1237 1221 -16 sed_main 711 695 -16 cmp_xfopen_input 17 - -17 bb_cat 113 96 -17 catv_main 328 306 -22 strings_main 457 434 -23 hash_file 298 274 -24 sum_file 353 325 -28 sort_main 904 859 -45 expand_main 736 686 -50 cut_main 1116 1065 -51 md5_sha1_sum_main 549 493 -56 lsattr_args 90 - -90 read_stduu 408 255 -153 ------------------------------------------------------------------------------ (add/remove: 3/3 grow/shrink: 7/20 up/down: 214/-657) Total: -443 bytes text data bss dec hex filename 797417 658 7428 805503 c4a7f busybox_old 796973 658 7428 805059 c48c3 busybox_unstripped
Diffstat (limited to 'editors/sed.c')
-rw-r--r--editors/sed.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/editors/sed.c b/editors/sed.c
index a0994aec0..32911f8f9 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -1231,7 +1231,7 @@ static void add_cmd_block(char *cmdstr)
1231} 1231}
1232 1232
1233int sed_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 1233int sed_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
1234int sed_main(int argc, char **argv) 1234int sed_main(int argc ATTRIBUTE_UNUSED, char **argv)
1235{ 1235{
1236 enum { 1236 enum {
1237 OPT_in_place = 1 << 0, 1237 OPT_in_place = 1 << 0,
@@ -1246,7 +1246,7 @@ int sed_main(int argc, char **argv)
1246 if (ENABLE_FEATURE_CLEAN_UP) atexit(sed_free_and_close_stuff); 1246 if (ENABLE_FEATURE_CLEAN_UP) atexit(sed_free_and_close_stuff);
1247 1247
1248 /* Lie to autoconf when it starts asking stupid questions. */ 1248 /* Lie to autoconf when it starts asking stupid questions. */
1249 if (argc == 2 && !strcmp(argv[1], "--version")) { 1249 if (argv[1] && !strcmp(argv[1], "--version")) {
1250 puts("This is not GNU sed version 4.0"); 1250 puts("This is not GNU sed version 4.0");
1251 return 0; 1251 return 0;
1252 } 1252 }
@@ -1257,7 +1257,7 @@ int sed_main(int argc, char **argv)
1257 "nn"; /* count -n */ 1257 "nn"; /* count -n */
1258 opt = getopt32(argv, "irne:f:", &opt_e, &opt_f, 1258 opt = getopt32(argv, "irne:f:", &opt_e, &opt_f,
1259 &G.be_quiet); /* counter for -n */ 1259 &G.be_quiet); /* counter for -n */
1260 argc -= optind; 1260 //argc -= optind;
1261 argv += optind; 1261 argv += optind;
1262 if (opt & OPT_in_place) { // -i 1262 if (opt & OPT_in_place) { // -i
1263 atexit(cleanup_outname); 1263 atexit(cleanup_outname);
@@ -1283,10 +1283,9 @@ int sed_main(int argc, char **argv)
1283 } 1283 }
1284 /* if we didn't get a pattern from -e or -f, use argv[0] */ 1284 /* if we didn't get a pattern from -e or -f, use argv[0] */
1285 if (!(opt & 0x18)) { 1285 if (!(opt & 0x18)) {
1286 if (!argc) 1286 if (!*argv)
1287 bb_show_usage(); 1287 bb_show_usage();
1288 add_cmd_block(*argv++); 1288 add_cmd_block(*argv++);
1289 argc--;
1290 } 1289 }
1291 /* Flush any unfinished commands. */ 1290 /* Flush any unfinished commands. */
1292 add_cmd(""); 1291 add_cmd("");
@@ -1306,7 +1305,7 @@ int sed_main(int argc, char **argv)
1306 int i; 1305 int i;
1307 FILE *file; 1306 FILE *file;
1308 1307
1309 for (i = 0; i < argc; i++) { 1308 for (i = 0; argv[i]; i++) {
1310 struct stat statbuf; 1309 struct stat statbuf;
1311 int nonstdoutfd; 1310 int nonstdoutfd;
1312 1311