5 files changed, 36 insertions, 12 deletions

diff --git a/editors/cmp.c b/editors/cmp.c
index 6d2b0c6c3..b89e519ad 100644
--- a/editors/cmp.c
+++ b/editors/cmp.c
@@ -54,6 +54,7 @@ int cmp_main(int argc UNUSED_PARAM, char **argv)
         int retval = 0;
         int max_count = -1;
 
+#if !ENABLE_LONG_OPTS
         opt = getopt32(argv, "^"
                         OPT_STR
                         "\0" "-1"
@@ -62,6 +63,23 @@ int cmp_main(int argc UNUSED_PARAM, char **argv)
                         ":l--s:s--l",
                         &max_count
         );
+#else
+        static const char cmp_longopts[] ALIGN1 =
+                "bytes\0"          Required_argument  "n"
+                "quiet\0"          No_argument        "s"
+                "silent\0"         No_argument        "s"
+                "verbose\0"        No_argument        "l"
+                ;
+        opt = getopt32long(argv, "^"
+                        OPT_STR
+                        "\0" "-1"
+                        IF_DESKTOP(":?4")
+                        IF_NOT_DESKTOP(":?2")
+                        ":l--s:s--l",
+                        cmp_longopts,
+                        &max_count
+        );
+#endif
         argv += optind;
 
         filename1 = *argv;
diff --git a/editors/patch.c b/editors/patch.c
index 110176630..aebb5073e 100644
--- a/editors/patch.c
+++ b/editors/patch.c
@@ -418,7 +418,7 @@ int patch_main(int argc UNUSED_PARAM, char **argv)
         }
 
         // Loop through the lines in the patch
-        for(;;) {
+        for (;;) {
                 char *patchline;
 
                 patchline = xmalloc_fgetline(stdin);
diff --git a/editors/patch_toybox.c b/editors/patch_toybox.c
index aebab8132..69a508b2e 100644
--- a/editors/patch_toybox.c
+++ b/editors/patch_toybox.c
@@ -441,7 +441,7 @@ int patch_main(int argc UNUSED_PARAM, char **argv)
         TT.filein = TT.fileout = -1;
 
         // Loop through the lines in the patch
-        for(;;) {
+        for (;;) {
                 char *patchline;
 
                 patchline = get_line(TT.filepatch);
diff --git a/editors/sed.c b/editors/sed.c
index 374830f3f..f4a5f7b8a 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -252,7 +252,6 @@ static void cleanup_outname(void)
 }
 
 /* strcpy, replacing "\from" with 'to'. If to is NUL, replacing "\any" with 'any' */
-
 static unsigned parse_escapes(char *dest, const char *string, int len, char from, char to)
 {
         char *d = dest;
@@ -282,7 +281,7 @@ static unsigned parse_escapes(char *dest, const char *string, int len, char from
         return d - dest;
 }
 
-static char *copy_parsing_escapes(const char *string, int len)
+static char *copy_parsing_escapes(const char *string, int len, char delim)
 {
         const char *s;
         char *dest = xmalloc(len + 1);
@@ -293,10 +292,15 @@ static char *copy_parsing_escapes(const char *string, int len)
                 len = parse_escapes(dest, string, len, s[1], s[0]);
                 string = dest;
         }
+        if (delim) {
+                /* we additionally unescape any instances of escaped delimiter.
+                 * For example, in 's+9\++X+' the pattern is "9+", not "9\+".
+                 */
+                len = parse_escapes(dest, string, len, delim, delim);
+        }
         return dest;
 }
 
-
 /*
  * index_of_next_unescaped_regexp_delim - walks left to right through a string
  * beginning at a specified index and returns the index of the next regular
@@ -353,12 +357,14 @@ static int parse_regex_delim(const char *cmdstr, char **match, char **replace)
 
         /* save the match string */
         idx = index_of_next_unescaped_regexp_delim(delimiter, cmdstr_ptr);
-        *match = copy_parsing_escapes(cmdstr_ptr, idx);
-
+        *match = copy_parsing_escapes(cmdstr_ptr, idx, delimiter);
         /* save the replacement string */
         cmdstr_ptr += idx + 1;
         idx = index_of_next_unescaped_regexp_delim(- (int)delimiter, cmdstr_ptr);
-        *replace = copy_parsing_escapes(cmdstr_ptr, idx);
+//GNU sed 4.8:
+// echo 789 | sed 's&8&\&&'       - 7&9  ("\&" remained "\&")
+// echo 789 | sed 's1\(8\)1\1\11' - 7119 ("\1\1" become "11")
+        *replace = copy_parsing_escapes(cmdstr_ptr, idx, delimiter != '&' ? delimiter : 0);
 
         return ((cmdstr_ptr - cmdstr) + idx);
 }
@@ -386,7 +392,7 @@ static int get_address(const char *my_str, int *linenum, regex_t ** regex)
                         delimiter = *++pos;
                 next = index_of_next_unescaped_regexp_delim(delimiter, ++pos);
                 if (next != 0) {
-                        temp = copy_parsing_escapes(pos, next);
+                        temp = copy_parsing_escapes(pos, next, 0);
                         G.previous_regex_ptr = *regex = xzalloc(sizeof(regex_t));
                         xregcomp(*regex, temp, G.regex_type);
                         free(temp);
@@ -581,7 +587,7 @@ static const char *parse_cmd_args(sed_cmd_t *sed_cmd, const char *cmdstr)
                         cmdstr++;
                 }
                 len = strlen(cmdstr);
-                sed_cmd->string = copy_parsing_escapes(cmdstr, len);
+                sed_cmd->string = copy_parsing_escapes(cmdstr, len, 0);
                 cmdstr += len;
                 /* "\anychar" -> "anychar" */
                 parse_escapes(sed_cmd->string, sed_cmd->string, -1, '\0', '\0');
diff --git a/editors/vi.c b/editors/vi.c
index b973cc056..b30369302 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -1182,7 +1182,7 @@ static int readit(void) // read (maybe cursor) key from stdin
         // on nonblocking stdin.
         // Note: read_key sets errno to 0 on success.
  again:
-        c = read_key(STDIN_FILENO, readbuffer, /*timeout:*/ -1);
+        c = safe_read_key(STDIN_FILENO, readbuffer, /*timeout:*/ -1);
         if (c == -1) { // EOF/error
                 if (errno == EAGAIN) // paranoia
                         goto again;
@@ -4930,7 +4930,7 @@ static void edit_file(char *fn)
                 uint64_t k;
                 write1(ESC"[999;999H" ESC"[6n");
                 fflush_all();
-                k = read_key(STDIN_FILENO, readbuffer, /*timeout_ms:*/ 100);
+                k = safe_read_key(STDIN_FILENO, readbuffer, /*timeout_ms:*/ 100);
                 if ((int32_t)k == KEYCODE_CURSOR_POS) {
                         uint32_t rc = (k >> 32);
                         columns = (rc & 0x7fff);