apply post-1.12.0 fixes, bump version to 1.12.11_12_1

1 files changed, 25 insertions, 23 deletions

diff --git a/editors/vi.c b/editors/vi.c
index 27f2a3abd..02bdbb37b 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -147,10 +147,10 @@ struct globals {
 #endif
 
         smallint editing;        // >0 while we are editing a file
-                                 // [code audit says "can be 0 or 1 only"]
+                                 // [code audit says "can be 0, 1 or 2 only"]
         smallint cmd_mode;       // 0=command  1=insert 2=replace
         int file_modified;       // buffer contents changed (counter, not flag!)
-        int last_file_modified; // = -1;
+        int last_file_modified;  // = -1;
         int fn_start;            // index of first cmd line file name
         int save_argc;           // how many file names on cmd line
         int cmdcnt;              // repetition count
@@ -623,7 +623,7 @@ static void edit_file(char *fn)
                 // These are commands that change text[].
                 // Remember the input for the "." command
                 if (!adding2q && ioq_start == NULL
-                 && strchr(modifying_cmds, c)
+                 && c != '\0' && strchr(modifying_cmds, c)
                 ) {
                         start_new_cmd_q(c);
                 }
@@ -645,8 +645,8 @@ static void edit_file(char *fn)
         }
         //-------------------------------------------------------------------
 
-        place_cursor(rows, 0, FALSE);   // go to bottom of screen
-        clear_to_eol();         // Erase to end of line
+        place_cursor(rows - 1, 0, FALSE); // go to bottom of screen
+        clear_to_eol(); // erase to end of line
         cookmode();
 #undef cur_line
 }
@@ -2009,9 +2009,9 @@ static void start_new_cmd_q(char c)
 {
         // get buffer for new cmd
         // if there is a current cmd count put it in the buffer first
-        if (cmdcnt > 0)
+        if (cmdcnt > 0) {
                 lmc_len = sprintf(last_modifying_cmd, "%d%c", cmdcnt, c);
-        else { // just save char c onto queue
+        } else { // just save char c onto queue
                 last_modifying_cmd[0] = c;
                 lmc_len = 1;
         }
@@ -2157,21 +2157,21 @@ static void winch_sig(int sig UNUSED_PARAM)
 //----- Come here when we get a continue signal -------------------
 static void cont_sig(int sig UNUSED_PARAM)
 {
-        rawmode();                      // terminal to "raw"
-        last_status_cksum = 0;  // force status update
-        redraw(TRUE);           // re-draw the screen
+        rawmode(); // terminal to "raw"
+        last_status_cksum = 0; // force status update
+        redraw(TRUE); // re-draw the screen
 
         signal(SIGTSTP, suspend_sig);
         signal(SIGCONT, SIG_DFL);
-        kill(my_pid, SIGCONT);
+        kill(my_pid, SIGCONT); // huh? why? we are already "continued"...
 }
 
 //----- Come here when we get a Suspend signal -------------------
 static void suspend_sig(int sig UNUSED_PARAM)
 {
-        place_cursor(rows - 1, 0, FALSE);       // go to bottom of screen
-        clear_to_eol();         // Erase to end of line
-        cookmode();                     // terminal to "cooked"
+        place_cursor(rows - 1, 0, FALSE); // go to bottom of screen
+        clear_to_eol(); // erase to end of line
+        cookmode(); // terminal to "cooked"
 
         signal(SIGCONT, cont_sig);
         signal(SIGTSTP, SIG_DFL);
@@ -2247,18 +2247,20 @@ static char readit(void)	// read (maybe cursor) key from stdin
 
         fflush(stdout);
         n = chars_to_parse;
-        // get input from User- are there already input chars in Q?
+        // get input from User - are there already input chars in Q?
         if (n <= 0) {
                 // the Q is empty, wait for a typed char
+ again:
                 n = safe_read(STDIN_FILENO, readbuffer, sizeof(readbuffer));
-                if (n < 0) {
-                        if (errno == EBADF || errno == EFAULT || errno == EINVAL
-                         || errno == EIO)
-                                editing = 0; // want to exit
-                        errno = 0;
-                }
-                if (n <= 0)
-                        return 0;       // error
+                if (n <= 0) {
+                        place_cursor(rows - 1, 0, FALSE); // go to bottom of screen
+                        clear_to_eol(); // erase to end of line
+                        cookmode(); // terminal to "cooked"
+                        bb_error_msg_and_die("can't read user input");
+                }
+                /* elsewhere we can get very confused by NULs */
+                if (readbuffer[0] == '\0')
+                        goto again;
                 if (readbuffer[0] == 27) {
                         // This is an ESC char. Is this Esc sequence?
                         // Could be bare Esc key. See if there are any