4 files changed, 67 insertions, 38 deletions

diff --git a/editors/Config.in b/editors/Config.in
index e4fdd0f38..5f9566f0a 100644
--- a/editors/Config.in
+++ b/editors/Config.in
@@ -168,6 +168,18 @@ config FEATURE_VI_WIN_RESIZE
         help
           Make busybox vi behave nicely with terminals that get resized.
 
+config FEATURE_VI_ASK_TERMINAL
+        bool "Use 'tell me cursor position' ESC sequence to measure window"
+        default n
+        depends on VI
+        help
+          If terminal size can't be retrieved and $LINES/$COLUMNS are not set,
+          this option makes vi perform a last-ditch effort to find it:
+          vi positions cursor to 999,999 and asks terminal to report real
+          cursor position using "ESC [ 6 n" escape sequence, then reads stdin.
+
+          This is not clean but helps a lot on serial lines and such.
+
 config FEATURE_VI_OPTIMIZE_CURSOR
         bool "Optimize cursor movement"
         default y
diff --git a/editors/cmp.c b/editors/cmp.c
index 0cb80f21e..dbfa4be35 100644
--- a/editors/cmp.c
+++ b/editors/cmp.c
@@ -10,17 +10,6 @@
 /* BB_AUDIT SUSv3 (virtually) compliant -- uses nicer GNU format for -l. */
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/cmp.html */
 
-/* Mar 16, 2003      Manuel Novoa III   (mjn3@codepoet.org)
- *
- * Original version majorly reworked for SUSv3 compliance, bug fixes, and
- * size optimizations.  Changes include:
- * 1) Now correctly distinguishes between errors and actual file differences.
- * 2) Proper handling of '-' args.
- * 3) Actual error checking of i/o.
- * 4) Accept SUSv3 -l option.  Note that we use the slightly nicer gnu format
- *    in the '-l' case.
- */
-
 #include "libbb.h"
 
 static const char fmt_eof[] ALIGN1 = "cmp: EOF on %s\n";
@@ -37,8 +26,7 @@ int cmp_main(int argc UNUSED_PARAM, char **argv)
 {
         FILE *fp1, *fp2, *outfile = stdout;
         const char *filename1, *filename2 = "-";
-        IF_DESKTOP(off_t skip1 = 0, skip2 = 0;)
-        off_t char_pos = 0;
+        off_t skip1 = 0, skip2 = 0, char_pos = 0;
         int line_pos = 1; /* Hopefully won't overflow... */
         const char *fmt;
         int c1, c2;
@@ -59,14 +47,12 @@ int cmp_main(int argc UNUSED_PARAM, char **argv)
 
         if (*++argv) {
                 filename2 = *argv;
-#if ENABLE_DESKTOP
-                if (*++argv) {
+                if (ENABLE_DESKTOP && *++argv) {
                         skip1 = XATOOFF(*argv);
                         if (*++argv) {
                                 skip2 = XATOOFF(*argv);
                         }
                 }
-#endif
         }
 
         fp2 = xfopen_stdin(filename2);
@@ -83,10 +69,10 @@ int cmp_main(int argc UNUSED_PARAM, char **argv)
         else
                 fmt = fmt_differ;
 
-#if ENABLE_DESKTOP
-        while (skip1) { getc(fp1); skip1--; }
-        while (skip2) { getc(fp2); skip2--; }
-#endif
+        if (ENABLE_DESKTOP) {
+                while (skip1) { getc(fp1); skip1--; }
+                while (skip2) { getc(fp2); skip2--; }
+        }
         do {
                 c1 = getc(fp1);
                 c2 = getc(fp2);
diff --git a/editors/sed.c b/editors/sed.c
index e5e187725..4bd6e0168 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -487,7 +487,7 @@ static const char *parse_cmd_args(sed_cmd_t *sed_cmd, const char *cmdstr)
 static void add_cmd(const char *cmdstr)
 {
         sed_cmd_t *sed_cmd;
-        int temp;
+        unsigned len, n;
 
         /* Append this line to any unfinished line from last time. */
         if (G.add_cmd_line) {
@@ -496,12 +496,14 @@ static void add_cmd(const char *cmdstr)
                 cmdstr = G.add_cmd_line = tp;
         }
 
-        /* If this line ends with backslash, request next line. */
-        temp = strlen(cmdstr);
-        if (temp && cmdstr[--temp] == '\\') {
+        /* If this line ends with unescaped backslash, request next line. */
+        n = len = strlen(cmdstr);
+        while (n && cmdstr[n-1] == '\\')
+                n--;
+        if ((len - n) & 1) { /* if odd number of trailing backslashes */
                 if (!G.add_cmd_line)
                         G.add_cmd_line = xstrdup(cmdstr);
-                G.add_cmd_line[temp] = '\0';
+                G.add_cmd_line[len-1] = '\0';
                 return;
         }
 
@@ -560,7 +562,7 @@ static void add_cmd(const char *cmdstr)
                 /* last part (mandatory) will be a command */
                 if (!*cmdstr)
                         bb_error_msg_and_die("missing command");
-                sed_cmd->cmd = *(cmdstr++);
+                sed_cmd->cmd = *cmdstr++;
                 cmdstr = parse_cmd_args(sed_cmd, cmdstr);
 
                 /* Add the command to the command array */
@@ -936,7 +938,15 @@ static void process_files(void)
                 /* Skip blocks of commands we didn't match */
                 if (sed_cmd->cmd == '{') {
                         if (sed_cmd->invert ? matched : !matched) {
-                                while (sed_cmd->cmd != '}') {
+                                unsigned nest_cnt = 0;
+                                while (1) {
+                                        if (sed_cmd->cmd == '{')
+                                                nest_cnt++;
+                                        if (sed_cmd->cmd == '}') {
+                                                nest_cnt--;
+                                                if (nest_cnt == 0)
+                                                        break;
+                                        }
                                         sed_cmd = sed_cmd->next;
                                         if (!sed_cmd)
                                                 bb_error_msg_and_die("unterminated {");
@@ -1031,7 +1041,7 @@ static void process_files(void)
                 case 'c':
                         /* Only triggers on last line of a matching range. */
                         if (!sed_cmd->in_match)
-                                sed_puts(sed_cmd->string, NO_EOL_CHAR);
+                                sed_puts(sed_cmd->string, '\n');
                         goto discard_line;
 
                 /* Read file, append contents to output */
diff --git a/editors/vi.c b/editors/vi.c
index 28612508f..d9124fd76 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -60,18 +60,18 @@ enum {
 
 /* vt102 typical ESC sequence */
 /* terminal standout start/normal ESC sequence */
-static const char SOs[] ALIGN1 = "\033[7m";
-static const char SOn[] ALIGN1 = "\033[0m";
+#define SOs "\033[7m"
+#define SOn "\033[0m"
 /* terminal bell sequence */
-static const char bell[] ALIGN1 = "\007";
+#define bell "\007"
 /* Clear-end-of-line and Clear-end-of-screen ESC sequence */
-static const char Ceol[] ALIGN1 = "\033[0K";
-static const char Ceos[] ALIGN1 = "\033[0J";
+#define Ceol "\033[K"
+#define Ceos "\033[J"
 /* Cursor motion arbitrary destination ESC sequence */
-static const char CMrc[] ALIGN1 = "\033[%d;%dH";
+#define CMrc "\033[%u;%uH"
 /* Cursor motion up and down ESC sequence */
-static const char CMup[] ALIGN1 = "\033[A";
-static const char CMdown[] ALIGN1 = "\n";
+#define CMup "\033[A"
+#define CMdown "\n"
 
 #if ENABLE_FEATURE_VI_DOT_CMD || ENABLE_FEATURE_VI_YANKMARK
 // cmds modifying text[]
@@ -138,6 +138,9 @@ struct globals {
         int save_argc;           // how many file names on cmd line
         int cmdcnt;              // repetition count
         unsigned rows, columns;  // the terminal screen is this size
+#if ENABLE_FEATURE_VI_ASK_TERMINAL
+        int get_rowcol_error;
+#endif
         int crow, ccol;          // cursor is on Crow x Ccol
         int offset;              // chars scrolled off the screen to the left
         int have_status_msg;     // is default edit status needed?
@@ -503,7 +506,11 @@ static int init_text_buffer(char *fn)
 #if ENABLE_FEATURE_VI_WIN_RESIZE
 static void query_screen_dimensions(void)
 {
-        get_terminal_width_height(STDIN_FILENO, &columns, &rows);
+# if ENABLE_FEATURE_VI_ASK_TERMINAL
+        if (!G.get_rowcol_error)
+                G.get_rowcol_error =
+# endif
+                        get_terminal_width_height(STDIN_FILENO, &columns, &rows);
         if (rows > MAX_SCR_ROWS)
                 rows = MAX_SCR_ROWS;
         if (columns > MAX_SCR_COLS)
@@ -530,6 +537,20 @@ static void edit_file(char *fn)
         columns = 80;
         size = 0;
         query_screen_dimensions();
+#if ENABLE_FEATURE_VI_ASK_TERMINAL
+        if (G.get_rowcol_error /* TODO? && no input on stdin */) {
+                uint64_t k;
+                write1("\033[999;999H" "\033[6n");
+                fflush_all();
+                k = read_key(STDIN_FILENO, readbuffer, /*timeout_ms:*/ 100);
+                if ((int32_t)k == KEYCODE_CURSOR_POS) {
+                        uint32_t rc = (k >> 32);
+                        columns = (rc & 0x7fff);
+                        rows = ((rc >> 16) & 0x7fff);
+                }
+                query_screen_dimensions();
+        }
+#endif
         new_screen(rows, columns);      // get memory for virtual screen
         init_text_buffer(fn);
 
@@ -2306,7 +2327,7 @@ static int file_size(const char *fn) // what is the byte size of "fn"
         int cnt;
 
         cnt = -1;
-        if (fn && fn[0] && stat(fn, &st_buf) == 0)      // see if file exists
+        if (fn && stat(fn, &st_buf) == 0)       // see if file exists
                 cnt = (int) st_buf.st_size;
         return cnt;
 }