diff options
Diffstat (limited to 'editors/sed.c')
-rw-r--r-- | editors/sed.c | 11 |
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) } int sed_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -int sed_main(int argc, char **argv) +int sed_main(int argc ATTRIBUTE_UNUSED, char **argv) { enum { OPT_in_place = 1 << 0, @@ -1246,7 +1246,7 @@ int sed_main(int argc, char **argv) if (ENABLE_FEATURE_CLEAN_UP) atexit(sed_free_and_close_stuff); /* Lie to autoconf when it starts asking stupid questions. */ - if (argc == 2 && !strcmp(argv[1], "--version")) { + if (argv[1] && !strcmp(argv[1], "--version")) { puts("This is not GNU sed version 4.0"); return 0; } @@ -1257,7 +1257,7 @@ int sed_main(int argc, char **argv) "nn"; /* count -n */ opt = getopt32(argv, "irne:f:", &opt_e, &opt_f, &G.be_quiet); /* counter for -n */ - argc -= optind; + //argc -= optind; argv += optind; if (opt & OPT_in_place) { // -i atexit(cleanup_outname); @@ -1283,10 +1283,9 @@ int sed_main(int argc, char **argv) } /* if we didn't get a pattern from -e or -f, use argv[0] */ if (!(opt & 0x18)) { - if (!argc) + if (!*argv) bb_show_usage(); add_cmd_block(*argv++); - argc--; } /* Flush any unfinished commands. */ add_cmd(""); @@ -1306,7 +1305,7 @@ int sed_main(int argc, char **argv) int i; FILE *file; - for (i = 0; i < argc; i++) { + for (i = 0; argv[i]; i++) { struct stat statbuf; int nonstdoutfd; |