Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/editors/vi.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/editors/vi.c (modified) (165 diffs)

branches/2.2.9/mindi-busybox/editors/vi.c

@@ -4 +4 @@
  * Copyright (C) 2000, 2001 Sterling Huxley <sterling@europa.com>
  *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
@@ -24 +24 @@
 #include "libbb.h"
 
+/* the CRASHME code is unmaintained, and doesn't currently build */
 #define ENABLE_FEATURE_VI_CRASHME 0
 
+
 #if ENABLE_LOCALE_SUPPORT
-#define Isprint(c) isprint((c))
+
+#if ENABLE_FEATURE_VI_8BIT
+//FIXME: this does not work properly for Unicode anyway
+# define Isprint(c) (isprint)(c)
 #else
+# define Isprint(c) isprint_asciionly(c)
+#endif
+
+#else
+
 /* 0x9b is Meta-ESC */
+#if ENABLE_FEATURE_VI_8BIT
 #define Isprint(c) ((unsigned char)(c) >= ' ' && (c) != 0x7f && (unsigned char)(c) != 0x9b)
-#endif
+#else
+#define Isprint(c) ((unsigned char)(c) >= ' ' && (unsigned char)(c) < 0x7f)
+#endif
+
+#endif
+
 
 enum {
-    MAX_LINELEN = CONFIG_FEATURE_VI_MAX_LEN,
+    MAX_TABSTOP = 32, // sanity limit
+    // User input len. Need not be extra big.
+    // Lines in file being edited *can* be bigger than this.
+    MAX_INPUT_LEN = 128,
+    // Sanity limits. We have only one buffer of this size.
     MAX_SCR_COLS = CONFIG_FEATURE_VI_MAX_LEN,
+    MAX_SCR_ROWS = CONFIG_FEATURE_VI_MAX_LEN,
 };
-
-// Misc. non-Ascii keys that report an escape sequence
-#define VI_K_UP         (char)128   // cursor key Up
-#define VI_K_DOWN       (char)129   // cursor key Down
-#define VI_K_RIGHT      (char)130   // Cursor Key Right
-#define VI_K_LEFT       (char)131   // cursor key Left
-#define VI_K_HOME       (char)132   // Cursor Key Home
-#define VI_K_END        (char)133   // Cursor Key End
-#define VI_K_INSERT     (char)134   // Cursor Key Insert
-#define VI_K_PAGEUP     (char)135   // Cursor Key Page Up
-#define VI_K_PAGEDOWN       (char)136   // Cursor Key Page Down
-#define VI_K_FUN1       (char)137   // Function Key F1
-#define VI_K_FUN2       (char)138   // Function Key F2
-#define VI_K_FUN3       (char)139   // Function Key F3
-#define VI_K_FUN4       (char)140   // Function Key F4
-#define VI_K_FUN5       (char)141   // Function Key F5
-#define VI_K_FUN6       (char)142   // Function Key F6
-#define VI_K_FUN7       (char)143   // Function Key F7
-#define VI_K_FUN8       (char)144   // Function Key F8
-#define VI_K_FUN9       (char)145   // Function Key F9
-#define VI_K_FUN10      (char)146   // Function Key F10
-#define VI_K_FUN11      (char)147   // Function Key F11
-#define VI_K_FUN12      (char)148   // Function Key F12
 
 /* 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[]
+// vda: removed "aAiIs" as they switch us into insert mode
+// and remembering input for replay after them makes no sense
+static const char modifying_cmds[] = "cCdDJoOpPrRxX<>~";
+#endif
 
 enum {
@@ -92 +96 @@
 };
 
+
 /* vi.c expects chars to be unsigned. */
 /* busybox build system provides that, but it's better */
 /* to audit and fix the source */
 
-static smallint vi_setops;
+struct globals {
+    /* many references - keep near the top of globals */
+    char *text, *end;       // pointers to the user data in memory
+    char *dot;              // where all the action takes place
+    int text_size;      // size of the allocated buffer
+
+    /* the rest */
+    smallint vi_setops;
 #define VI_AUTOINDENT 1
 #define VI_SHOWMATCH  2
@@ -107 +119 @@
 #define err_method (vi_setops & VI_ERR_METHOD)
 
-
-static smallint editing;        // >0 while we are editing a file
-                                // [code audit says "can be 0 or 1 only"]
-static smallint cmd_mode;       // 0=command  1=insert 2=replace
-static smallint file_modified;  // buffer contents changed
-static smallint last_file_modified = -1;
-static int fn_start;            // index of first cmd line file name
-static int save_argc;           // how many file names on cmd line
-static int cmdcnt;              // repetition count
-static int rows, columns;       // the terminal screen is this size
-static int crow, ccol, offset;  // cursor is on Crow x Ccol with Horz Ofset
-static char *status_buffer;     // mesages to the user
-#define STATUS_BUFFER_LEN  200
-static int have_status_msg;     // is default edit status needed?
-                                // [don't make smallint!]
-static int last_status_cksum;   // hash of current status line
-static char *current_filename;               // current file name
-//static char *text, *end;        // pointers to the user data in memory
-static char *screen;            // pointer to the virtual screen buffer
-static int screensize;          //            and its size
-static char *screenbegin;       // index into text[], of top line on the screen
-//static char *dot;               // where all the action takes place
-static int tabstop;
-static char erase_char;         // the users erase character
-static char last_input_char;    // last char read from user
-static char last_forward_char;  // last char searched for with 'f'
-
 #if ENABLE_FEATURE_VI_READONLY
-//static smallint vi_readonly, readonly;
-static smallint readonly_mode = 0;
+    smallint readonly_mode;
 #define SET_READONLY_FILE(flags)        ((flags) |= 0x01)
 #define SET_READONLY_MODE(flags)        ((flags) |= 0x02)
 #define UNSET_READONLY_FILE(flags)      ((flags) &= 0xfe)
 #else
-#define readonly_mode 0
-#define SET_READONLY_FILE(flags)
-#define SET_READONLY_MODE(flags)
-#define UNSET_READONLY_FILE(flags)
-#endif
+#define SET_READONLY_FILE(flags)        ((void)0)
+#define SET_READONLY_MODE(flags)        ((void)0)
+#define UNSET_READONLY_FILE(flags)      ((void)0)
+#endif
+
+    smallint editing;        // >0 while we are editing a file
+                             // [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 fn_start;            // index of first cmd line file name
+    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?
+                             // [don't make smallint!]
+    int last_status_cksum;   // hash of current status line
+    char *current_filename;
+    char *screenbegin;       // index into text[], of top line on the screen
+    char *screen;            // pointer to the virtual screen buffer
+    int screensize;          //            and its size
+    int tabstop;
+    int last_forward_char;   // last char searched for with 'f' (int because of Unicode)
+    char erase_char;         // the users erase character
+    char last_input_char;    // last char read from user
 
 #if ENABLE_FEATURE_VI_DOT_CMD
-static smallint adding2q;       // are we currently adding user input to q
-static char *last_modifying_cmd;    // last modifying cmd for "."
-static char *ioq, *ioq_start;           // pointer to string for get_one_char to "read"
+    smallint adding2q;   // are we currently adding user input to q
+    int lmc_len;             // length of last_modifying_cmd
+    char *ioq, *ioq_start;   // pointer to string for get_one_char to "read"
 #endif
 #if ENABLE_FEATURE_VI_OPTIMIZE_CURSOR
-static int last_row;        // where the cursor was last moved to
+    int last_row;        // where the cursor was last moved to
 #endif
 #if ENABLE_FEATURE_VI_USE_SIGNALS || ENABLE_FEATURE_VI_CRASHME
-static int my_pid;
-#endif
-#if ENABLE_FEATURE_VI_DOT_CMD || ENABLE_FEATURE_VI_YANKMARK
-static char *modifying_cmds;            // cmds that modify text[]
+    int my_pid;
 #endif
 #if ENABLE_FEATURE_VI_SEARCH
-static char *last_search_pattern;   // last pattern from a '/' or '?' search
-#endif
-
-/* Moving biggest data to malloced space... */
-struct globals {
-    /* many references - keep near the top of globals */
-    char *text, *end;       // pointers to the user data in memory
-    int text_size;      // size of the allocated buffer
-    char *dot;              // where all the action takes place
+    char *last_search_pattern; // last pattern from a '/' or '?' search
+#endif
+
+    /* former statics */
 #if ENABLE_FEATURE_VI_YANKMARK
+    char *edit_file__cur_line;
+#endif
+    int refresh__old_offset;
+    int format_edit_status__tot;
+
+    /* a few references only */
+#if ENABLE_FEATURE_VI_YANKMARK
+    int YDreg, Ureg;        // default delete register and orig line for "U"
     char *reg[28];          // named register a-z, "D", and "U" 0-25,26,27
-    int YDreg, Ureg;        // default delete register and orig line for "U"
     char *mark[28];         // user marks points somewhere in text[]-  a-z and previous context ''
     char *context_start, *context_end;
 #endif
-    /* a few references only */
 #if ENABLE_FEATURE_VI_USE_SIGNALS
-    jmp_buf restart;        // catch_sig()
-#endif
-    struct termios term_orig, term_vi;  // remember what the cooked mode was
+    sigjmp_buf restart;     // catch_sig()
+#endif
+    struct termios term_orig, term_vi; // remember what the cooked mode was
 #if ENABLE_FEATURE_VI_COLON
     char *initial_cmds[3];  // currently 2 entries, NULL terminated
 #endif
+    // Should be just enough to hold a key sequence,
+    // but CRASHME mode uses it as generated command buffer too
+#if ENABLE_FEATURE_VI_CRASHME
+    char readbuffer[128];
+#else
+    char readbuffer[KEYCODE_BUFFER_SIZE];
+#endif
+#define STATUS_BUFFER_LEN  200
+    char status_buffer[STATUS_BUFFER_LEN]; // messages to the user
+#if ENABLE_FEATURE_VI_DOT_CMD
+    char last_modifying_cmd[MAX_INPUT_LEN]; // last modifying cmd for "."
+#endif
+    char get_input_line__buf[MAX_INPUT_LEN]; /* former static */
+
+    char scr_out_buf[MAX_SCR_COLS + MAX_TABSTOP * 2];
 };
 #define G (*ptr_to_globals)
@@ -192 +214 @@
 #define dot            (G.dot           )
 #define reg            (G.reg           )
+
+#define vi_setops               (G.vi_setops          )
+#define editing                 (G.editing            )
+#define cmd_mode                (G.cmd_mode           )
+#define file_modified           (G.file_modified      )
+#define last_file_modified      (G.last_file_modified )
+#define fn_start                (G.fn_start           )
+#define save_argc               (G.save_argc          )
+#define cmdcnt                  (G.cmdcnt             )
+#define rows                    (G.rows               )
+#define columns                 (G.columns            )
+#define crow                    (G.crow               )
+#define ccol                    (G.ccol               )
+#define offset                  (G.offset             )
+#define status_buffer           (G.status_buffer      )
+#define have_status_msg         (G.have_status_msg    )
+#define last_status_cksum       (G.last_status_cksum  )
+#define current_filename        (G.current_filename   )
+#define screen                  (G.screen             )
+#define screensize              (G.screensize         )
+#define screenbegin             (G.screenbegin        )
+#define tabstop                 (G.tabstop            )
+#define last_forward_char       (G.last_forward_char  )
+#define erase_char              (G.erase_char         )
+#define last_input_char         (G.last_input_char    )
+#if ENABLE_FEATURE_VI_READONLY
+#define readonly_mode           (G.readonly_mode      )
+#else
+#define readonly_mode           0
+#endif
+#define adding2q                (G.adding2q           )
+#define lmc_len                 (G.lmc_len            )
+#define ioq                     (G.ioq                )
+#define ioq_start               (G.ioq_start          )
+#define last_row                (G.last_row           )
+#define my_pid                  (G.my_pid             )
+#define last_search_pattern     (G.last_search_pattern)
+
+#define edit_file__cur_line     (G.edit_file__cur_line)
+#define refresh__old_offset     (G.refresh__old_offset)
+#define format_edit_status__tot (G.format_edit_status__tot)
+
 #define YDreg          (G.YDreg         )
 #define Ureg           (G.Ureg          )
@@ -201 +265 @@
 #define term_vi        (G.term_vi       )
 #define initial_cmds   (G.initial_cmds  )
+#define readbuffer     (G.readbuffer    )
+#define scr_out_buf    (G.scr_out_buf   )
+#define last_modifying_cmd  (G.last_modifying_cmd )
+#define get_input_line__buf (G.get_input_line__buf)
+
+#define INIT_G() do { \
+    SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
+    last_file_modified = -1; \
+    /* "" but has space for 2 chars: */ \
+    IF_FEATURE_VI_SEARCH(last_search_pattern = xzalloc(2);) \
+} while (0)
+
 
 static int init_text_buffer(char *); // init from file or create new
 static void edit_file(char *);  // edit one file
-static void do_cmd(char);   // execute a command
+static void do_cmd(int);    // execute a command
 static int next_tabstop(int);
 static void sync_cursor(char *, int *, int *);  // synchronize the screen cursor to dot
@@ -227 +303 @@
 static char *new_screen(int, int);  // malloc virtual screen memory
 static char *char_insert(char *, char); // insert the char c at 'p'
-static char *stupid_insert(char *, char);   // stupidly insert the char c at 'p'
-static char find_range(char **, char **, char); // return pointers for an object
+// might reallocate text[]! use p += stupid_insert(p, ...),
+// and be careful to not use pointers into potentially freed text[]!
+static uintptr_t stupid_insert(char *, char);   // stupidly insert the char c at 'p'
+static int find_range(char **, char **, char);  // return pointers for an object
 static int st_test(char *, int, int, char *);   // helper for skip_thing()
 static char *skip_thing(char *, int, int, int); // skip some object
 static char *find_pair(char *, char);   // find matching pair ()  []  {}
 static char *text_hole_delete(char *, char *);  // at "p", delete a 'size' byte hole
-static char *text_hole_make(char *, int);   // at "p", make a 'size' byte hole
+// might reallocate text[]! use p += text_hole_make(p, ...),
+// and be careful to not use pointers into potentially freed text[]!
+static uintptr_t text_hole_make(char *, int);   // at "p", make a 'size' byte hole
 static char *yank_delete(char *, char *, int, int); // yank text[] into register then delete
 static void show_help(void);    // display some help info
 static void rawmode(void);  // set "raw" mode on tty
 static void cookmode(void); // return to "cooked" mode on tty
-static int mysleep(int);    // sleep for 'h' 1/100 seconds
-static char readit(void);   // read (maybe cursor) key from stdin
-static char get_one_char(void); // read 1 char from stdin
+// sleep for 'h' 1/100 seconds, return 1/0 if stdin is (ready for read)/(not ready)
+static int mysleep(int);
+static int readit(void);    // read (maybe cursor) key from stdin
+static int get_one_char(void);  // read 1 char from stdin
 static int file_size(const char *);   // what is the byte size of "fn"
-#if ENABLE_FEATURE_VI_READONLY
+#if !ENABLE_FEATURE_VI_READONLY
+#define file_insert(fn, p, update_ro_status) file_insert(fn, p)
+#endif
+// file_insert might reallocate text[]!
 static int file_insert(const char *, char *, int);
-#else
-static int file_insert(const char *, char *);
-#endif
 static int file_write(char *, char *, char *);
+#if !ENABLE_FEATURE_VI_OPTIMIZE_CURSOR
+#define place_cursor(a, b, optimize) place_cursor(a, b)
+#endif
 static void place_cursor(int, int, int);
 static void screen_erase(void);
 static void clear_to_eol(void);
 static void clear_to_eos(void);
+static void go_bottom_and_clear_to_eol(void);
 static void standout_start(void);   // send "start reverse video" sequence
 static void standout_end(void); // send "end reverse video" sequence
 static void flash(int);     // flash the terminal screen
 static void show_status_line(void); // put a message on the bottom line
-static void psb(const char *, ...);     // Print Status Buf
-static void psbs(const char *, ...);    // Print Status Buf in standout mode
-static void ni(const char *);       // display messages
+static void status_line(const char *, ...);     // print to status buf
+static void status_line_bold(const char *, ...);
+static void not_implemented(const char *); // display "Not implemented" message
 static int format_edit_status(void);    // format file status on status line
 static void redraw(int);    // force a full screen refresh
-static void format_line(char*, char*, int);
+static char* format_line(char* /*, int*/);
 static void refresh(int);   // update the terminal from screen[]
 
@@ -292 +377 @@
 #endif
 #if ENABLE_FEATURE_VI_YANKMARK || (ENABLE_FEATURE_VI_COLON && ENABLE_FEATURE_VI_SEARCH) || ENABLE_FEATURE_VI_CRASHME
-static char *string_insert(char *, char *); // insert the string at 'p'
+// might reallocate text[]! use p += string_insert(p, ...),
+// and be careful to not use pointers into potentially freed text[]!
+static uintptr_t string_insert(char *, const char *);   // insert the string at 'p'
 #endif
 #if ENABLE_FEATURE_VI_YANKMARK
@@ -311 +398 @@
 }
 
-int vi_main(int argc, char **argv);
+int vi_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int vi_main(int argc, char **argv)
 {
     int c;
-    RESERVE_CONFIG_BUFFER(STATUS_BUFFER, STATUS_BUFFER_LEN);
+
+    INIT_G();
 
 #if ENABLE_FEATURE_VI_USE_SIGNALS || ENABLE_FEATURE_VI_CRASHME
     my_pid = getpid();
 #endif
-
-    PTR_TO_GLOBALS = xzalloc(sizeof(G));
-
 #if ENABLE_FEATURE_VI_CRASHME
     srand((long) my_pid);
 #endif
-
-    status_buffer = STATUS_BUFFER;
-    last_status_cksum = 0;
-    text = NULL;
-
 #ifdef NO_SUCH_APPLET_YET
     /* If we aren't "vi", we are "view" */
@@ -338 +418 @@
 #endif
 
-    vi_setops = VI_AUTOINDENT | VI_SHOWMATCH | VI_IGNORECASE | VI_ERR_METHOD;
-#if ENABLE_FEATURE_VI_YANKMARK
-    memset(reg, 0, sizeof(reg)); // init the yank regs
-#endif
-#if ENABLE_FEATURE_VI_DOT_CMD || ENABLE_FEATURE_VI_YANKMARK
-    modifying_cmds = (char *) "aAcCdDiIJoOpPrRsxX<>~";  // cmds modifying text[]
-#endif
-
+    vi_setops = VI_AUTOINDENT | VI_SHOWMATCH | VI_IGNORECASE;
     //  1-  process $HOME/.exrc file (not inplemented yet)
     //  2-  process EXINIT variable from environment
@@ -353 +426 @@
         char *p = getenv("EXINIT");
         if (p && *p)
-            initial_cmds[0] = xstrdup(p);
-    }
-#endif
-    while ((c = getopt(argc, argv, "hCR" USE_FEATURE_VI_COLON("c:"))) != -1) {
+            initial_cmds[0] = xstrndup(p, MAX_INPUT_LEN);
+    }
+#endif
+    while ((c = getopt(argc, argv, "hCRH" IF_FEATURE_VI_COLON("c:"))) != -1) {
         switch (c) {
 #if ENABLE_FEATURE_VI_CRASHME
@@ -368 +441 @@
             break;
 #endif
-            //case 'r': // recover flag-  ignore- we don't use tmp file
-            //case 'x': // encryption flag- ignore
-            //case 'c': // execute command first
 #if ENABLE_FEATURE_VI_COLON
         case 'c':       // cmd line vi command
             if (*optarg)
-                initial_cmds[initial_cmds[0] != 0] = xstrdup(optarg);
+                initial_cmds[initial_cmds[0] != 0] = xstrndup(optarg, MAX_INPUT_LEN);
             break;
-            //case 'h': // help -- just use default
-#endif
+#endif
+        case 'H':
+            show_help();
+            /* fall through */
         default:
-            show_help();
+            bb_show_usage();
             return 1;
         }
@@ -390 +462 @@
 
     //----- This is the main file handling loop --------------
-    if (optind >= argc) {
-        edit_file(0);
-    } else {
-        for (; optind < argc; optind++) {
-            edit_file(argv[optind]);
-        }
+    while (1) {
+        edit_file(argv[optind]); /* param might be NULL */
+        if (++optind >= argc)
+            break;
     }
     //-----------------------------------------------------------
@@ -411 +481 @@
     /* allocate/reallocate text buffer */
     free(text);
-    text_size = size * 2;
-    if (text_size < 10240)
-        text_size = 10240;  // have a minimum size for new files
+    text_size = size + 10240;
     screenbegin = dot = end = text = xzalloc(text_size);
 
@@ -425 +493 @@
         rc = 0;
     } else {
-        rc = file_insert(fn, text
-            USE_FEATURE_VI_READONLY(, 1));
+        rc = file_insert(fn, text, 1);
     }
     file_modified = 0;
@@ -437 +504 @@
 }
 
-static void edit_file(char * fn)
-{
-    char c;
+#if ENABLE_FEATURE_VI_WIN_RESIZE
+static int query_screen_dimensions(void)
+{
+    int err = get_terminal_width_height(STDIN_FILENO, &columns, &rows);
+    if (rows > MAX_SCR_ROWS)
+        rows = MAX_SCR_ROWS;
+    if (columns > MAX_SCR_COLS)
+        columns = MAX_SCR_COLS;
+    return err;
+}
+#else
+# define query_screen_dimensions() (0)
+#endif
+
+static void edit_file(char *fn)
+{
+#if ENABLE_FEATURE_VI_YANKMARK
+#define cur_line edit_file__cur_line
+#endif
+    int c;
     int size;
-
 #if ENABLE_FEATURE_VI_USE_SIGNALS
     int sig;
 #endif
-#if ENABLE_FEATURE_VI_YANKMARK
-    static char *cur_line;
-#endif
-
-    editing = 1;    // 0= exit,  1= one file, 2= multiple files
+
+    editing = 1;    // 0 = exit, 1 = one file, 2 = multiple files
     rawmode();
     rows = 24;
     columns = 80;
     size = 0;
-    if (ENABLE_FEATURE_VI_WIN_RESIZE)
-        get_terminal_width_height(0, &columns, &rows);
+    IF_FEATURE_VI_ASK_TERMINAL(G.get_rowcol_error =) 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);
+            if (columns > MAX_SCR_COLS)
+                columns = MAX_SCR_COLS;
+            rows = ((rc >> 16) & 0x7fff);
+            if (rows > MAX_SCR_ROWS)
+                rows = MAX_SCR_ROWS;
+        }
+    }
+#endif
     new_screen(rows, columns);  // get memory for virtual screen
     init_text_buffer(fn);
@@ -470 +566 @@
 
 #if ENABLE_FEATURE_VI_USE_SIGNALS
-    catch_sig(0);
+    signal(SIGINT, catch_sig);
     signal(SIGWINCH, winch_sig);
     signal(SIGTSTP, suspend_sig);
-    sig = setjmp(restart);
+    sig = sigsetjmp(restart, 1);
     if (sig != 0) {
         screenbegin = dot = text;
@@ -485 +581 @@
     c = '\0';
 #if ENABLE_FEATURE_VI_DOT_CMD
-    free(last_modifying_cmd);
     free(ioq_start);
-    ioq = ioq_start = last_modifying_cmd = NULL;
+    ioq = ioq_start = NULL;
+    lmc_len = 0;
     adding2q = 0;
 #endif
-    redraw(FALSE);          // dont force every col re-draw
 
 #if ENABLE_FEATURE_VI_COLON
@@ -497 +592 @@
         int n = 0;
 
-        while ((p = initial_cmds[n])) {
+        while ((p = initial_cmds[n]) != NULL) {
             do {
                 q = p;
-                p = strchr(q,'\n');
+                p = strchr(q, '\n');
                 if (p)
                     while (*p == '\n')
@@ -513 +608 @@
     }
 #endif
+    redraw(FALSE);          // dont force every col re-draw
     //------This is the main Vi cmd handling loop -----------------------
     while (editing > 0) {
@@ -521 +617 @@
             } else {
                 crashme = 0;
-                dot = string_insert(text, "\n\n#####  Ran out of text to work on.  #####\n\n"); // insert the string
+                string_insert(text, "\n\n#####  Ran out of text to work on.  #####\n\n"); // insert the string
+                dot = text;
                 refresh(FALSE);
             }
@@ -537 +634 @@
         // These are commands that change text[].
         // Remember the input for the "." command
-        if (!adding2q && ioq_start == 0
+        if (!adding2q && ioq_start == NULL
+         && cmd_mode == 0 // command mode
+         && c > '\0' // exclude NUL and non-ASCII chars
+         && c < 0x7f // (Unicode and such)
          && strchr(modifying_cmds, c)
         ) {
@@ -544 +644 @@
 #endif
         do_cmd(c);      // execute the user command
-        //
+
         // poll to see if there is input already waiting. if we are
         // not able to display output fast enough to keep up, skip
         // the display update until we catch up with input.
-        if (mysleep(0) == 0) {
-            // no input pending- so update output
+        if (!readbuffer[0] && mysleep(0) == 0) {
+            // no input pending - so update output
             refresh(FALSE);
             show_status_line();
@@ -560 +660 @@
     //-------------------------------------------------------------------
 
-    place_cursor(rows, 0, FALSE);   // go to bottom of screen
-    clear_to_eol();     // Erase to end of line
+    go_bottom_and_clear_to_eol();
     cookmode();
+#undef cur_line
 }
 
 //----- The Colon commands -------------------------------------
 #if ENABLE_FEATURE_VI_COLON
-static char *get_one_address(char * p, int *addr)   // get colon addr, if present
+static char *get_one_address(char *p, int *addr)    // get colon addr, if present
 {
     int st;
     char *q;
-
-#if ENABLE_FEATURE_VI_YANKMARK
-    char c;
-#endif
-#if ENABLE_FEATURE_VI_SEARCH
-    char *pat, buf[MAX_LINELEN];
-#endif
+    IF_FEATURE_VI_YANKMARK(char c;)
+    IF_FEATURE_VI_SEARCH(char *pat;)
 
     *addr = -1;         // assume no addr
@@ -584 +679 @@
         q = begin_line(dot);
         *addr = count_lines(text, q);
+    }
 #if ENABLE_FEATURE_VI_YANKMARK
-    } else if (*p == '\'') {    // is this a mark addr
+    else if (*p == '\'') {  // is this a mark addr
         p++;
         c = tolower(*p);
@@ -594 +690 @@
             q = mark[(unsigned char) c];
             if (q != NULL) {    // is mark valid
-                *addr = count_lines(text, q);   // count lines
+                *addr = count_lines(text, q);
             }
         }
+    }
 #endif
 #if ENABLE_FEATURE_VI_SEARCH
-    } else if (*p == '/') { // a search pattern
-        q = buf;
-        for (p++; *p; p++) {
-            if (*p == '/')
-                break;
-            *q++ = *p;
-            *q = '\0';
-        }
-        pat = xstrdup(buf); // save copy of pattern
+    else if (*p == '/') {   // a search pattern
+        q = strchrnul(++p, '/');
+        pat = xstrndup(p, q - p); // save copy of pattern
+        p = q;
         if (*p == '/')
             p++;
@@ -615 +707 @@
         }
         free(pat);
-#endif
-    } else if (*p == '$') { // the last line in file
+    }
+#endif
+    else if (*p == '$') {   // the last line in file
         p++;
         q = begin_line(end - 1);
@@ -623 +716 @@
         sscanf(p, "%d%n", addr, &st);
         p += st;
-    } else {            // I don't reconise this
-        // unrecognised address- assume -1
+    } else {
+        // unrecognized address - assume -1
         *addr = -1;
     }
@@ -665 +758 @@
     int l = strlen(opname) - 1; /* opname have + ' ' */
 
+    // maybe strncmp? we had tons of erroneous strncasecmp's...
     if (strncasecmp(a, opname, l) == 0
      || strncasecmp(a, short_opname, 2) == 0
@@ -676 +770 @@
 #endif
 
-static void colon(char * buf)
+// buf must be no longer than MAX_INPUT_LEN!
+static void colon(char *buf)
 {
     char c, *orig_buf, *buf1, *q, *r;
-    char *fn, cmd[MAX_LINELEN], args[MAX_LINELEN];
+    char *fn, cmd[MAX_INPUT_LEN], args[MAX_INPUT_LEN];
     int i, l, li, ch, b, e;
-    int useforce = FALSE, forced = FALSE;
+    int useforce, forced = FALSE;
 
     // :3154    // if (-e line 3154) goto it  else stay put
@@ -699 +794 @@
 
     if (!buf[0])
-        goto vc1;
+        goto ret;
     if (*buf == ':')
         buf++;          // move past the ':'
@@ -708 +803 @@
     r = end - 1;
     li = count_lines(text, end - 1);
-    fn = current_filename;          // default to current file
-    memset(cmd, '\0', MAX_LINELEN); // clear cmd[]
-    memset(args, '\0', MAX_LINELEN);    // clear args[]
+    fn = current_filename;
 
     // look for optional address(es)  :.  :1  :1,9   :'q,'a   :%
@@ -725 +818 @@
         *buf1++ = *buf++;
     }
+    *buf1 = '\0';
     // get any ARGuments
     while (isblank(*buf))
         buf++;
     strcpy(args, buf);
+    useforce = FALSE;
     buf1 = last_char_is(cmd, '!');
     if (buf1) {
@@ -759 +854 @@
     }
 #if ENABLE_FEATURE_ALLOW_EXEC
-    else if (strncmp(cmd, "!", 1) == 0) {   // run a cmd
+    else if (cmd[0] == '!') {   // run a cmd
         int retcode;
         // :!ls   run the <cmd>
-        alarm(0);       // wait for input- no alarms
-        place_cursor(rows - 1, 0, FALSE);   // go to Status line
-        clear_to_eol();         // clear the line
+        go_bottom_and_clear_to_eol();
         cookmode();
         retcode = system(orig_buf + 1); // run the cmd
@@ -771 +864 @@
         rawmode();
         Hit_Return();           // let user see results
-        alarm(3);       // done waiting for input
-    }
-#endif
-    else if (strncmp(cmd, "=", i) == 0) {   // where is the address
+    }
+#endif
+    else if (cmd[0] == '=' && !cmd[1]) {    // where is the address
         if (b < 0) {    // no addr given- use defaults
             b = e = count_lines(text, dot);
         }
-        psb("%d", b);
-    } else if (strncasecmp(cmd, "delete", i) == 0) {    // delete lines
+        status_line("%d", b);
+    } else if (strncmp(cmd, "delete", i) == 0) {    // delete lines
         if (b < 0) {    // no addr given- use defaults
             q = begin_line(dot);    // assume .,. for the range
@@ -786 +878 @@
         dot = yank_delete(q, r, 1, YANKDEL);    // save, then delete lines
         dot_skip_over_ws();
-    } else if (strncasecmp(cmd, "edit", i) == 0) {  // Edit a file
+    } else if (strncmp(cmd, "edit", i) == 0) {  // Edit a file
         // don't edit, if the current file has been modified
-        if (file_modified && ! useforce) {
-            psbs("No write since last change (:edit! overrides)");
-            goto vc1;
+        if (file_modified && !useforce) {
+            status_line_bold("No write since last change (:edit! overrides)");
+            goto ret;
         }
         if (args[0]) {
@@ -800 +892 @@
         } else {
             // no user file name, no current name- punt
-            psbs("No current filename");
-            goto vc1;
+            status_line_bold("No current filename");
+            goto ret;
         }
 
         if (init_text_buffer(fn) < 0)
-            goto vc1;
+            goto ret;
 
 #if ENABLE_FEATURE_VI_YANKMARK
@@ -819 +911 @@
         // how many lines in text[]?
         li = count_lines(text, end - 1);
-        psb("\"%s\"%s"
-            USE_FEATURE_VI_READONLY("%s")
+        status_line("\"%s\"%s"
+            IF_FEATURE_VI_READONLY("%s")
             " %dL, %dC", current_filename,
             (file_size(fn) < 0 ? " [New file]" : ""),
-            USE_FEATURE_VI_READONLY(
+            IF_FEATURE_VI_READONLY(
                 ((readonly_mode) ? " [Readonly]" : ""),
             )
             li, ch);
-    } else if (strncasecmp(cmd, "file", i) == 0) {  // what File is this
+    } else if (strncmp(cmd, "file", i) == 0) {  // what File is this
         if (b != -1 || e != -1) {
-            ni("No address allowed on this command");
-            goto vc1;
+            status_line_bold("No address allowed on this command");
+            goto ret;
         }
         if (args[0]) {
@@ -840 +932 @@
             last_status_cksum = 0;  // force status update
         }
-    } else if (strncasecmp(cmd, "features", i) == 0) {  // what features are available
+    } else if (strncmp(cmd, "features", i) == 0) {  // what features are available
         // print out values of all features
-        place_cursor(rows - 1, 0, FALSE);   // go to Status line, bottom of screen
-        clear_to_eol(); // clear the line
+        go_bottom_and_clear_to_eol();
         cookmode();
         show_help();
         rawmode();
         Hit_Return();
-    } else if (strncasecmp(cmd, "list", i) == 0) {  // literal print line
+    } else if (strncmp(cmd, "list", i) == 0) {  // literal print line
         if (b < 0) {    // no addr given- use defaults
             q = begin_line(dot);    // assume .,. for the range
             r = end_line(dot);
         }
-        place_cursor(rows - 1, 0, FALSE);   // go to Status line, bottom of screen
-        clear_to_eol(); // clear the line
+        go_bottom_and_clear_to_eol();
         puts("\r");
         for (; q <= r; q++) {
@@ -864 +954 @@
                 c = '.';
                 standout_start();
-                }
+            }
             if (c == '\n') {
                 write1("$\r");
             } else if (c < ' ' || c == 127) {
-                putchar('^');
+                bb_putchar('^');
                 if (c == 127)
                     c = '?';
@@ -874 +964 @@
                     c += '@';
             }
-            putchar(c);
+            bb_putchar(c);
             if (c_is_no_print)
                 standout_end();
         }
-#if ENABLE_FEATURE_VI_SET
- vc2:
-#endif
         Hit_Return();
-    } else if (strncasecmp(cmd, "quit", i) == 0 // Quit
-            || strncasecmp(cmd, "next", i) == 0 // edit next file
+    } else if (strncmp(cmd, "quit", i) == 0 // quit
+            || strncmp(cmd, "next", i) == 0 // edit next file
     ) {
+        int n;
         if (useforce) {
             // force end of argv list
@@ -891 +979 @@
             }
             editing = 0;
-            goto vc1;
+            goto ret;
         }
         // don't exit if the file been modified
         if (file_modified) {
-            psbs("No write since last change (:%s! overrides)",
+            status_line_bold("No write since last change (:%s! overrides)",
                  (*cmd == 'q' ? "quit" : "next"));
-            goto vc1;
+            goto ret;
         }
         // are there other file to edit
-        if (*cmd == 'q' && optind < save_argc - 1) {
-            psbs("%d more file to edit", (save_argc - optind - 1));
-            goto vc1;
-        }
-        if (*cmd == 'n' && optind >= save_argc - 1) {
-            psbs("No more files to edit");
-            goto vc1;
+        n = save_argc - optind - 1;
+        if (*cmd == 'q' && n > 0) {
+            status_line_bold("%d more file(s) to edit", n);
+            goto ret;
+        }
+        if (*cmd == 'n' && n <= 0) {
+            status_line_bold("No more files to edit");
+            goto ret;
         }
         editing = 0;
-    } else if (strncasecmp(cmd, "read", i) == 0) {  // read file into text[]
+    } else if (strncmp(cmd, "read", i) == 0) {  // read file into text[]
         fn = args;
         if (!fn[0]) {
-            psbs("No filename given");
-            goto vc1;
+            status_line_bold("No filename given");
+            goto ret;
         }
         if (b < 0) {    // no addr given- use defaults
@@ -921 +1010 @@
         if (b != 0)
             q = next_line(q);
-        ch = file_insert(fn, q  USE_FEATURE_VI_READONLY(, 0));
+        { // dance around potentially-reallocated text[]
+            uintptr_t ofs = q - text;
+            ch = file_insert(fn, q, 0);
+            q = text + ofs;
+        }
         if (ch < 0)
-            goto vc1;   // nothing was inserted
+            goto ret;   // nothing was inserted
         // how many lines in text[]?
         li = count_lines(q, q + ch - 1);
-        psb("\"%s\""
-            USE_FEATURE_VI_READONLY("%s")
+        status_line("\"%s\""
+            IF_FEATURE_VI_READONLY("%s")
             " %dL, %dC", fn,
-            USE_FEATURE_VI_READONLY((readonly_mode ? " [Readonly]" : ""),)
+            IF_FEATURE_VI_READONLY((readonly_mode ? " [Readonly]" : ""),)
             li, ch);
         if (ch > 0) {
@@ -935 +1028 @@
             if (q <= dot)
                 dot += ch;
-            file_modified++;
-        }
-    } else if (strncasecmp(cmd, "rewind", i) == 0) {    // rewind cmd line args
-        if (file_modified && ! useforce) {
-            psbs("No write since last change (:rewind! overrides)");
+            /*file_modified++; - done by file_insert */
+        }
+    } else if (strncmp(cmd, "rewind", i) == 0) {    // rewind cmd line args
+        if (file_modified && !useforce) {
+            status_line_bold("No write since last change (:rewind! overrides)");
         } else {
             // reset the filenames to edit
@@ -946 +1039 @@
         }
 #if ENABLE_FEATURE_VI_SET
-    } else if (strncasecmp(cmd, "set", i) == 0) {   // set or clear features
+    } else if (strncmp(cmd, "set", i) == 0) {   // set or clear features
 #if ENABLE_FEATURE_VI_SETOPTS
         char *argp;
@@ -954 +1047 @@
         if (!args[0] || strcasecmp(args, "all") == 0) {
             // print out values of all options
-            place_cursor(rows - 1, 0, FALSE);   // go to Status line, bottom of screen
-            clear_to_eol(); // clear the line
-            printf("----------------------------------------\r\n");
 #if ENABLE_FEATURE_VI_SETOPTS
-            if (!autoindent)
-                printf("no");
-            printf("autoindent ");
-            if (!err_method)
-                printf("no");
-            printf("flash ");
-            if (!ignorecase)
-                printf("no");
-            printf("ignorecase ");
-            if (!showmatch)
-                printf("no");
-            printf("showmatch ");
-            printf("tabstop=%d ", tabstop);
-#endif
-            printf("\r\n");
-            goto vc2;
+            status_line_bold(
+                "%sautoindent "
+                "%sflash "
+                "%signorecase "
+                "%sshowmatch "
+                "tabstop=%u",
+                autoindent ? "" : "no",
+                err_method ? "" : "no",
+                ignorecase ? "" : "no",
+                showmatch ? "" : "no",
+                tabstop
+            );
+#endif
+            goto ret;
         }
 #if ENABLE_FEATURE_VI_SETOPTS
         argp = args;
         while (*argp) {
-            if (strncasecmp(argp, "no", 2) == 0)
+            if (strncmp(argp, "no", 2) == 0)
                 i = 2;      // ":set noautoindent"
             setops(argp, "autoindent ", i, "ai", VI_AUTOINDENT);
-            setops(argp, "flash ", i, "fl", VI_ERR_METHOD);
+            setops(argp, "flash "     , i, "fl", VI_ERR_METHOD);
             setops(argp, "ignorecase ", i, "ic", VI_IGNORECASE);
-            setops(argp, "showmatch ", i, "ic", VI_SHOWMATCH);
-            /* tabstopXXXX */
-            if (strncasecmp(argp + i, "tabstop=%d ", 7) == 0) {
-                sscanf(strchr(argp + i, '='), "tabstop=%d" + 7, &ch);
-                if (ch > 0 && ch < columns - 1)
-                    tabstop = ch;
+            setops(argp, "showmatch " , i, "sm", VI_SHOWMATCH );
+            if (strncmp(argp + i, "tabstop=", 8) == 0) {
+                int t = 0;
+                sscanf(argp + i+8, "%u", &t);
+                if (t > 0 && t <= MAX_TABSTOP)
+                    tabstop = t;
             }
-            while (*argp && *argp != ' ')
-                argp++; // skip to arg delimiter (i.e. blank)
-            while (*argp && *argp == ' ')
-                argp++; // skip all delimiting blanks
+            argp = skip_non_whitespace(argp);
+            argp = skip_whitespace(argp);
         }
 #endif /* FEATURE_VI_SETOPTS */
 #endif /* FEATURE_VI_SET */
 #if ENABLE_FEATURE_VI_SEARCH
-    } else if (strncasecmp(cmd, "s", 1) == 0) { // substitute a pattern with a replacement pattern
+    } else if (cmd[0] == 's') { // substitute a pattern with a replacement pattern
         char *ls, *F, *R;
         int gflag;
@@ -1009 +1095 @@
         F = orig_buf + 2;   // start of "find"
         R = strchr(F, c);   // middle delimiter
-        if (!R) goto colon_s_fail;
+        if (!R)
+            goto colon_s_fail;
         *R++ = '\0';    // terminate "find"
         buf1 = strchr(R, c);
-        if (!buf1) goto colon_s_fail;
+        if (!buf1)
+            goto colon_s_fail;
         *buf1++ = '\0'; // terminate "replace"
         if (*buf1 == 'g') { // :s/foo/bar/g
@@ -1030 +1118 @@
             buf1 = char_search(q, F, FORWARD, LIMITED); // search cur line only for "find"
             if (buf1) {
+                uintptr_t bias;
                 // we found the "find" pattern - delete it
                 text_hole_delete(buf1, buf1 + strlen(F) - 1);
                 // inset the "replace" patern
-                string_insert(buf1, R); // insert the string
+                bias = string_insert(buf1, R);  // insert the string
+                buf1 += bias;
+                ls += bias;
+                /*q += bias; - recalculated anyway */
                 // check for "global"  :s/foo/bar/g
                 if (gflag == 1) {
@@ -1045 +1137 @@
         }
 #endif /* FEATURE_VI_SEARCH */
-    } else if (strncasecmp(cmd, "version", i) == 0) {  // show software version
-        psb("%s", BB_VER " " BB_BT);
-    } else if (strncasecmp(cmd, "write", i) == 0  // write text to file
-            || strncasecmp(cmd, "wq", i) == 0
-            || strncasecmp(cmd, "wn", i) == 0
-            || strncasecmp(cmd, "x", i) == 0
+    } else if (strncmp(cmd, "version", i) == 0) {  // show software version
+        status_line(BB_VER " " BB_BT);
+    } else if (strncmp(cmd, "write", i) == 0  // write text to file
+            || strncmp(cmd, "wq", i) == 0
+            || strncmp(cmd, "wn", i) == 0
+            || (cmd[0] == 'x' && !cmd[1])
     ) {
         // is there a file name to write to?
@@ -1058 +1150 @@
 #if ENABLE_FEATURE_VI_READONLY
         if (readonly_mode && !useforce) {
-            psbs("\"%s\" File is read only", fn);
-            goto vc3;
+            status_line_bold("\"%s\" File is read only", fn);
+            goto ret;
         }
 #endif
@@ -1081 +1173 @@
         if (l < 0) {
             if (l == -1)
-                psbs("\"%s\" %s", fn, strerror(errno));
+                status_line_bold("\"%s\" %s", fn, strerror(errno));
         } else {
-            psb("\"%s\" %dL, %dC", fn, li, l);
+            status_line("\"%s\" %dL, %dC", fn, li, l);
             if (q == text && r == end - 1 && l == ch) {
                 file_modified = 0;
                 last_file_modified = -1;
             }
-            if ((cmd[0] == 'x' || cmd[1] == 'q' || cmd[1] == 'n' ||
-                 cmd[0] == 'X' || cmd[1] == 'Q' || cmd[1] == 'N')
-                 && l == ch) {
+            if ((cmd[0] == 'x' || cmd[1] == 'q' || cmd[1] == 'n'
+                || cmd[0] == 'X' || cmd[1] == 'Q' || cmd[1] == 'N'
+                )
+             && l == ch
+            ) {
                 editing = 0;
             }
         }
-#if ENABLE_FEATURE_VI_READONLY
- vc3:;
-#endif
 #if ENABLE_FEATURE_VI_YANKMARK
-    } else if (strncasecmp(cmd, "yank", i) == 0) {  // yank lines
+    } else if (strncmp(cmd, "yank", i) == 0) {  // yank lines
         if (b < 0) {    // no addr given- use defaults
             q = begin_line(dot);    // assume .,. for the range
@@ -1105 +1196 @@
         text_yank(q, r, YDreg);
         li = count_lines(q, r);
-        psb("Yank %d lines (%d chars) into [%c]",
+        status_line("Yank %d lines (%d chars) into [%c]",
                 li, strlen(reg[YDreg]), what_reg());
 #endif
     } else {
         // cmd unknown
-        ni(cmd);
-    }
- vc1:
+        not_implemented(cmd);
+    }
+ ret:
     dot = bound_dot(dot);   // make sure "dot" is valid
     return;
 #if ENABLE_FEATURE_VI_SEARCH
  colon_s_fail:
-    psb(":s expression missing delimiters");
+    status_line(":s expression missing delimiters");
 #endif
 }
@@ -1125 +1216 @@
 static void Hit_Return(void)
 {
-    char c;
-
-    standout_start();   // start reverse video
+    int c;
+
+    standout_start();
     write1("[Hit return to continue]");
-    standout_end();     // end reverse video
-    while ((c = get_one_char()) != '\n' && c != '\r')   /*do nothing */
-        ;
+    standout_end();
+    while ((c = get_one_char()) != '\n' && c != '\r')
+        continue;
     redraw(TRUE);       // force redraw all
 }
@@ -1141 +1232 @@
 
 //----- Synchronize the cursor to Dot --------------------------
-static void sync_cursor(char * d, int *row, int *col)
+static NOINLINE void sync_cursor(char *d, int *row, int *col)
 {
     char *beg_cur;  // begin and end of "d" line
-    char *end_scr;  // begin and end of screen
     char *tp;
     int cnt, ro, co;
@@ -1150 +1240 @@
     beg_cur = begin_line(d);    // first char of cur line
 
-    end_scr = end_screen(); // last char of screen
-
     if (beg_cur < screenbegin) {
-        // "d" is before  top line on screen
+        // "d" is before top line on screen
         // how many lines do we have to move
         cnt = count_lines(beg_cur, screenbegin);
@@ -1164 +1252 @@
             }
         }
-    } else if (beg_cur > end_scr) {
-        // "d" is after bottom line on screen
-        // how many lines do we have to move
-        cnt = count_lines(end_scr, beg_cur);
-        if (cnt > (rows - 1) / 2)
-            goto sc1;   // too many lines
-        for (ro = 0; ro < cnt - 1; ro++) {
-            // move screen begin the same amount
-            screenbegin = next_line(screenbegin);
-            // now, move the end of screen
-            end_scr = next_line(end_scr);
-            end_scr = end_line(end_scr);
+    } else {
+        char *end_scr;  // begin and end of screen
+        end_scr = end_screen(); // last char of screen
+        if (beg_cur > end_scr) {
+            // "d" is after bottom line on screen
+            // how many lines do we have to move
+            cnt = count_lines(end_scr, beg_cur);
+            if (cnt > (rows - 1) / 2)
+                goto sc1;   // too many lines
+            for (ro = 0; ro < cnt - 1; ro++) {
+                // move screen begin the same amount
+                screenbegin = next_line(screenbegin);
+                // now, move the end of screen
+                end_scr = next_line(end_scr);
+                end_scr = end_line(end_scr);
+            }
         }
     }
@@ -1188 +1280 @@
     // find out what col "d" is on
     co = 0;
-    do {                // drive "co" to correct column
-        if (*tp == '\n' || *tp == '\0')
+    while (tp < d) { // drive "co" to correct column
+        if (*tp == '\n') //vda || *tp == '\0')
             break;
         if (*tp == '\t') {
-            if (d == tp && cmd_mode) { /* handle tabs like real vi */
+            // handle tabs like real vi
+            if (d == tp && cmd_mode) {
                 break;
-            } else {
-                co = next_tabstop(co);
             }
-        } else if (*tp < ' ' || *tp == 127) {
-            co++;       // display as ^X, use 2 columns
-        }
-    } while (tp++ < d && ++co);
+            co = next_tabstop(co);
+        } else if ((unsigned char)*tp < ' ' || *tp == 0x7f) {
+            co++; // display as ^X, use 2 columns
+        }
+        co++;
+        tp++;
+    }
 
     // "co" is the column where "dot" is.
@@ -1233 +1327 @@
 
 //----- Text Movement Routines ---------------------------------
-static char *begin_line(char * p) // return pointer to first char cur line
-{
-    while (p > text && p[-1] != '\n')
-        p--;            // go to cur line B-o-l
+static char *begin_line(char *p) // return pointer to first char cur line
+{
+    if (p > text) {
+        p = memrchr(text, '\n', p - text);
+        if (!p)
+            return text;
+        return p + 1;
+    }
     return p;
 }
 
-static char *end_line(char * p) // return pointer to NL of cur line line
-{
-    while (p < end - 1 && *p != '\n')
-        p++;            // go to cur line E-o-l
+static char *end_line(char *p) // return pointer to NL of cur line
+{
+    if (p < end - 1) {
+        p = memchr(p, '\n', end - p - 1);
+        if (!p)
+            return end - 1;
+    }
     return p;
 }
 
-static inline char *dollar_line(char * p) // return pointer to just before NL line
-{
-    while (p < end - 1 && *p != '\n')
-        p++;            // go to cur line E-o-l
+static char *dollar_line(char *p) // return pointer to just before NL line
+{
+    p = end_line(p);
     // Try to stay off of the Newline
     if (*p == '\n' && (p - begin_line(p)) > 0)
@@ -1257 +1357 @@
 }
 
-static char *prev_line(char * p) // return pointer first char prev line
+static char *prev_line(char *p) // return pointer first char prev line
 {
     p = begin_line(p);  // goto begining of cur line
-    if (p[-1] == '\n' && p > text)
+    if (p > text && p[-1] == '\n')
         p--;            // step to prev line
     p = begin_line(p);  // goto begining of prev line
@@ -1266 +1366 @@
 }
 
-static char *next_line(char * p) // return pointer first char next line
+static char *next_line(char *p) // return pointer first char next line
 {
     p = end_line(p);
-    if (*p == '\n' && p < end - 1)
+    if (p < end - 1 && *p == '\n')
         p++;            // step to next line
     return p;
@@ -1288 +1388 @@
 }
 
-static int count_lines(char * start, char * stop) // count line from start to stop
+// count line from start to stop
+static int count_lines(char *start, char *stop)
 {
     char *q;
     int cnt;
 
-    if (stop < start) { // start and stop are backwards- reverse them
+    if (stop < start) { // start and stop are backwards- reverse them
         q = start;
         start = stop;
@@ -1299 +1400 @@
     }
     cnt = 0;
-    stop = end_line(stop);  // get to end of this line
-    for (q = start; q <= stop && q <= end - 1; q++) {
-        if (*q == '\n')
+    stop = end_line(stop);
+    while (start <= stop && start <= end - 1) {
+        start = end_line(start);
+        if (*start == '\n')
             cnt++;
+        start++;
     }
     return cnt;
@@ -1340 +1443 @@
 }
 
-static char *move_to_col(char * p, int l)
+static char *move_to_col(char *p, int l)
 {
     int co;
@@ -1346 +1449 @@
     p = begin_line(p);
     co = 0;
-    do {
-        if (*p == '\n' || *p == '\0')
+    while (co < l && p < end) {
+        if (*p == '\n') //vda || *p == '\0')
             break;
         if (*p == '\t') {
             co = next_tabstop(co);
         } else if (*p < ' ' || *p == 127) {
-            co++;       // display as ^X, use 2 columns
-        }
-    } while (++co <= l && p++ < end);
+            co++; // display as ^X, use 2 columns
+        }
+        co++;
+        p++;
+    }
     return p;
 }
@@ -1375 +1480 @@
         if (dir < 0) {
             // scroll Backwards
-            // ctrl-Y  scroll up one line
+            // ctrl-Y scroll up one line
             screenbegin = prev_line(screenbegin);
         } else {
             // scroll Forwards
-            // ctrl-E  scroll down one line
+            // ctrl-E scroll down one line
             screenbegin = next_line(screenbegin);
         }
@@ -1404 +1509 @@
 }
 
-static char *bound_dot(char * p) // make sure  text[0] <= P < "end"
+static char *bound_dot(char *p) // make sure  text[0] <= P < "end"
 {
     if (p >= end && end > text) {
@@ -1447 +1552 @@
 
 #if ENABLE_FEATURE_VI_SEARCH
-static int mycmp(const char * s1, const char * s2, int len)
-{
-    int i;
-
-    i = strncmp(s1, s2, len);
+static int mycmp(const char *s1, const char *s2, int len)
+{
     if (ENABLE_FEATURE_VI_SETOPTS && ignorecase) {
-        i = strncasecmp(s1, s2, len);
-    }
-    return i;
+        return strncasecmp(s1, s2, len);
+    }
+    return strncmp(s1, s2, len);
 }
 
 // search for pattern starting at p
-static char *char_search(char * p, const char * pat, int dir, int range)
+static char *char_search(char *p, const char *pat, int dir, int range)
 {
 #ifndef REGEX_SEARCH
@@ -1517 +1619 @@
     if (q != 0) {
         // The pattern was not compiled
-        psbs("bad search pattern: \"%s\": %s", pat, q);
+        status_line_bold("bad search pattern: \"%s\": %s", pat, q);
         i = 0;          // return p if pattern not compiled
         goto cs1;
@@ -1552 +1654 @@
 #endif /* FEATURE_VI_SEARCH */
 
-static char *char_insert(char * p, char c) // insert the char c at 'p'
+static char *char_insert(char *p, char c) // insert the char c at 'p'
 {
     if (c == 22) {      // Is this an ctrl-V?
-        p = stupid_insert(p, '^');  // use ^ to indicate literal next
-        p--;            // backup onto ^
+        p += stupid_insert(p, '^'); // use ^ to indicate literal next
         refresh(FALSE); // show the ^
         c = get_one_char();
         *p = c;
         p++;
-        file_modified++;    // has the file been modified
+        file_modified++;
     } else if (c == 27) {   // Is this an ESC?
         cmd_mode = 0;
@@ -1583 +1684 @@
             c = '\n';   // translate \r to \n
         sp = p;         // remember addr of insert
-        p = stupid_insert(p, c);    // insert the char
+        p += 1 + stupid_insert(p, c);   // insert the char
 #if ENABLE_FEATURE_VI_SETOPTS
         if (showmatch && strchr(")]}", *sp) != NULL) {
@@ -1590 +1691 @@
         if (autoindent && c == '\n') {  // auto indent the new line
             char *q;
-
-            q = prev_line(p);   // use prev line as templet
-            for (; isblank(*q); q++) {
-                p = stupid_insert(p, *q);   // insert the char
+            size_t len;
+            q = prev_line(p);   // use prev line as template
+            len = strspn(q, " \t"); // space or tab
+            if (len) {
+                uintptr_t bias;
+                bias = text_hole_make(p, len);
+                p += bias;
+                q += bias;
+                memcpy(p, q, len);
+                p += len;
             }
         }
@@ -1601 +1708 @@
 }
 
-static char *stupid_insert(char * p, char c) // stupidly insert the char c at 'p'
-{
-    p = text_hole_make(p, 1);
-    if (p != 0) {
-        *p = c;
-        file_modified++;    // has the file been modified
-        p++;
-    }
-    return p;
-}
-
-static char find_range(char ** start, char ** stop, char c)
-{
-    char *save_dot, *p, *q;
-    int cnt;
+// might reallocate text[]! use p += stupid_insert(p, ...),
+// and be careful to not use pointers into potentially freed text[]!
+static uintptr_t stupid_insert(char *p, char c) // stupidly insert the char c at 'p'
+{
+    uintptr_t bias;
+    bias = text_hole_make(p, 1);
+    p += bias;
+    *p = c;
+    //file_modified++; - done by text_hole_make()
+    return bias;
+}
+
+static int find_range(char **start, char **stop, char c)
+{
+    char *save_dot, *p, *q, *t;
+    int cnt, multiline = 0;
 
     save_dot = dot;
@@ -1627 +1735 @@
         }
         q = end_line(q);
-    } else if (strchr("^%$0bBeEft", c)) {
+    } else if (strchr("^%$0bBeEfth\b\177", c)) {
         // These cmds operate on char positions
         do_cmd(c);      // execute movement cmd
@@ -1656 +1764 @@
         q = dot;
     } else {
-        c = 27;         // error- return an ESC char
-        //break;
-    }
+        // nothing -- this causes any other values of c to
+        // represent the one-character range under the
+        // cursor.  this is correct for ' ' and 'l', but
+        // perhaps no others.
+        //
+    }
+    if (q < p) {
+        t = q;
+        q = p;
+        p = t;
+    }
+
+    // backward char movements don't include start position
+    if (q > p && strchr("^0bBh\b\177", c)) q--;
+
+    multiline = 0;
+    for (t = p; t <= q; t++) {
+        if (*t == '\n') {
+            multiline = 1;
+            break;
+        }
+    }
+
     *start = p;
     *stop = q;
-    if (q < p) {
-        *start = q;
-        *stop = p;
-    }
     dot = save_dot;
-    return c;
-}
-
-static int st_test(char * p, int type, int dir, char * tested)
+    return multiline;
+}
+
+static int st_test(char *p, int type, int dir, char *tested)
 {
     char c, c0, ci;
@@ -1681 +1805 @@
     if (type == S_BEFORE_WS) {
         c = ci;
-        test = ((!isspace(c)) || c == '\n');
+        test = (!isspace(c) || c == '\n');
     }
     if (type == S_TO_WS) {
         c = c0;
-        test = ((!isspace(c)) || c == '\n');
+        test = (!isspace(c) || c == '\n');
     }
     if (type == S_OVER_WS) {
         c = c0;
-        test = ((isspace(c)));
+        test = isspace(c);
     }
     if (type == S_END_PUNCT) {
         c = ci;
-        test = ((ispunct(c)));
+        test = ispunct(c);
     }
     if (type == S_END_ALNUM) {
         c = ci;
-        test = ((isalnum(c)) || c == '_');
+        test = (isalnum(c) || c == '_');
     }
     *tested = c;
@@ -1703 +1827 @@
 }
 
-static char *skip_thing(char * p, int linecnt, int dir, int type)
+static char *skip_thing(char *p, int linecnt, int dir, int type)
 {
     char c;
@@ -1721 +1845 @@
 
 // find matching char of pair  ()  []  {}
-static char *find_pair(char * p, char c)
+static char *find_pair(char *p, const char c)
 {
     char match, *q;
@@ -1730 +1854 @@
     dir = 1;            // assume forward
     switch (c) {
-    case '(':
-        match = ')';
-        break;
-    case '[':
-        match = ']';
-        break;
-    case '{':
-        match = '}';
-        break;
-    case ')':
-        match = '(';
-        dir = -1;
-        break;
-    case ']':
-        match = '[';
-        dir = -1;
-        break;
-    case '}':
-        match = '{';
-        dir = -1;
-        break;
+    case '(': match = ')'; break;
+    case '[': match = ']'; break;
+    case '{': match = '}'; break;
+    case ')': match = '('; dir = -1; break;
+    case ']': match = '['; dir = -1; break;
+    case '}': match = '{'; dir = -1; break;
     }
     for (q = p + dir; text <= q && q < end; q += dir) {
@@ -1768 +1877 @@
 #if ENABLE_FEATURE_VI_SETOPTS
 // show the matching char of a pair,  ()  []  {}
-static void showmatching(char * p)
+static void showmatching(char *p)
 {
     char *q, *save_dot;
@@ -1788 +1897 @@
 #endif /* FEATURE_VI_SETOPTS */
 
-//  open a hole in text[]
-static char *text_hole_make(char * p, int size) // at "p", make a 'size' byte hole
-{
-    char *src, *dest;
-    int cnt;
+// open a hole in text[]
+// might reallocate text[]! use p += text_hole_make(p, ...),
+// and be careful to not use pointers into potentially freed text[]!
+static uintptr_t text_hole_make(char *p, int size)  // at "p", make a 'size' byte hole
+{
+    uintptr_t bias = 0;
 
     if (size <= 0)
-        goto thm0;
-    src = p;
-    dest = p + size;
-    cnt = end - src;    // the rest of buffer
-    if ( ((end + size) >= (text + text_size)) // TODO: realloc here
-            || memmove(dest, src, cnt) != dest) {
-        psbs("can't create room for new characters");
-        p = NULL;
-        goto thm0;
-    }
+        return bias;
+    end += size;        // adjust the new END
+    if (end >= (text + text_size)) {
+        char *new_text;
+        text_size += end - (text + text_size) + 10240;
+        new_text = xrealloc(text, text_size);
+        bias = (new_text - text);
+        screenbegin += bias;
+        dot         += bias;
+        end         += bias;
+        p           += bias;
+        text = new_text;
+    }
+    memmove(p + size, p, end - size - p);
     memset(p, ' ', size);   // clear new hole
-    end += size;        // adjust the new END
-    file_modified++;    // has the file been modified
- thm0:
-    return p;
+    file_modified++;
+    return bias;
 }
 
 //  close a hole in text[]
-static char *text_hole_delete(char * p, char * q) // delete "p" thru "q", inclusive
+static char *text_hole_delete(char *p, char *q) // delete "p" through "q", inclusive
 {
     char *src, *dest;
@@ -1834 +1946 @@
     if (src >= end)
         goto thd_atend; // just delete the end of the buffer
-    if (memmove(dest, src, cnt) != dest) {
-        psbs("can't delete the character");
-    }
+    memmove(dest, src, cnt);
  thd_atend:
     end = end - hole_size;  // adjust the new END
@@ -1843 +1953 @@
     if (end <= text)
         dest = end = text;  // keep pointers valid
-    file_modified++;    // has the file been modified
+    file_modified++;
  thd0:
     return dest;
@@ -1851 +1961 @@
 // if dist <= 0, do not include, or go past, a NewLine
 //
-static char *yank_delete(char * start, char * stop, int dist, int yf)
+static char *yank_delete(char *start, char *stop, int dist, int yf)
 {
     char *p;
@@ -1895 +2005 @@
 #endif
 #if ENABLE_FEATURE_VI_YANKMARK
-    "\n\tLine marking with  'x"
-    "\n\tNamed buffers with  \"x"
+    "\n\tLine marking with 'x"
+    "\n\tNamed buffers with \"x"
 #endif
 #if ENABLE_FEATURE_VI_READONLY
@@ -1918 +2028 @@
 }
 
-static inline void print_literal(char * buf, const char * s) // copy s to buf, convert unprintable
-{
-    unsigned char c;
-    char b[2];
-
-    b[1] = '\0';
-    buf[0] = '\0';
-    if (!s[0])
-        s = "(NULL)";
-    for (; *s; s++) {
-        int c_is_no_print;
-
-        c = *s;
-        c_is_no_print = (c & 0x80) && !Isprint(c);
-        if (c_is_no_print) {
-            strcat(buf, SOn);
-            c = '.';
-        }
-        if (c < ' ' || c == 127) {
-            strcat(buf, "^");
-            if (c == 127)
-                c = '?';
-            else
-                c += '@';
-        }
-        b[0] = c;
-        strcat(buf, b);
-        if (c_is_no_print)
-            strcat(buf, SOs);
-        if (*s == '\n')
-            strcat(buf, "$");
-    }
-}
-
 #if ENABLE_FEATURE_VI_DOT_CMD
 static void start_new_cmd_q(char c)
 {
-    // release old cmd
-    free(last_modifying_cmd);
     // get buffer for new cmd
-    last_modifying_cmd = xzalloc(MAX_LINELEN);
     // if there is a current cmd count put it in the buffer first
-    if (cmdcnt > 0)
-        sprintf(last_modifying_cmd, "%d%c", cmdcnt, c);
-    else // just save char c onto queue
+    if (cmdcnt > 0) {
+        lmc_len = sprintf(last_modifying_cmd, "%d%c", cmdcnt, c);
+    } else { // just save char c onto queue
         last_modifying_cmd[0] = c;
+        lmc_len = 1;
+    }
     adding2q = 1;
 }
@@ -1979 +2054 @@
  || (ENABLE_FEATURE_VI_COLON && ENABLE_FEATURE_VI_SEARCH) \
  || ENABLE_FEATURE_VI_CRASHME
-static char *string_insert(char * p, char * s) // insert the string at 'p'
-{
-    int cnt, i;
+// might reallocate text[]! use p += string_insert(p, ...),
+// and be careful to not use pointers into potentially freed text[]!
+static uintptr_t string_insert(char *p, const char *s) // insert the string at 'p'
+{
+    uintptr_t bias;
+    int i;
 
     i = strlen(s);
-    if (text_hole_make(p, i)) {
-        strncpy(p, s, i);
+    bias = text_hole_make(p, i);
+    p += bias;
+    memcpy(p, s, i);
+#if ENABLE_FEATURE_VI_YANKMARK
+    {
+        int cnt;
         for (cnt = 0; *s != '\0'; s++) {
             if (*s == '\n')
                 cnt++;
         }
+        status_line("Put %d lines (%d chars) from [%c]", cnt, i, what_reg());
+    }
+#endif
+    return bias;
+}
+#endif
+
 #if ENABLE_FEATURE_VI_YANKMARK
-        psb("Put %d lines (%d chars) from [%c]", cnt, i, what_reg());
-#endif
-    }
-    return p;
-}
-#endif
-
-#if ENABLE_FEATURE_VI_YANKMARK
-static char *text_yank(char * p, char * q, int dest)    // copy text into a register
-{
-    char *t;
-    int cnt;
-
-    if (q < p) {        // they are backwards- reverse them
-        t = q;
-        q = p;
-        p = t;
-    }
-    cnt = q - p + 1;
-    t = reg[dest];
-    free(t);        //  if already a yank register, free it
-    t = xmalloc(cnt + 1);   // get a new register
-    memset(t, '\0', cnt + 1);   // clear new text[]
-    strncpy(t, p, cnt); // copy text[] into bufer
-    reg[dest] = t;
+static char *text_yank(char *p, char *q, int dest)  // copy text into a register
+{
+    int cnt = q - p;
+    if (cnt < 0) {      // they are backwards- reverse them
+        p = q;
+        cnt = -cnt;
+    }
+    free(reg[dest]);    //  if already a yank register, free it
+    reg[dest] = xstrndup(p, cnt + 1);
     return p;
 }
@@ -2050 +2123 @@
 }
 
-static inline char *swap_context(char * p) // goto new context for '' command make this the current context
+static char *swap_context(char *p) // goto new context for '' command make this the current context
 {
     char *tmp;
@@ -2080 +2153 @@
     term_vi.c_cc[VTIME] = 0;
     erase_char = term_vi.c_cc[VERASE];
-    tcsetattr(0, TCSANOW, &term_vi);
+    tcsetattr_stdin_TCSANOW(&term_vi);
 }
 
 static void cookmode(void)
 {
-    fflush(stdout);
-    tcsetattr(0, TCSANOW, &term_orig);
-}
-
+    fflush_all();
+    tcsetattr_stdin_TCSANOW(&term_orig);
+}
+
+#if ENABLE_FEATURE_VI_USE_SIGNALS
 //----- Come here when we get a window resize signal ---------
-#if ENABLE_FEATURE_VI_USE_SIGNALS
-static void winch_sig(int sig ATTRIBUTE_UNUSED)
-{
+static void winch_sig(int sig UNUSED_PARAM)
+{
+    int save_errno = errno;
+    // FIXME: do it in main loop!!!
     signal(SIGWINCH, winch_sig);
-    if (ENABLE_FEATURE_VI_WIN_RESIZE)
-        get_terminal_width_height(0, &columns, &rows);
+    query_screen_dimensions();
     new_screen(rows, columns);  // get memory for virtual screen
     redraw(TRUE);       // re-draw the screen
+    errno = save_errno;
 }
 
 //----- Come here when we get a continue signal -------------------
-static void cont_sig(int sig ATTRIBUTE_UNUSED)
-{
-    rawmode();          // terminal to "raw"
-    last_status_cksum = 0;  // force status update
-    redraw(TRUE);       // re-draw the screen
+static void cont_sig(int sig UNUSED_PARAM)
+{
+    int save_errno = errno;
+    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"...
+    errno = save_errno;
 }
 
 //----- Come here when we get a Suspend signal -------------------
-static void suspend_sig(int sig ATTRIBUTE_UNUSED)
-{
-    place_cursor(rows - 1, 0, FALSE);   // go to bottom of screen
-    clear_to_eol();     // Erase to end of line
-    cookmode();         // terminal to "cooked"
+static void suspend_sig(int sig UNUSED_PARAM)
+{
+    int save_errno = errno;
+    go_bottom_and_clear_to_eol();
+    cookmode(); // terminal to "cooked"
 
     signal(SIGCONT, cont_sig);
     signal(SIGTSTP, SIG_DFL);
     kill(my_pid, SIGTSTP);
+    errno = save_errno;
 }
 
@@ -2128 +2206 @@
 {
     signal(SIGINT, catch_sig);
-    if (sig)
-        longjmp(restart, sig);
+    siglongjmp(restart, sig);
 }
 #endif /* FEATURE_VI_USE_SIGNALS */
 
-static int mysleep(int hund)    // sleep for 'h' 1/100 seconds
-{
-    fd_set rfds;
-    struct timeval tv;
-
-    // Don't hang- Wait 5/100 seconds-  1 Sec= 1000000
-    fflush(stdout);
-    FD_ZERO(&rfds);
-    FD_SET(0, &rfds);
-    tv.tv_sec = 0;
-    tv.tv_usec = hund * 10000;
-    select(1, &rfds, NULL, NULL, &tv);
-    return FD_ISSET(0, &rfds);
-}
-
-#define readbuffer bb_common_bufsiz1
-
-static int readed_for_parse;
+static int mysleep(int hund)    // sleep for 'hund' 1/100 seconds or stdin ready
+{
+    struct pollfd pfd[1];
+
+    pfd[0].fd = STDIN_FILENO;
+    pfd[0].events = POLLIN;
+    return safe_poll(pfd, 1, hund*10) > 0;
+}
 
 //----- IO Routines --------------------------------------------
-static char readit(void)    // read (maybe cursor) key from stdin
-{
-    char c;
-    int n;
-    struct esc_cmds {
-        const char *seq;
-        char val;
-    };
-
-    static const struct esc_cmds esccmds[] = {
-        {"OA", VI_K_UP},       // cursor key Up
-        {"OB", VI_K_DOWN},     // cursor key Down
-        {"OC", VI_K_RIGHT},    // Cursor Key Right
-        {"OD", VI_K_LEFT},     // cursor key Left
-        {"OH", VI_K_HOME},     // Cursor Key Home
-        {"OF", VI_K_END},      // Cursor Key End
-        {"[A", VI_K_UP},       // cursor key Up
-        {"[B", VI_K_DOWN},     // cursor key Down
-        {"[C", VI_K_RIGHT},    // Cursor Key Right
-        {"[D", VI_K_LEFT},     // cursor key Left
-        {"[H", VI_K_HOME},     // Cursor Key Home
-        {"[F", VI_K_END},      // Cursor Key End
-        {"[1~", VI_K_HOME},    // Cursor Key Home
-        {"[2~", VI_K_INSERT},  // Cursor Key Insert
-        {"[4~", VI_K_END},     // Cursor Key End
-        {"[5~", VI_K_PAGEUP},  // Cursor Key Page Up
-        {"[6~", VI_K_PAGEDOWN},// Cursor Key Page Down
-        {"OP", VI_K_FUN1},     // Function Key F1
-        {"OQ", VI_K_FUN2},     // Function Key F2
-        {"OR", VI_K_FUN3},     // Function Key F3
-        {"OS", VI_K_FUN4},     // Function Key F4
-        {"[15~", VI_K_FUN5},   // Function Key F5
-        {"[17~", VI_K_FUN6},   // Function Key F6
-        {"[18~", VI_K_FUN7},   // Function Key F7
-        {"[19~", VI_K_FUN8},   // Function Key F8
-        {"[20~", VI_K_FUN9},   // Function Key F9
-        {"[21~", VI_K_FUN10},  // Function Key F10
-        {"[23~", VI_K_FUN11},  // Function Key F11
-        {"[24~", VI_K_FUN12},  // Function Key F12
-        {"[11~", VI_K_FUN1},   // Function Key F1
-        {"[12~", VI_K_FUN2},   // Function Key F2
-        {"[13~", VI_K_FUN3},   // Function Key F3
-        {"[14~", VI_K_FUN4},   // Function Key F4
-    };
-    enum { ESCCMDS_COUNT = ARRAY_SIZE(esccmds) };
-
-    alarm(0);   // turn alarm OFF while we wait for input
-    fflush(stdout);
-    n = readed_for_parse;
-    // get input from User- are there already input chars in Q?
-    if (n <= 0) {
- ri0:
-        // the Q is empty, wait for a typed char
-        n = read(0, readbuffer, MAX_LINELEN - 1);
-        if (n < 0) {
-            if (errno == EINTR)
-                goto ri0;   // interrupted sys call
-            if (errno == EBADF || errno == EFAULT || errno == EINVAL
-                    || errno == EIO)
-                editing = 0;
-            errno = 0;
-        }
-        if (n <= 0)
-            return 0;       // error
-        if (readbuffer[0] == 27) {
-            fd_set rfds;
-            struct timeval tv;
-
-            // This is an ESC char. Is this Esc sequence?
-            // Could be bare Esc key. See if there are any
-            // more chars to read after the ESC. This would
-            // be a Function or Cursor Key sequence.
-            FD_ZERO(&rfds);
-            FD_SET(0, &rfds);
-            tv.tv_sec = 0;
-            tv.tv_usec = 50000; // Wait 5/100 seconds- 1 Sec=1000000
-
-            // keep reading while there are input chars and room in buffer
-            while (select(1, &rfds, NULL, NULL, &tv) > 0 && n <= (MAX_LINELEN - 5)) {
-                // read the rest of the ESC string
-                int r = read(0, (void *) (readbuffer + n), MAX_LINELEN - n);
-                if (r > 0) {
-                    n += r;
-                }
-            }
-        }
-        readed_for_parse = n;
-    }
-    c = readbuffer[0];
-    if (c == 27 && n > 1) {
-        // Maybe cursor or function key?
-        const struct esc_cmds *eindex;
-
-        for (eindex = esccmds; eindex < &esccmds[ESCCMDS_COUNT]; eindex++) {
-            int cnt = strlen(eindex->seq);
-
-            if (n <= cnt)
-                continue;
-            if (strncmp(eindex->seq, readbuffer + 1, cnt))
-                continue;
-            // is a Cursor key- put derived value back into Q
-            c = eindex->val;
-            // for squeeze out the ESC sequence
-            n = cnt + 1;
-            break;
-        }
-        if (eindex == &esccmds[ESCCMDS_COUNT]) {
-            /* defined ESC sequence not found, set only one ESC */
-            n = 1;
-    }
-    } else {
-        n = 1;
-    }
-    // remove key sequence from Q
-    readed_for_parse -= n;
-    memmove(readbuffer, readbuffer + n, MAX_LINELEN - n);
-    alarm(3);   // we are done waiting for input, turn alarm ON
+static int readit(void) // read (maybe cursor) key from stdin
+{
+    int c;
+
+    fflush_all();
+    c = read_key(STDIN_FILENO, readbuffer, /*timeout off:*/ -2);
+    if (c == -1) { // EOF/error
+        go_bottom_and_clear_to_eol();
+        cookmode(); // terminal to "cooked"
+        bb_error_msg_and_die("can't read user input");
+    }
     return c;
 }
 
 //----- IO Routines --------------------------------------------
-static char get_one_char(void)
-{
-    static char c;
+static int get_one_char(void)
+{
+    int c;
 
 #if ENABLE_FEATURE_VI_DOT_CMD
-    // ! adding2q  && ioq == 0  read()
-    // ! adding2q  && ioq != 0  *ioq
-    // adding2q         *last_modifying_cmd= read()
     if (!adding2q) {
         // we are not adding to the q.
@@ -2290 +2248 @@
         } else {
             // there is a queue to get chars from first
-            c = *ioq++;
+            // careful with correct sign expansion!
+            c = (unsigned char)*ioq++;
             if (c == '\0') {
                 // the end of the q, read from STDIN
@@ -2301 +2260 @@
         // adding STDIN chars to q
         c = readit();   // get the users input
-        if (last_modifying_cmd != 0) {
-            int len = strlen(last_modifying_cmd);
-            if (len >= MAX_LINELEN - 1) {
-                psbs("last_modifying_cmd overrun");
-            } else {
-                // add new char to q
-                last_modifying_cmd[len] = c;
-            }
+        if (lmc_len >= MAX_INPUT_LEN - 1) {
+            status_line_bold("last_modifying_cmd overrun");
+        } else {
+            // add new char to q
+            last_modifying_cmd[lmc_len++] = c;
         }
     }
@@ -2314 +2270 @@
     c = readit();       // get the users input
 #endif /* FEATURE_VI_DOT_CMD */
-    return c;           // return the char, where ever it came from
-}
-
-static char *get_input_line(const char * prompt) // get input line- use "status line"
-{
-    static char *obufp;
-
-    char buf[MAX_LINELEN];
-    char c;
+    return c;
+}
+
+// Get input line (uses "status line" area)
+static char *get_input_line(const char *prompt)
+{
+    // char [MAX_INPUT_LEN]
+#define buf get_input_line__buf
+
+    int c;
     int i;
 
     strcpy(buf, prompt);
     last_status_cksum = 0;  // force status update
-    place_cursor(rows - 1, 0, FALSE);   // go to Status line, bottom of screen
-    clear_to_eol();     // clear the line
+    go_bottom_and_clear_to_eol();
     write1(prompt);      // write out the :, /, or ? prompt
 
     i = strlen(buf);
-    while (i < MAX_LINELEN) {
-        c = get_one_char(); // read user input
+    while (i < MAX_INPUT_LEN) {
+        c = get_one_char();
         if (c == '\n' || c == '\r' || c == 27)
-            break;      // is this end of input
+            break;      // this is end of input
         if (c == erase_char || c == 8 || c == 127) {
             // user wants to erase prev char
-            i--;        // backup to prev char
-            buf[i] = '\0';  // erase the char
-            buf[i + 1] = '\0';  // null terminate buffer
-            write1("\b \b");     // erase char on screen
-            if (i <= 0) {   // user backs up before b-o-l, exit
+            buf[--i] = '\0';
+            write1("\b \b"); // erase char on screen
+            if (i <= 0) // user backs up before b-o-l, exit
                 break;
-            }
-        } else {
-            buf[i] = c; // save char in buffer
-            buf[i + 1] = '\0';  // make sure buffer is null terminated
-            putchar(c);   // echo the char back to user
-            i++;
+        } else if (c > 0 && c < 256) { // exclude Unicode
+            // (TODO: need to handle Unicode)
+            buf[i] = c;
+            buf[++i] = '\0';
+            bb_putchar(c);
         }
     }
     refresh(FALSE);
-    free(obufp);
-    obufp = xstrdup(buf);
-    return obufp;
+    return buf;
+#undef buf
 }
 
@@ -2364 +2316 @@
 
     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;
 }
 
-static int file_insert(const char * fn, char *p
-        USE_FEATURE_VI_READONLY(, int update_ro_status))
+// might reallocate text[]!
+static int file_insert(const char *fn, char *p, int update_ro_status)
 {
     int cnt = -1;
@@ -2378 +2330 @@
     /* Validate file */
     if (stat(fn, &statbuf) < 0) {
-        psbs("\"%s\" %s", fn, strerror(errno));
+        status_line_bold("\"%s\" %s", fn, strerror(errno));
         goto fi0;
     }
-    if ((statbuf.st_mode & S_IFREG) == 0) {
+    if (!S_ISREG(statbuf.st_mode)) {
         // This is not a regular file
-        psbs("\"%s\" Not a regular file", fn);
+        status_line_bold("\"%s\" Not a regular file", fn);
         goto fi0;
     }
-    /* // this check is done by open()
-    if ((statbuf.st_mode & (S_IRUSR | S_IRGRP | S_IROTH)) == 0) {
-        // dont have any read permissions
-        psbs("\"%s\" Not readable", fn);
-        goto fi0;
-    }
-    */
     if (p < text || p > end) {
-        psbs("Trying to insert file outside of memory");
+        status_line_bold("Trying to insert file outside of memory");
         goto fi0;
     }
@@ -2401 +2346 @@
     fd = open(fn, O_RDONLY);
     if (fd < 0) {
-        psbs("\"%s\" %s", fn, strerror(errno));
+        status_line_bold("\"%s\" %s", fn, strerror(errno));
         goto fi0;
     }
     size = statbuf.st_size;
-    p = text_hole_make(p, size);
-    if (p == NULL)
-        goto fi0;
-    cnt = read(fd, p, size);
+    p += text_hole_make(p, size);
+    cnt = safe_read(fd, p, size);
     if (cnt < 0) {
-        psbs("\"%s\" %s", fn, strerror(errno));
+        status_line_bold("\"%s\" %s", fn, strerror(errno));
         p = text_hole_delete(p, p + size - 1);  // un-do buffer insert
     } else if (cnt < size) {
         // There was a partial read, shrink unused space text[]
         p = text_hole_delete(p + cnt, p + (size - cnt) - 1);    // un-do buffer insert
-        psbs("cannot read all of file \"%s\"", fn);
+        status_line_bold("can't read all of file \"%s\"", fn);
     }
     if (cnt >= size)
@@ -2435 +2378 @@
 }
 
-
-static int file_write(char * fn, char * first, char * last)
+static int file_write(char *fn, char *first, char *last)
 {
     int fd, cnt, charcnt;
 
     if (fn == 0) {
-        psbs("No current filename");
+        status_line_bold("No current filename");
         return -2;
     }
-    charcnt = 0;
-    // FIXIT- use the correct umask()
-    fd = open(fn, (O_WRONLY | O_CREAT | O_TRUNC), 0664);
+    /* By popular request we do not open file with O_TRUNC,
+     * but instead ftruncate() it _after_ successful write.
+     * Might reduce amount of data lost on power fail etc.
+     */
+    fd = open(fn, (O_WRONLY | O_CREAT), 0666);
     if (fd < 0)
         return -1;
     cnt = last - first + 1;
-    charcnt = write(fd, first, cnt);
+    charcnt = full_write(fd, first, cnt);
+    ftruncate(fd, charcnt);
     if (charcnt == cnt) {
         // good write
-        //file_modified = FALSE; // the file has not been modified
+        //file_modified = FALSE;
     } else {
         charcnt = 0;
@@ -2470 +2415 @@
 //  .       ...     .
 //  22,0    ...     22,79
-//  23,0    ...     23,79   status line
-//
+//  23,0    ...     23,79   <- status line
 
 //----- Move the cursor to row x col (count from 0, not 1) -------
-static void place_cursor(int row, int col, int opti)
-{
-    char cm1[MAX_LINELEN];
+static void place_cursor(int row, int col, int optimize)
+{
+    char cm1[sizeof(CMrc) + sizeof(int)*3 * 2];
+#if ENABLE_FEATURE_VI_OPTIMIZE_CURSOR
+    enum {
+        SZ_UP = sizeof(CMup),
+        SZ_DN = sizeof(CMdown),
+        SEQ_SIZE = SZ_UP > SZ_DN ? SZ_UP : SZ_DN,
+    };
+    char cm2[SEQ_SIZE * 5 + 32]; // bigger than worst case size
+#endif
     char *cm;
-#if ENABLE_FEATURE_VI_OPTIMIZE_CURSOR
-    char cm2[MAX_LINELEN];
-    char *screenp;
-    // char cm3[MAX_LINELEN];
-    int Rrow = last_row;
-#endif
-
-    memset(cm1, '\0', MAX_LINELEN);  // clear the buffer
 
     if (row < 0) row = 0;
@@ -2495 +2439 @@
     sprintf(cm1, CMrc, row + 1, col + 1);
     cm = cm1;
-    if (!opti)
-        goto pc0;
 
 #if ENABLE_FEATURE_VI_OPTIMIZE_CURSOR
-    //----- find the minimum # of chars to move cursor -------------
-    //----- 2.  Try moving with discreet chars (Newline, [back]space, ...)
-    memset(cm2, '\0', MAX_LINELEN);  // clear the buffer
-
-    // move to the correct row
-    while (row < Rrow) {
-        // the cursor has to move up
-        strcat(cm2, CMup);
-        Rrow--;
-    }
-    while (row > Rrow) {
-        // the cursor has to move down
-        strcat(cm2, CMdown);
-        Rrow++;
-    }
-
-    // now move to the correct column
-    strcat(cm2, "\r");          // start at col 0
-    // just send out orignal source char to get to correct place
-    screenp = &screen[row * columns];   // start of screen line
-    strncat(cm2, screenp, col);
-
-    //----- 3.  Try some other way of moving cursor
-    //---------------------------------------------
-
-    // pick the shortest cursor motion to send out
-    cm = cm1;
-    if (strlen(cm2) < strlen(cm)) {
-        cm = cm2;
-    }  /* else if (strlen(cm3) < strlen(cm)) {
-        cm= cm3;
-    } */
+    if (optimize && col < 16) {
+        char *screenp;
+        int Rrow = last_row;
+        int diff = Rrow - row;
+
+        if (diff < -5 || diff > 5)
+            goto skip;
+
+        //----- find the minimum # of chars to move cursor -------------
+        //----- 2.  Try moving with discreet chars (Newline, [back]space, ...)
+        cm2[0] = '\0';
+
+        // move to the correct row
+        while (row < Rrow) {
+            // the cursor has to move up
+            strcat(cm2, CMup);
+            Rrow--;
+        }
+        while (row > Rrow) {
+            // the cursor has to move down
+            strcat(cm2, CMdown);
+            Rrow++;
+        }
+
+        // now move to the correct column
+        strcat(cm2, "\r");          // start at col 0
+        // just send out orignal source char to get to correct place
+        screenp = &screen[row * columns];   // start of screen line
+        strncat(cm2, screenp, col);
+
+        // pick the shortest cursor motion to send out
+        if (strlen(cm2) < strlen(cm)) {
+            cm = cm2;
+        }
+ skip: ;
+    }
+    last_row = row;
 #endif /* FEATURE_VI_OPTIMIZE_CURSOR */
- pc0:
-    write1(cm);                 // move the cursor
+    write1(cm);
 }
 
@@ -2540 +2486 @@
 {
     write1(Ceol);   // Erase from cursor to end of line
+}
+
+static void go_bottom_and_clear_to_eol(void)
+{
+    place_cursor(rows - 1, 0, FALSE); // go to bottom of screen
+    clear_to_eol(); // erase to end of line
 }
 
@@ -2612 +2564 @@
     }
     if (have_status_msg || ((cnt > 0 && last_status_cksum != cksum))) {
-        last_status_cksum= cksum;       // remember if we have seen this line
-        place_cursor(rows - 1, 0, FALSE);   // put cursor on status line
+        last_status_cksum = cksum;      // remember if we have seen this line
+        go_bottom_and_clear_to_eol();
         write1(status_buffer);
-        clear_to_eol();
         if (have_status_msg) {
             if (((int)strlen(status_buffer) - (have_status_msg - 1)) >
@@ -2626 +2577 @@
         place_cursor(crow, ccol, FALSE);    // put cursor back in correct place
     }
-    fflush(stdout);
+    fflush_all();
 }
 
 //----- format the status buffer, the bottom line of screen ------
 // format status buffer, with STANDOUT mode
-static void psbs(const char *format, ...)
+static void status_line_bold(const char *format, ...)
 {
     va_list args;
@@ -2637 +2588 @@
     va_start(args, format);
     strcpy(status_buffer, SOs); // Terminal standout mode on
-    vsprintf(status_buffer + strlen(status_buffer), format, args);
+    vsprintf(status_buffer + sizeof(SOs)-1, format, args);
     strcat(status_buffer, SOn); // Terminal standout mode off
     va_end(args);
@@ -2645 +2596 @@
 
 // format status buffer
-static void psb(const char *format, ...)
+static void status_line(const char *format, ...)
 {
     va_list args;
@@ -2656 +2607 @@
 }
 
-static void ni(const char * s) // display messages
-{
-    char buf[MAX_LINELEN];
+// copy s to buf, convert unprintable
+static void print_literal(char *buf, const char *s)
+{
+    char *d;
+    unsigned char c;
+
+    buf[0] = '\0';
+    if (!s[0])
+        s = "(NULL)";
+
+    d = buf;
+    for (; *s; s++) {
+        int c_is_no_print;
+
+        c = *s;
+        c_is_no_print = (c & 0x80) && !Isprint(c);
+        if (c_is_no_print) {
+            strcpy(d, SOn);
+            d += sizeof(SOn)-1;
+            c = '.';
+        }
+        if (c < ' ' || c == 0x7f) {
+            *d++ = '^';
+            c |= '@'; /* 0x40 */
+            if (c == 0x7f)
+                c = '?';
+        }
+        *d++ = c;
+        *d = '\0';
+        if (c_is_no_print) {
+            strcpy(d, SOs);
+            d += sizeof(SOs)-1;
+        }
+        if (*s == '\n') {
+            *d++ = '$';
+            *d = '\0';
+        }
+        if (d - buf > MAX_INPUT_LEN - 10) // paranoia
+            break;
+    }
+}
+
+static void not_implemented(const char *s)
+{
+    char buf[MAX_INPUT_LEN];
 
     print_literal(buf, s);
-    psbs("\'%s\' is not implemented", buf);
-}
-
-static int format_edit_status(void) // show file status on status line
-{
-    static int tot;
+    status_line_bold("\'%s\' is not implemented", buf);
+}
+
+// show file status on status line
+static int format_edit_status(void)
+{
     static const char cmd_mode_indicator[] ALIGN1 = "-IR-";
+
+#define tot format_edit_status__tot
+
     int cur, percent, ret, trunc_at;
 
@@ -2718 +2714 @@
 
     return trunc_at;  /* had to truncate */
+#undef tot
 }
 
@@ -2724 +2721 @@
 {
     place_cursor(0, 0, FALSE);  // put cursor in correct place
-    clear_to_eos();     // tel terminal to erase display
+    clear_to_eos();     // tell terminal to erase display
     screen_erase();     // erase the internal screen buffer
     last_status_cksum = 0;  // force status update
@@ -2732 +2729 @@
 
 //----- Format a text[] line into a buffer ---------------------
-static void format_line(char *dest, char *src, int li)
-{
+static char* format_line(char *src /*, int li*/)
+{
+    unsigned char c;
     int co;
-    char c;
-
-    for (co = 0; co < MAX_SCR_COLS; co++) {
-        c = ' ';        // assume blank
-        if (li > 0 && co == 0) {
-            c = '~';        // not first line, assume Tilde
-        }
-        // are there chars in text[] and have we gone past the end
-        if (text < end && src < end) {
+    int ofs = offset;
+    char *dest = scr_out_buf; // [MAX_SCR_COLS + MAX_TABSTOP * 2]
+
+    c = '~'; // char in col 0 in non-existent lines is '~'
+    co = 0;
+    while (co < columns + tabstop) {
+        // have we gone past the end?
+        if (src < end) {
             c = *src++;
-        }
-        if (c == '\n')
-            break;
-        if ((c & 0x80) && !Isprint(c)) {
-            c = '.';
-        }
-        if ((unsigned char)(c) < ' ' || c == 0x7f) {
-            if (c == '\t') {
-                c = ' ';
-                //       co %    8     !=     7
-                for (; (co % tabstop) != (tabstop - 1); co++) {
-                    dest[co] = c;
+            if (c == '\n')
+                break;
+            if ((c & 0x80) && !Isprint(c)) {
+                c = '.';
+            }
+            if (c < ' ' || c == 0x7f) {
+                if (c == '\t') {
+                    c = ' ';
+                    //      co %    8     !=     7
+                    while ((co % tabstop) != (tabstop - 1)) {
+                        dest[co++] = c;
+                    }
+                } else {
+                    dest[co++] = '^';
+                    if (c == 0x7f)
+                        c = '?';
+                    else
+                        c += '@'; // Ctrl-X -> 'X'
                 }
-            } else {
-                dest[co++] = '^';
-                if (c == 0x7f)
-                    c = '?';
-                else
-                    c += '@';       // make it visible
             }
         }
-        // the co++ is done here so that the column will
-        // not be overwritten when we blank-out the rest of line
-        dest[co] = c;
+        dest[co++] = c;
+        // discard scrolled-off-to-the-left portion,
+        // in tabstop-sized pieces
+        if (ofs >= tabstop && co >= tabstop) {
+            memmove(dest, dest + tabstop, co);
+            co -= tabstop;
+            ofs -= tabstop;
+        }
         if (src >= end)
             break;
     }
+    // check "short line, gigantic offset" case
+    if (co < ofs)
+        ofs = co;
+    // discard last scrolled off part
+    co -= ofs;
+    dest += ofs;
+    // fill the rest with spaces
+    if (co < columns)
+        memset(&dest[co], ' ', columns - co);
+    return dest;
 }
 
@@ -2781 +2793 @@
 static void refresh(int full_screen)
 {
-    static int old_offset;
+#define old_offset refresh__old_offset
 
     int li, changed;
-    char buf[MAX_SCR_COLS];
     char *tp, *sp;      // pointer into text[] and screen[]
-#if ENABLE_FEATURE_VI_OPTIMIZE_CURSOR
-    int last_li = -2; // last line that changed- for optimizing cursor movement
-#endif
-
-    if (ENABLE_FEATURE_VI_WIN_RESIZE)
-        get_terminal_width_height(0, &columns, &rows);
+
+    if (ENABLE_FEATURE_VI_WIN_RESIZE IF_FEATURE_VI_ASK_TERMINAL(&& !G.get_rowcol_error) ) {
+        unsigned c = columns, r = rows;
+        query_screen_dimensions();
+        full_screen |= (c - columns) | (r - rows);
+    }
     sync_cursor(dot, &crow, &ccol); // where cursor will be (on "dot")
     tp = screenbegin;   // index into text[] of top line
@@ -2798 +2809 @@
     for (li = 0; li < rows - 1; li++) {
         int cs, ce;             // column start & end
-        memset(buf, ' ', MAX_SCR_COLS);     // blank-out the buffer
-        buf[MAX_SCR_COLS-1] = 0;        // NULL terminate the buffer
-        // format current text line into buf
-        format_line(buf, tp, li);
+        char *out_buf;
+        // format current text line
+        out_buf = format_line(tp /*, li*/);
 
         // skip to the end of the current text[] line
-        while (tp < end && *tp++ != '\n') /*no-op*/;
-
-        // see if there are any changes between vitual screen and buf
+        if (tp < end) {
+            char *t = memchr(tp, '\n', end - tp);
+            if (!t) t = end - 1;
+            tp = t + 1;
+        }
+
+        // see if there are any changes between vitual screen and out_buf
         changed = FALSE;    // assume no change
-        cs= 0;
-        ce= columns-1;
+        cs = 0;
+        ce = columns - 1;
         sp = &screen[li * columns]; // start of screen line
         if (full_screen) {
@@ -2818 +2832 @@
         // look forward for first difference between buf and screen
         for (; cs <= ce; cs++) {
-            if (buf[cs + offset] != sp[cs]) {
+            if (out_buf[cs] != sp[cs]) {
                 changed = TRUE; // mark for redraw
                 break;
@@ -2824 +2838 @@
         }
 
-        // look backward for last difference between buf and screen
-        for ( ; ce >= cs; ce--) {
-            if (buf[ce + offset] != sp[ce]) {
+        // look backward for last difference between out_buf and screen
+        for (; ce >= cs; ce--) {
+            if (out_buf[ce] != sp[ce]) {
                 changed = TRUE; // mark for redraw
                 break;
@@ -2840 +2854 @@
 
         // make a sanity check of columns indexes
-        if (cs < 0) cs= 0;
-        if (ce > columns-1) ce= columns-1;
-        if (cs > ce) {  cs= 0;  ce= columns-1;  }
-        // is there a change between vitual screen and buf
+        if (cs < 0) cs = 0;
+        if (ce > columns - 1) ce = columns - 1;
+        if (cs > ce) { cs = 0; ce = columns - 1; }
+        // is there a change between vitual screen and out_buf
         if (changed) {
-            //  copy changed part of buffer to virtual screen
-            memmove(sp+cs, buf+(cs+offset), ce-cs+1);
+            // copy changed part of buffer to virtual screen
+            memcpy(sp+cs, out_buf+cs, ce-cs+1);
 
             // move cursor to column of first change
-            if (offset != old_offset) {
-                // opti_cur_move is still too stupid
-                // to handle offsets correctly
-                place_cursor(li, cs, FALSE);
-            } else {
-#if ENABLE_FEATURE_VI_OPTIMIZE_CURSOR
-                // if this just the next line
-                //  try to optimize cursor movement
-                //  otherwise, use standard ESC sequence
-                place_cursor(li, cs, li == (last_li+1) ? TRUE : FALSE);
-                last_li= li;
-#else
-                place_cursor(li, cs, FALSE);    // use standard ESC sequence
-#endif /* FEATURE_VI_OPTIMIZE_CURSOR */
-            }
+            //if (offset != old_offset) {
+            //  // place_cursor is still too stupid
+            //  // to handle offsets correctly
+            //  place_cursor(li, cs, FALSE);
+            //} else {
+                place_cursor(li, cs, TRUE);
+            //}
 
             // write line out to terminal
-            {
-                int nic = ce - cs + 1;
-                char *out = sp + cs;
-
-                while (nic-- > 0) {
-                    putchar(*out);
-                    out++;
-                }
-            }
-#if ENABLE_FEATURE_VI_OPTIMIZE_CURSOR
-            last_row = li;
-#endif
-        }
-    }
-
-#if ENABLE_FEATURE_VI_OPTIMIZE_CURSOR
-    place_cursor(crow, ccol, (crow == last_row) ? TRUE : FALSE);
-    last_row = crow;
-#else
-    place_cursor(crow, ccol, FALSE);
-#endif
-
-    if (offset != old_offset)
-        old_offset = offset;
+            fwrite(&sp[cs], ce - cs + 1, 1, stdout);
+        }
+    }
+
+    place_cursor(crow, ccol, TRUE);
+
+    old_offset = offset;
+#undef old_offset
 }
 
@@ -2914 +2904 @@
 
 //----- Execute a Vi Command -----------------------------------
-static void do_cmd(char c)
-{
-    const char *msg;
-    char c1, *p, *q, buf[9], *save_dot;
-    int cnt, i, j, dir, yf;
-
-    c1 = c;             // quiet the compiler
-    cnt = yf = dir = 0; // quiet the compiler
-    msg = p = q = save_dot = buf;   // quiet the compiler
-    memset(buf, '\0', 9);   // clear buf
+static void do_cmd(int c)
+{
+    const char *msg = msg; // for compiler
+    char *p, *q, *save_dot;
+    char buf[12];
+    int dir;
+    int cnt, i, j;
+    int c1;
+
+//  c1 = c; // quiet the compiler
+//  cnt = yf = 0; // quiet the compiler
+//  msg = p = q = save_dot = buf; // quiet the compiler
+    memset(buf, '\0', 12);
 
     show_status_line();
@@ -2929 +2922 @@
     /* if this is a cursor key, skip these checks */
     switch (c) {
-        case VI_K_UP:
-        case VI_K_DOWN:
-        case VI_K_LEFT:
-        case VI_K_RIGHT:
-        case VI_K_HOME:
-        case VI_K_END:
-        case VI_K_PAGEUP:
-        case VI_K_PAGEDOWN:
+        case KEYCODE_UP:
+        case KEYCODE_DOWN:
+        case KEYCODE_LEFT:
+        case KEYCODE_RIGHT:
+        case KEYCODE_HOME:
+        case KEYCODE_END:
+        case KEYCODE_PAGEUP:
+        case KEYCODE_PAGEDOWN:
+        case KEYCODE_DELETE:
             goto key_cmd_mode;
     }
@@ -2942 +2936 @@
     if (cmd_mode == 2) {
         //  flip-flop Insert/Replace mode
-        if (c == VI_K_INSERT)
+        if (c == KEYCODE_INSERT)
             goto dc_i;
         // we are 'R'eplacing the current *dot with new char
@@ -2959 +2953 @@
     if (cmd_mode == 1) {
         //  hitting "Insert" twice means "R" replace mode
-        if (c == VI_K_INSERT) goto dc5;
+        if (c == KEYCODE_INSERT) goto dc5;
         // insert the char c at "dot"
         if (1 <= c || Isprint(c)) {
@@ -2995 +2989 @@
         //case ')': // )-
         //case '*': // *-
-        //case ',': // ,-
         //case '=': // =-
         //case '@': // @-
@@ -3009 +3002 @@
         //case '_': // _-
         //case '`': // `-
-        //case 'g': // g-
         //case 'u': // u- FIXME- there is no undo
         //case 'v': // v-
-    default:            // unrecognised command
+    default:            // unrecognized command
         buf[0] = c;
         buf[1] = '\0';
-        if (c < ' ') {
-            buf[0] = '^';
-            buf[1] = c + '@';
-            buf[2] = '\0';
-        }
-        ni(buf);
+        not_implemented(buf);
         end_cmd_q();    // stop adding to q
     case 0x00:          // nul- ignore
         break;
     case 2:         // ctrl-B  scroll up   full screen
-    case VI_K_PAGEUP:   // Cursor Key Page Up
+    case KEYCODE_PAGEUP:    // Cursor Key Page Up
         dot_scroll(rows - 2, -1);
         break;
-#if ENABLE_FEATURE_VI_USE_SIGNALS
-    case 0x03:          // ctrl-C   interrupt
-        longjmp(restart, 1);
-        break;
-    case 26:            // ctrl-Z suspend
-        suspend_sig(SIGTSTP);
-        break;
-#endif
     case 4:         // ctrl-D  scroll down half screen
         dot_scroll((rows - 2) / 2, 1);
@@ -3043 +3022 @@
         break;
     case 6:         // ctrl-F  scroll down full screen
-    case VI_K_PAGEDOWN: // Cursor Key Page Down
+    case KEYCODE_PAGEDOWN:  // Cursor Key Page Down
         dot_scroll(rows - 2, 1);
         break;
@@ -3050 +3029 @@
         break;
     case 'h':           // h- move left
-    case VI_K_LEFT: // cursor key Left
+    case KEYCODE_LEFT:  // cursor key Left
     case 8:     // ctrl-H- move left    (This may be ERASE char)
     case 0x7f:  // DEL- move left   (This may be ERASE char)
-        if (cmdcnt-- > 1) {
+        if (--cmdcnt > 0) {
             do_cmd(c);
-        }               // repeat cnt
+        }
         dot_left();
         break;
     case 10:            // Newline ^J
     case 'j':           // j- goto next line, same col
-    case VI_K_DOWN: // cursor key Down
-        if (cmdcnt-- > 1) {
+    case KEYCODE_DOWN:  // cursor key Down
+        if (--cmdcnt > 0) {
             do_cmd(c);
-        }               // repeat cnt
+        }
         dot_next();     // go to next B-o-l
         dot = move_to_col(dot, ccol + offset);  // try stay in same col
@@ -3078 +3057 @@
     case 13:            // Carriage Return ^M
     case '+':           // +- goto next line
-        if (cmdcnt-- > 1) {
+        if (--cmdcnt > 0) {
             do_cmd(c);
-        }               // repeat cnt
+        }
         dot_next();
         dot_skip_over_ws();
@@ -3099 +3078 @@
     case ' ':           // move right
     case 'l':           // move right
-    case VI_K_RIGHT:    // Cursor Key Right
-        if (cmdcnt-- > 1) {
+    case KEYCODE_RIGHT: // Cursor Key Right
+        if (--cmdcnt > 0) {
             do_cmd(c);
-        }               // repeat cnt
+        }
         dot_right();
         break;
 #if ENABLE_FEATURE_VI_YANKMARK
     case '"':           // "- name a register to use for Delete/Yank
-        c1 = get_one_char();
-        c1 = tolower(c1);
-        if (islower(c1)) {
-            YDreg = c1 - 'a';
+        c1 = (get_one_char() | 0x20) - 'a'; // | 0x20 is tolower()
+        if ((unsigned)c1 <= 25) { // a-z?
+            YDreg = c1;
         } else {
             indicate_error(c);
@@ -3116 +3094 @@
         break;
     case '\'':          // '- goto a specific mark
-        c1 = get_one_char();
-        c1 = tolower(c1);
-        if (islower(c1)) {
-            c1 = c1 - 'a';
+        c1 = (get_one_char() | 0x20) - 'a';
+        if ((unsigned)c1 <= 25) { // a-z?
             // get the b-o-l
-            q = mark[(unsigned char) c1];
+            q = mark[c1];
             if (text <= q && q < end) {
                 dot = q;
@@ -3140 +3116 @@
         // correct location! It could be off by many lines!
         // Well..., at least its quick and dirty.
-        c1 = get_one_char();
-        c1 = tolower(c1);
-        if (islower(c1)) {
-            c1 = c1 - 'a';
+        c1 = (get_one_char() | 0x20) - 'a';
+        if ((unsigned)c1 <= 25) { // a-z?
             // remember the line
-            mark[(int) c1] = dot;
+            mark[c1] = dot;
         } else {
             indicate_error(c);
@@ -3153 +3127 @@
     case 'p':           // p- put register after
         p = reg[YDreg];
-        if (p == 0) {
-            psbs("Nothing in register %c", what_reg());
+        if (p == NULL) {
+            status_line_bold("Nothing in register %c", what_reg());
             break;
         }
@@ -3174 +3148 @@
                 dot_right();    // move to right, can move to NL
         }
-        dot = string_insert(dot, p);    // insert the string
+        string_insert(dot, p);  // insert the string
         end_cmd_q();    // stop adding to q
         break;
@@ -3182 +3156 @@
             q = end_line(dot);
             p = text_hole_delete(p, q); // delete cur line
-            p = string_insert(p, reg[Ureg]);    // insert orig line
+            p += string_insert(p, reg[Ureg]);   // insert orig line
             dot = p;
             dot_skip_over_ws();
@@ -3189 +3163 @@
 #endif /* FEATURE_VI_YANKMARK */
     case '$':           // $- goto end of line
-    case VI_K_END:      // Cursor Key End
-        if (cmdcnt-- > 1) {
+    case KEYCODE_END:       // Cursor Key End
+        if (--cmdcnt > 0) {
+            dot_next();
             do_cmd(c);
-        }               // repeat cnt
+        }
         dot = end_line(dot);
         break;
@@ -3216 +3191 @@
         // dont separate these two commands. 'f' depends on ';'
         //
-        //**** fall thru to ... ';'
+        //**** fall through to ... ';'
     case ';':           // ;- look at rest of line for last forward char
-        if (cmdcnt-- > 1) {
+        if (--cmdcnt > 0) {
             do_cmd(';');
-        }               // repeat cnt
+        }
         if (last_forward_char == 0)
             break;
@@ -3230 +3205 @@
             dot = q;
         break;
+    case ',':           // repeat latest 'f' in opposite direction
+        if (--cmdcnt > 0) {
+            do_cmd(',');
+        }
+        if (last_forward_char == 0)
+            break;
+        q = dot - 1;
+        while (q >= text && *q != '\n' && *q != last_forward_char) {
+            q--;
+        }
+        if (q >= text && *q == last_forward_char)
+            dot = q;
+        break;
+
     case '-':           // -- goto prev line
-        if (cmdcnt-- > 1) {
+        if (--cmdcnt > 0) {
             do_cmd(c);
-        }               // repeat cnt
+        }
         dot_prev();
         dot_skip_over_ws();
@@ -3241 +3230 @@
         // Stuff the last_modifying_cmd back into stdin
         // and let it be re-executed.
-        if (last_modifying_cmd != 0) {
+        if (lmc_len > 0) {
+            last_modifying_cmd[lmc_len] = 0;
             ioq = ioq_start = xstrdup(last_modifying_cmd);
         }
@@ -3252 +3242 @@
         buf[1] = '\0';
         q = get_input_line(buf);    // get input line- use "status line"
-        if (q[0] && !q[1])
+        if (q[0] && !q[1]) {
+            if (last_search_pattern[0])
+                last_search_pattern[0] = c;
             goto dc3; // if no pat re-use old pat
+        }
         if (q[0]) {       // strlen(q) > 1: new pat- save it and find
             // there is a new pat
@@ -3263 +3256 @@
         break;
     case 'N':           // N- backward search for last pattern
-        if (cmdcnt-- > 1) {
+        if (--cmdcnt > 0) {
             do_cmd(c);
-        }               // repeat cnt
+        }
         dir = BACK;     // assume BACKWARD search
         p = dot - 1;
@@ -3277 +3270 @@
         // search rest of text[] starting at next char
         // if search fails return orignal "p" not the "p+1" address
-        if (cmdcnt-- > 1) {
+        if (--cmdcnt > 0) {
             do_cmd(c);
-        }               // repeat cnt
+        }
  dc3:
-        if (last_search_pattern == 0) {
-            msg = "No previous regular expression";
-            goto dc2;
-        }
-        if (last_search_pattern[0] == '/') {
-            dir = FORWARD;  // assume FORWARD search
-            p = dot + 1;
-        }
+        dir = FORWARD;  // assume FORWARD search
+        p = dot + 1;
         if (last_search_pattern[0] == '?') {
             dir = BACK;
@@ -3317 +3304 @@
  dc2:
         if (*msg)
-            psbs("%s", msg);
+            status_line_bold("%s", msg);
         break;
     case '{':           // {- move backward paragraph
@@ -3358 +3345 @@
         if (cnt <= 0)
             break;
-        if (strncasecmp(p, "quit", cnt) == 0
-         || strncasecmp(p, "q!", cnt) == 0   // delete lines
+        if (strncmp(p, "quit", cnt) == 0
+         || strncmp(p, "q!", cnt) == 0   // delete lines
         ) {
             if (file_modified && p[1] != '!') {
-                psbs("No write since last change (:quit! overrides)");
+                status_line_bold("No write since last change (:quit! overrides)");
             } else {
                 editing = 0;
             }
-        } else if (strncasecmp(p, "write", cnt) == 0
-                || strncasecmp(p, "wq", cnt) == 0
-                || strncasecmp(p, "wn", cnt) == 0
-                || strncasecmp(p, "x", cnt) == 0
+        } else if (strncmp(p, "write", cnt) == 0
+                || strncmp(p, "wq", cnt) == 0
+                || strncmp(p, "wn", cnt) == 0
+                || (p[0] == 'x' && !p[1])
         ) {
             cnt = file_write(current_filename, text, end - 1);
             if (cnt < 0) {
                 if (cnt == -1)
-                    psbs("Write error: %s", strerror(errno));
+                    status_line_bold("Write error: %s", strerror(errno));
             } else {
                 file_modified = 0;
                 last_file_modified = -1;
-                psb("\"%s\" %dL, %dC", current_filename, count_lines(text, end - 1), cnt);
+                status_line("\"%s\" %dL, %dC", current_filename, count_lines(text, end - 1), cnt);
                 if (p[0] == 'x' || p[1] == 'q' || p[1] == 'n'
                  || p[0] == 'X' || p[1] == 'Q' || p[1] == 'N'
@@ -3385 +3372 @@
                 }
             }
-        } else if (strncasecmp(p, "file", cnt) == 0) {
+        } else if (strncmp(p, "file", cnt) == 0) {
             last_status_cksum = 0;  // force status update
         } else if (sscanf(p, "%d", &j) > 0) {
             dot = find_line(j);     // go to line # j
             dot_skip_over_ws();
-        } else {        // unrecognised cmd
-            ni(p);
+        } else {        // unrecognized cmd
+            not_implemented(p);
         }
 #endif /* !FEATURE_VI_COLON */
@@ -3427 +3414 @@
     case 'A':           // A- append at e-o-l
         dot_end();      // go to e-o-l
-        //**** fall thru to ... 'a'
+        //**** fall through to ... 'a'
     case 'a':           // a- append after current char
         if (*dot != '\n')
@@ -3436 +3423 @@
     case 'E':           // E- end of a blank-delimited word
     case 'W':           // W- forward a blank-delimited word
-        if (cmdcnt-- > 1) {
+        if (--cmdcnt > 0) {
             do_cmd(c);
-        }               // repeat cnt
+        }
         dir = FORWARD;
         if (c == 'B')
@@ -3462 +3449 @@
 #endif
         break;
+    case 'g': // 'gg' goto a line number (vim) (default: very first line)
+        c1 = get_one_char();
+        if (c1 != 'g') {
+            buf[0] = 'g';
+            buf[1] = c1; // TODO: if Unicode?
+            buf[2] = '\0';
+            not_implemented(buf);
+            break;
+        }
+        if (cmdcnt == 0)
+            cmdcnt = 1;
+        /* fall through */
     case 'G':       // G- goto to a line number (default= E-O-F)
         dot = end - 1;              // assume E-O-F
@@ -3474 +3473 @@
             cmdcnt = (rows - 1);
         }
-        if (cmdcnt-- > 1) {
+        if (--cmdcnt > 0) {
             do_cmd('+');
-        }               // repeat cnt
+        }
         dot_skip_over_ws();
         break;
@@ -3482 +3481 @@
         dot_begin();    // 0
         dot_skip_over_ws();
-        //**** fall thru to ... 'i'
+        //**** fall through to ... 'i'
     case 'i':           // i- insert before current char
-    case VI_K_INSERT:   // Cursor Key Insert
+    case KEYCODE_INSERT:    // Cursor Key Insert
  dc_i:
         cmd_mode = 1;   // start insrting
         break;
     case 'J':           // J- join current and next lines together
-        if (cmdcnt-- > 2) {
+        if (--cmdcnt > 1) {
             do_cmd(c);
-        }               // repeat cnt
+        }
         dot_end();      // move to NL
         if (dot < end - 1) {    // make sure not last char in text[]
@@ -3507 +3506 @@
             cmdcnt = (rows - 1);
         }
-        if (cmdcnt-- > 1) {
+        if (--cmdcnt > 0) {
             do_cmd('-');
-        }               // repeat cnt
+        }
         dot_begin();
         dot_skip_over_ws();
@@ -3537 +3536 @@
         cmd_mode = 2;
         break;
+    case KEYCODE_DELETE:
+        c = 'x';
+        // fall through
     case 'X':           // X- delete char before dot
     case 'x':           // x- delete the current char
     case 's':           // s- substitute the current char
-        if (cmdcnt-- > 1) {
+        if (--cmdcnt > 0) {
             do_cmd(c);
-        }               // repeat cnt
+        }
         dir = 0;
         if (c == 'X')
@@ -3564 +3566 @@
         if (file_modified) {
             if (ENABLE_FEATURE_VI_READONLY && readonly_mode) {
-                psbs("\"%s\" File is read only", current_filename);
+                status_line_bold("\"%s\" File is read only", current_filename);
                 break;
             }
@@ -3570 +3572 @@
             if (cnt < 0) {
                 if (cnt == -1)
-                    psbs("Write error: %s", strerror(errno));
+                    status_line_bold("Write error: %s", strerror(errno));
             } else if (cnt == (end - 1 - text + 1)) {
                 editing = 0;
@@ -3584 +3586 @@
     case 'b':           // b- back a word
     case 'e':           // e- end of word
-        if (cmdcnt-- > 1) {
+        if (--cmdcnt > 0) {
             do_cmd(c);
-        }               // repeat cnt
+        }
         dir = FORWARD;
         if (c == 'b')
@@ -3608 +3610 @@
     case 'Y':           // Y- Yank a line
 #endif
+    {
+        int yf, ml, whole = 0;
         yf = YANKDEL;   // assume either "c" or "d"
 #if ENABLE_FEATURE_VI_YANKMARK
@@ -3616 +3620 @@
         if (c != 'Y')
             c1 = get_one_char();    // get the type of thing to delete
-        find_range(&p, &q, c1);
+        // determine range, and whether it spans lines
+        ml = find_range(&p, &q, c1);
         if (c1 == 27) { // ESC- user changed mind and wants out
             c = c1 = 27;    // Escape- do nothing
@@ -3628 +3633 @@
                 }
             }
-            dot = yank_delete(p, q, 0, yf); // delete word
-        } else if (strchr("^0bBeEft$", c1)) {
-            // single line copy text into a register and delete
-            dot = yank_delete(p, q, 0, yf); // delete word
-        } else if (strchr("cdykjHL%+-{}\r\n", c1)) {
-            // multiple line copy text into a register and delete
-            dot = yank_delete(p, q, 1, yf); // delete lines
+            dot = yank_delete(p, q, ml, yf);    // delete word
+        } else if (strchr("^0bBeEft%$ lh\b\177", c1)) {
+            // partial line copy text into a register and delete
+            dot = yank_delete(p, q, ml, yf);    // delete word
+        } else if (strchr("cdykjHL+-{}\r\n", c1)) {
+            // whole line copy text into a register and delete
+            dot = yank_delete(p, q, ml, yf);    // delete lines
+            whole = 1;
+        } else {
+            // could not recognize object
+            c = c1 = 27;    // error-
+            ml = 0;
+            indicate_error(c);
+        }
+        if (ml && whole) {
             if (c == 'c') {
                 dot = char_insert(dot, '\n');
                 // on the last line of file don't move to prev line
-                if (dot != (end-1)) {
+                if (whole && dot != (end-1)) {
                     dot_prev();
                 }
@@ -3645 +3658 @@
                 dot_skip_over_ws();
             }
-        } else {
-            // could not recognize object
-            c = c1 = 27;    // error-
-            indicate_error(c);
         }
         if (c1 != 27) {
@@ -3669 +3678 @@
                     cnt++;
             }
-            psb("%s %d lines (%d chars) using [%c]",
+            status_line("%s %d lines (%d chars) using [%c]",
                 buf, cnt, strlen(reg[YDreg]), what_reg());
 #endif
@@ -3675 +3684 @@
         }
         break;
+    }
     case 'k':           // k- goto prev line, same col
-    case VI_K_UP:       // cursor key Up
-        if (cmdcnt-- > 1) {
+    case KEYCODE_UP:        // cursor key Up
+        if (--cmdcnt > 0) {
             do_cmd(c);
-        }               // repeat cnt
+        }
         dot_prev();
         dot = move_to_col(dot, ccol + offset);  // try stay in same col
@@ -3687 +3697 @@
         if (*dot != '\n') {
             *dot = c1;
-            file_modified++;    // has the file been modified
+            file_modified++;
         }
         end_cmd_q();    // stop adding to q
@@ -3696 +3706 @@
         if (*dot == last_forward_char)
             dot_left();
-        last_forward_char= 0;
+        last_forward_char = 0;
         break;
     case 'w':           // w- forward a word
-        if (cmdcnt-- > 1) {
+        if (--cmdcnt > 0) {
             do_cmd(c);
-        }               // repeat cnt
+        }
         if (isalnum(*dot) || *dot == '_') { // we are on ALNUM
             dot = skip_thing(dot, 1, FORWARD, S_END_ALNUM);
@@ -3727 +3737 @@
         break;
     case '~':           // ~- flip the case of letters   a-z -> A-Z
-        if (cmdcnt-- > 1) {
+        if (--cmdcnt > 0) {
             do_cmd(c);
-        }               // repeat cnt
+        }
         if (islower(*dot)) {
             *dot = toupper(*dot);
-            file_modified++;    // has the file been modified
+            file_modified++;
         } else if (isupper(*dot)) {
             *dot = tolower(*dot);
-            file_modified++;    // has the file been modified
+            file_modified++;
         }
         dot_right();
@@ -3741 +3751 @@
         break;
         //----- The Cursor and Function Keys -----------------------------
-    case VI_K_HOME: // Cursor Key Home
+    case KEYCODE_HOME:  // Cursor Key Home
         dot_begin();
         break;
         // The Fn keys could point to do_macro which could translate them
-    case VI_K_FUN1: // Function Key F1
-    case VI_K_FUN2: // Function Key F2
-    case VI_K_FUN3: // Function Key F3
-    case VI_K_FUN4: // Function Key F4
-    case VI_K_FUN5: // Function Key F5
-    case VI_K_FUN6: // Function Key F6
-    case VI_K_FUN7: // Function Key F7
-    case VI_K_FUN8: // Function Key F8
-    case VI_K_FUN9: // Function Key F9
-    case VI_K_FUN10:    // Function Key F10
-    case VI_K_FUN11:    // Function Key F11
-    case VI_K_FUN12:    // Function Key F12
-        break;
+#if 0
+    case KEYCODE_FUN1:  // Function Key F1
+    case KEYCODE_FUN2:  // Function Key F2
+    case KEYCODE_FUN3:  // Function Key F3
+    case KEYCODE_FUN4:  // Function Key F4
+    case KEYCODE_FUN5:  // Function Key F5
+    case KEYCODE_FUN6:  // Function Key F6
+    case KEYCODE_FUN7:  // Function Key F7
+    case KEYCODE_FUN8:  // Function Key F8
+    case KEYCODE_FUN9:  // Function Key F9
+    case KEYCODE_FUN10: // Function Key F10
+    case KEYCODE_FUN11: // Function Key F11
+    case KEYCODE_FUN12: // Function Key F12
+        break;
+#endif
     }
 
@@ -3782 +3794 @@
 }
 
+/* NB!  the CRASHME code is unmaintained, and doesn't currently build */
 #if ENABLE_FEATURE_VI_CRASHME
 static int totalcmds = 0;
@@ -3791 +3804 @@
 static int Pp = 99;             // Put command Probability
 static int M = 0, N = 0, I = 0, D = 0, Y = 0, P = 0, U = 0;
-const char chars[20] = "\t012345 abcdABCD-=.$";
-const char *const words[20] = {
+static const char chars[20] = "\t012345 abcdABCD-=.$";
+static const char *const words[20] = {
     "this", "is", "a", "test",
     "broadcast", "the", "emergency", "of",
@@ -3799 +3812 @@
     "back", "January", "Febuary", "March"
 };
-const char *const lines[20] = {
+static const char *const lines[20] = {
     "You should have received a copy of the GNU General Public License\n",
     "char c, cm, *cmd, *cmd1;\n",
@@ -3821 +3834 @@
     "This is too much english for a computer geek.\n",
 };
-char *multilines[20] = {
+static char *multilines[20] = {
     "You should have received a copy of the GNU General Public License\n",
     "char c, cm, *cmd, *cmd1;\n",
@@ -3855 +3868 @@
 
     // is there already a command running?
-    if (readed_for_parse > 0)
+    if (readbuffer[0] > 0)
         goto cd1;
  cd0:
-    startrbi = rbi = 0;
+    readbuffer[0] = 'X';
+    startrbi = rbi = 1;
     sleeptime = 0;          // how long to pause between commands
-    memset(readbuffer, '\0', MAX_LINELEN);   // clear the read buffer
+    memset(readbuffer, '\0', sizeof(readbuffer));
     // generate a command by percentages
     percent = (int) lrand48() % 100;        // get a number from 0-99
@@ -3932 +3946 @@
         strcat(readbuffer, "\033");
     }
-    readed_for_parse = strlen(readbuffer);
+    readbuffer[0] = strlen(readbuffer + 1);
  cd1:
     totalcmds++;
@@ -3945 +3959 @@
 
     time_t tim;
-    char d[2], msg[MAX_LINELEN];
+    char d[2], msg[80];
 
     msg[0] = '\0';
@@ -3968 +3982 @@
 
     if (msg[0]) {
-        alarm(0);
         printf("\n\n%d: \'%c\' %s\n\n\n%s[Hit return to continue]%s",
             totalcmds, last_input_char, msg, SOs, SOn);
-        fflush(stdout);
-        while (read(0, d, 1) > 0) {
+        fflush_all();
+        while (safe_read(STDIN_FILENO, d, 1) > 0) {
             if (d[0] == '\n' || d[0] == '\r')
                 break;
         }
-        alarm(3);
-    }
-    tim = (time_t) time((time_t *) 0);
+    }
+    tim = time(NULL);
     if (tim >= (oldtim + 3)) {
         sprintf(status_buffer,