2 files changed, 7 insertions, 18 deletions

diff --git a/editors/cmp.c b/editors/cmp.c
index 9189b3150..b211adf9f 100644
--- a/editors/cmp.c
+++ b/editors/cmp.c
@@ -23,16 +23,6 @@
 
 #include "libbb.h"
 
-static FILE *cmp_xfopen_input(const char *filename)
-{
-        FILE *fp;
-
-        fp = fopen_or_warn_stdin(filename);
-        if (fp)
-                return fp;
-        xfunc_die();    /* We already output an error message. */
-}
-
 static const char fmt_eof[] ALIGN1 = "cmp: EOF on %s\n";
 static const char fmt_differ[] ALIGN1 = "%s %s differ: char %"OFF_FMT"d, line %d\n";
 // This fmt_l_opt uses gnu-isms.  SUSv3 would be "%.0s%.0s%"OFF_FMT"d %o %o\n"
@@ -65,7 +55,7 @@ int cmp_main(int argc ATTRIBUTE_UNUSED, char **argv)
         argv += optind;
 
         filename1 = *argv;
-        fp1 = cmp_xfopen_input(filename1);
+        fp1 = xfopen_stdin(filename1);
 
         if (*++argv) {
                 filename2 = *argv;
@@ -79,7 +69,7 @@ int cmp_main(int argc ATTRIBUTE_UNUSED, char **argv)
 #endif
         }
 
-        fp2 = cmp_xfopen_input(filename2);
+        fp2 = xfopen_stdin(filename2);
         if (fp1 == fp2) {               /* Paranoia check... stdin == stdin? */
                 /* Note that we don't bother reading stdin.  Neither does gnu wc.
                  * But perhaps we should, so that other apps down the chain don't
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;