3 files changed, 20 insertions, 14 deletions

diff --git a/editors/cmp.c b/editors/cmp.c
index e106d814e..6d2b0c6c3 100644
--- a/editors/cmp.c
+++ b/editors/cmp.c
@@ -18,12 +18,13 @@
 //kbuild:lib-$(CONFIG_CMP) += cmp.o
 
 //usage:#define cmp_trivial_usage
-//usage:       "[-ls] FILE1 [FILE2" IF_DESKTOP(" [SKIP1 [SKIP2]]") "]"
+//usage:       "[-ls] [-n NUM] FILE1 [FILE2" IF_DESKTOP(" [SKIP1 [SKIP2]]") "]"
 //usage:#define cmp_full_usage "\n\n"
 //usage:       "Compare FILE1 with FILE2 (or stdin)\n"
 //usage:     "\n        -l      Write the byte numbers (decimal) and values (octal)"
 //usage:     "\n                for all differing bytes"
 //usage:     "\n        -s      Quiet"
+//usage:     "\n        -n NUM  Compare at most NUM bytes"
 
 /* BB_AUDIT SUSv3 (virtually) compliant -- uses nicer GNU format for -l. */
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/cmp.html */
@@ -35,9 +36,10 @@ static const char fmt_differ[] ALIGN1 = "%s %s differ: char %"OFF_FMT"u, line %u
 // This fmt_l_opt uses gnu-isms.  SUSv3 would be "%.0s%.0s%"OFF_FMT"u %o %o\n"
 static const char fmt_l_opt[] ALIGN1 = "%.0s%.0s%"OFF_FMT"u %3o %3o\n";
 
-#define OPT_STR "sl"
+#define OPT_STR "sln:+"
 #define CMP_OPT_s (1<<0)
 #define CMP_OPT_l (1<<1)
+#define CMP_OPT_n (1<<2)
 
 int cmp_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int cmp_main(int argc UNUSED_PARAM, char **argv)
@@ -50,13 +52,15 @@ int cmp_main(int argc UNUSED_PARAM, char **argv)
         int c1, c2;
         unsigned opt;
         int retval = 0;
+        int max_count = -1;
 
         opt = getopt32(argv, "^"
                         OPT_STR
                         "\0" "-1"
                         IF_DESKTOP(":?4")
                         IF_NOT_DESKTOP(":?2")
-                        ":l--s:s--l"
+                        ":l--s:s--l",
+                        &max_count
         );
         argv += optind;
 
@@ -95,6 +99,8 @@ int cmp_main(int argc UNUSED_PARAM, char **argv)
                 while (skip2) { getc(fp2); skip2--; }
         }
         do {
+                if (max_count >= 0 && --max_count < 0)
+                        break;
                 c1 = getc(fp1);
                 c2 = getc(fp2);
                 ++char_pos;
diff --git a/editors/ed.c b/editors/ed.c
index 14540e566..dfe0f1a77 100644
--- a/editors/ed.c
+++ b/editors/ed.c
@@ -18,7 +18,7 @@
 
 //applet:IF_ED(APPLET(ed, BB_DIR_BIN, BB_SUID_DROP))
 
-//usage:#define ed_trivial_usage "[FILE]"
+//usage:#define ed_trivial_usage "[-p PROMPT] [FILE]"
 //usage:#define ed_full_usage ""
 
 #include "libbb.h"
@@ -48,6 +48,7 @@ struct globals {
         char *bufBase;
         char *bufPtr;
         char *fileName;
+        const char *prompt;
         LINE lines;
         smallint dirty;
         int marks[26];
@@ -57,6 +58,7 @@ struct globals {
 #define bufBase            (G.bufBase           )
 #define bufPtr             (G.bufPtr            )
 #define fileName           (G.fileName          )
+#define prompt             (G.prompt            )
 #define curNum             (G.curNum            )
 #define lastNum            (G.lastNum           )
 #define bufUsed            (G.bufUsed           )
@@ -400,9 +402,6 @@ static int readLines(const char *file, int num)
         charCount = 0;
         cc = 0;
 
-        printf("\"%s\", ", file);
-        fflush_all();
-
         do {
                 cp = memchr(bufPtr, '\n', bufUsed);
 
@@ -793,7 +792,7 @@ static void doCommands(void)
                  * 0  on ctrl-C,
                  * >0 length of input string, including terminating '\n'
                  */
-                len = read_line_input(NULL, ": ", buf, sizeof(buf));
+                len = read_line_input(NULL, prompt, buf, sizeof(buf));
                 if (len <= 0)
                         return;
                 while (len && isspace(buf[--len]))
@@ -1005,13 +1004,15 @@ int ed_main(int argc UNUSED_PARAM, char **argv)
         lines.next = &lines;
         lines.prev = &lines;
 
-        if (argv[1]) {
-                fileName = xstrdup(argv[1]);
+        prompt = ""; /* no prompt by default */
+        getopt32(argv, "p:", &prompt);
+        argv += optind;
+
+        if (argv[0]) {
+                fileName = xstrdup(argv[0]);
                 if (!readLines(fileName, 1)) {
                         return EXIT_SUCCESS;
                 }
-                if (lastNum)
-                        setCurNum(1);
                 dirty = FALSE;
         }
 
diff --git a/editors/sed.c b/editors/sed.c
index 523fb8dba..73034438a 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -441,8 +441,7 @@ static int parse_subst_cmd(sed_cmd_t *sed_cmd, const char *substr)
                 switch (substr[idx]) {
                 /* Replace all occurrences */
                 case 'g':
-                        if (match[0] != '^')
-                                sed_cmd->which_match = 0;
+                        sed_cmd->which_match = 0;
                         break;
                 /* Print pattern space */
                 case 'p':