Merge branch 'busybox' into merge

1 files changed, 107 insertions, 85 deletions

diff --git a/editors/vi.c b/editors/vi.c
index c5dff3fee..c791a32e1 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -7,7 +7,7 @@
  */
 //
 //Things To Do:
-//      $HOME/.exrc  and  ./.exrc
+//      ./.exrc
 //      add magic to search     /foo.*bar
 //      add :help command
 //      :map macros
@@ -185,7 +185,7 @@
 //usage:#define vi_full_usage "\n\n"
 //usage:       "Edit FILE\n"
 //usage:        IF_FEATURE_VI_COLON(
-//usage:     "\n        -c CMD  Initial command to run ($EXINIT also available)"
+//usage:     "\n        -c CMD  Initial command to run ($EXINIT and ~/.exrc also available)"
 //usage:        )
 //usage:        IF_FEATURE_VI_READONLY(
 //usage:     "\n        -R      Read-only"
@@ -201,6 +201,7 @@
 
 // the CRASHME code is unmaintained, and doesn't currently build
 #define ENABLE_FEATURE_VI_CRASHME 0
+#define IF_FEATURE_VI_CRASHME(...)
 
 
 #if ENABLE_LOCALE_SUPPORT
@@ -405,7 +406,7 @@ struct globals {
         int cindex;               // saved character index for up/down motion
         smallint keep_index;      // retain saved character index
 #if ENABLE_FEATURE_VI_COLON
-        char *initial_cmds[3];  // currently 2 entries, NULL terminated
+        llist_t *initial_cmds;
 #endif
         // Should be just enough to hold a key sequence,
         // but CRASHME mode uses it as generated command buffer too
@@ -1405,21 +1406,14 @@ 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, ESC_NORM_TEXT);
-                        d += sizeof(ESC_NORM_TEXT)-1;
-                        c = '.';
-                }
+                if ((c & 0x80) && !Isprint(c))
+                        c = '?';
                 if (c < ' ' || c == 0x7f) {
                         *d++ = '^';
                         c |= '@'; // 0x40
@@ -1428,14 +1422,6 @@ static void print_literal(char *buf, const char *s)
                 }
                 *d++ = c;
                 *d = '\0';
-                if (c_is_no_print) {
-                        strcpy(d, ESC_BOLD_TEXT);
-                        d += sizeof(ESC_BOLD_TEXT)-1;
-                }
-                if (*s == '\n') {
-                        *d++ = '$';
-                        *d = '\0';
-                }
                 if (d - buf > MAX_INPUT_LEN - 10) // paranoia
                         break;
         }
@@ -2592,8 +2578,13 @@ static char *get_one_address(char *p, int *result)	// get colon addr, if present
                                 dir = ((unsigned)BACK << 1) | FULL;
                         }
                         q = char_search(q, last_search_pattern + 1, dir);
-                        if (q == NULL)
-                                return NULL;
+                        if (q == NULL) {
+                                // no match, continue from other end of file
+                                q = char_search(dir > 0 ? text : end - 1,
+                                                                last_search_pattern + 1, dir);
+                                if (q == NULL)
+                                        return NULL;
+                        }
                         new_addr = count_lines(text, q);
                 }
 # endif
@@ -2894,10 +2885,12 @@ static void colon(char *buf)
         // :!<cmd>      // run <cmd> then return
         //
 
-        if (!buf[0])
-                goto ret;
-        if (*buf == ':')
-                buf++;                  // move past the ':'
+        while (*buf == ':')
+                buf++;                  // move past leading colons
+        while (isblank(*buf))
+                buf++;                  // move past leading blanks
+        if (!buf[0] || buf[0] == '"')
+                goto ret;               // ignore empty lines or those starting with '"'
 
         li = i = 0;
         b = e = -1;
@@ -4155,8 +4148,8 @@ static void do_cmd(int c)
 #endif
                                         }
                                 }
-                        } else /* if (c == '>') */ {
-                                // shift right -- add tab or tabstop spaces
+                        } else if (/* c == '>' && */ p != end_line(p)) {
+                                // shift right -- add tab or tabstop spaces on non-empty lines
                                 char_insert(p, '\t', allow_undo);
                         }
 #if ENABLE_FEATURE_VI_UNDO
@@ -4774,6 +4767,21 @@ static void crash_test()
 }
 #endif
 
+#if ENABLE_FEATURE_VI_COLON
+static void run_cmds(char *p)
+{
+        while (p) {
+                char *q = p;
+                p = strchr(q, '\n');
+                if (p)
+                        while (*p == '\n')
+                                *p++ = '\0';
+                if (strlen(q) < MAX_INPUT_LEN)
+                        colon(q);
+        }
+}
+#endif
+
 static void edit_file(char *fn)
 {
 #if ENABLE_FEATURE_VI_YANKMARK
@@ -4844,25 +4852,8 @@ static void edit_file(char *fn)
 #endif
 
 #if ENABLE_FEATURE_VI_COLON
-        {
-                char *p, *q;
-                int n = 0;
-
-                while ((p = initial_cmds[n]) != NULL) {
-                        do {
-                                q = p;
-                                p = strchr(q, '\n');
-                                if (p)
-                                        while (*p == '\n')
-                                                *p++ = '\0';
-                                if (*q)
-                                        colon(q);
-                        } while (p);
-                        free(initial_cmds[n]);
-                        initial_cmds[n] = NULL;
-                        n++;
-                }
-        }
+        while (initial_cmds)
+                run_cmds((char *)llist_pop(&initial_cmds));
 #endif
         redraw(FALSE);                  // dont force every col re-draw
         //------This is the main Vi cmd handling loop -----------------------
@@ -4925,10 +4916,29 @@ static void edit_file(char *fn)
 #undef cur_line
 }
 
+#define VI_OPTSTR \
+        IF_FEATURE_VI_CRASHME("C") \
+        IF_FEATURE_VI_COLON("c:*") \
+        "Hh" \
+        IF_FEATURE_VI_READONLY("R")
+
+enum {
+        IF_FEATURE_VI_CRASHME(OPTBIT_C,)
+        IF_FEATURE_VI_COLON(OPTBIT_c,)
+        OPTBIT_H,
+        OPTBIT_h,
+        IF_FEATURE_VI_READONLY(OPTBIT_R,)
+        OPT_C = IF_FEATURE_VI_CRASHME(  (1 << OPTBIT_C)) + 0,
+        OPT_c = IF_FEATURE_VI_COLON(    (1 << OPTBIT_c)) + 0,
+        OPT_H = 1 << OPTBIT_H,
+        OPT_h = 1 << OPTBIT_h,
+        OPT_R = IF_FEATURE_VI_READONLY( (1 << OPTBIT_R)) + 0,
+};
+
 int vi_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int vi_main(int argc, char **argv)
 {
-        int c;
+        int opts;
 
         INIT_G();
 
@@ -4952,50 +4962,62 @@ int vi_main(int argc, char **argv)
 
         // 0: all of our options are disabled by default in vim
         //vi_setops = 0;
-        //  1-  process EXINIT variable from environment
-        //  2-  if EXINIT is unset process $HOME/.exrc file (not inplemented yet)
-        //  3-  process command line args
-#if ENABLE_FEATURE_VI_COLON
-        {
-                char *p = getenv("EXINIT");
-                if (p && *p)
-                        initial_cmds[0] = xstrndup(p, MAX_INPUT_LEN);
-        }
-#endif
-        while ((c = getopt(argc, argv,
-#if ENABLE_FEATURE_VI_CRASHME
-                        "C"
-#endif
-                        "RHh" IF_FEATURE_VI_COLON("c:"))) != -1) {
-                switch (c) {
+        opts = getopt32(argv, VI_OPTSTR IF_FEATURE_VI_COLON(, &initial_cmds));
+
 #if ENABLE_FEATURE_VI_CRASHME
-                case 'C':
-                        crashme = 1;
-                        break;
-#endif
-#if ENABLE_FEATURE_VI_READONLY
-                case 'R':               // Read-only flag
-                        SET_READONLY_MODE(readonly_mode);
-                        break;
-#endif
-#if ENABLE_FEATURE_VI_COLON
-                case 'c':               // cmd line vi command
-                        if (*optarg)
-                                initial_cmds[initial_cmds[0] != NULL] = xstrndup(optarg, MAX_INPUT_LEN);
-                        break;
+        if (opts & OPT_C)
+                crashme = 1;
 #endif
-                case 'H':
-                        show_help();
-                        // fall through
-                default:
-                        bb_show_usage();
-                        return 1;
-                }
+        if (opts & OPT_R)
+                SET_READONLY_MODE(readonly_mode);
+        if (opts & OPT_H)
+                show_help();
+        if (opts & (OPT_H | OPT_h)) {
+                bb_show_usage();
+                return 1;
         }
 
         argv += optind;
         cmdline_filecnt = argc - optind;
 
+        //  1-  process EXINIT variable from environment
+        //  2-  if EXINIT is unset process $HOME/.exrc file
+        //  3-  process command line args
+#if ENABLE_FEATURE_VI_COLON
+        {
+                const char *exinit = getenv("EXINIT");
+                char *cmds = NULL;
+
+                if (exinit) {
+                        cmds = xstrdup(exinit);
+                } else {
+                        const char *home = getenv("HOME");
+
+                        if (home && *home) {
+                                char *exrc = concat_path_file(home, ".exrc");
+                                struct stat st;
+
+                                // .exrc must belong to and only be writable by user
+                                if (stat(exrc, &st) == 0) {
+                                        if ((st.st_mode & (S_IWGRP|S_IWOTH)) == 0
+                                         && st.st_uid == getuid()
+                                        ) {
+                                                cmds = xmalloc_open_read_close(exrc, NULL);
+                                        } else {
+                                                status_line_bold(".exrc: permission denied");
+                                        }
+                                }
+                                free(exrc);
+                        }
+                }
+
+                if (cmds) {
+                        init_text_buffer(NULL);
+                        run_cmds(cmds);
+                        free(cmds);
+                }
+        }
+#endif
         // "Save cursor, use alternate screen buffer, clear screen"
         write1(ESC"[?1049h");
         // This is the main file handling loop