1 files changed, 123 insertions, 3 deletions

diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 31e392147..5d9080131 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -354,7 +354,7 @@ int adjust_width_and_validate_wc(unsigned *width_adj, int wc);
 /* Put 'command_ps[cursor]', cursor++.
  * Advance cursor on screen. If we reached right margin, scroll text up
  * and remove terminal margin effect by printing 'next_char' */
-#define HACK_FOR_WRONG_WIDTH 1
+#define HACK_FOR_WRONG_WIDTH 1 && !ENABLE_PLATFORM_MINGW32
 static void put_cur_glyph_and_inc_cursor(void)
 {
         CHAR_T c = command_ps[cursor];
@@ -417,6 +417,42 @@ static void put_cur_glyph_and_inc_cursor(void)
         }
 }
 
+#if ENABLE_PLATFORM_MINGW32
+static void inc_cursor(void)
+{
+        CHAR_T c = command_ps[cursor];
+        unsigned width = 0;
+        int ofs_to_right;
+
+        /* advance cursor */
+        cursor++;
+        if (unicode_status == UNICODE_ON) {
+                IF_UNICODE_WIDE_WCHARS(width = cmdedit_x;)
+                c = adjust_width_and_validate_wc(&cmdedit_x, c);
+                IF_UNICODE_WIDE_WCHARS(width = cmdedit_x - width;)
+        } else {
+                cmdedit_x++;
+        }
+
+        ofs_to_right = cmdedit_x - cmdedit_termw;
+        if (!ENABLE_UNICODE_WIDE_WCHARS || ofs_to_right <= 0) {
+                /* cursor remains on this line */
+                printf(ESC"[1C");
+        }
+
+        if (ofs_to_right >= 0) {
+                /* we go to the next line */
+                printf(ESC"[1B");
+                bb_putchar('\r');
+                cmdedit_y++;
+                if (!ENABLE_UNICODE_WIDE_WCHARS || ofs_to_right == 0) {
+                        width = 0;
+                }
+                cmdedit_x = width;
+        }
+}
+#endif
+
 /* Move to end of line (by printing all chars till the end) */
 static void put_till_end_and_adv_cursor(void)
 {
@@ -469,6 +505,7 @@ static void input_backward(unsigned num)
 
         if (cmdedit_x >= num) {
                 cmdedit_x -= num;
+#if !ENABLE_PLATFORM_MINGW32
                 if (num <= 4) {
                         /* This is longer by 5 bytes on x86.
                          * Also gets miscompiled for ARM users
@@ -481,6 +518,7 @@ static void input_backward(unsigned num)
                         } while (--num);
                         return;
                 }
+#endif
                 printf(ESC"[%uD", num);
                 return;
         }
@@ -610,7 +648,11 @@ static void input_backspace(void)
 static void input_forward(void)
 {
         if (cursor < command_len)
+#if !ENABLE_PLATFORM_MINGW32
                 put_cur_glyph_and_inc_cursor();
+#else
+                inc_cursor();
+#endif
 }
 
 #if ENABLE_FEATURE_TAB_COMPLETION
@@ -638,6 +680,14 @@ static void add_match(char *matched)
         num_matches++;
 }
 
+#if ENABLE_FEATURE_SH_STANDALONE && NUM_APPLETS != 1
+static void add_partial_match(const char *part, const char *full, int plen)
+{
+        if (strncmp(part, full, plen) == 0)
+                add_match(xstrdup(full));
+}
+#endif
+
 # if ENABLE_FEATURE_USERNAME_COMPLETION
 /* Replace "~user/..." with "/homedir/...".
  * The parameter is malloced, free it or return it
@@ -718,7 +768,11 @@ static int path_parse(char ***p)
         tmp = (char*)pth;
         npth = 1; /* path component count */
         while (1) {
+#if ENABLE_PLATFORM_MINGW32
+                tmp = (char *)next_path_sep(tmp);
+#else
                 tmp = strchr(tmp, ':');
+#endif
                 if (!tmp)
                         break;
                 tmp++;
@@ -731,7 +785,11 @@ static int path_parse(char ***p)
         res[0] = tmp = xstrdup(pth);
         npth = 1;
         while (1) {
+#if ENABLE_PLATFORM_MINGW32
+                tmp = (char *)next_path_sep(tmp);
+#else
                 tmp = strchr(tmp, ':');
+#endif
                 if (!tmp)
                         break;
                 *tmp++ = '\0'; /* ':' -> '\0' */
@@ -781,11 +839,11 @@ static NOINLINE unsigned complete_cmd_dir_file(const char *command, int type)
                 const char *p = applet_names;
 
                 while (*p) {
-                        if (strncmp(pfind, p, pf_len) == 0)
-                                add_match(xstrdup(p));
+                        add_partial_match(pfind, p, pf_len);
                         while (*p++ != '\0')
                                 continue;
                 }
+                add_partial_match(pfind, "busybox", pf_len);
         }
 #endif
 
@@ -817,6 +875,9 @@ static NOINLINE unsigned complete_cmd_dir_file(const char *command, int type)
                         if (stat(found, &st) && lstat(found, &st))
                                 goto cont; /* hmm, remove in progress? */
 
+                        if (type == FIND_EXE_ONLY && !file_is_executable(found))
+                                goto cont;
+
                         /* Save only name */
                         len = strlen(name_found);
                         found = xrealloc(found, len + 2); /* +2: for slash and NUL */
@@ -1898,7 +1959,16 @@ static void parse_and_put_prompt(const char *prmt_ptr)
                                                         char *after_home_user;
 
                                                         /* /home/user[/something] -> ~[/something] */
+#if !ENABLE_PLATFORM_MINGW32
                                                         after_home_user = is_prefixed_with(cwd_buf, home_pwd_buf);
+#else
+                                                        after_home_user = NULL;
+                                                        l = strlen(home_pwd_buf);
+                                                        if (l != 0
+                                                         && strncasecmp(home_pwd_buf, cwd_buf, l) == 0) {
+                                                                after_home_user = cwd_buf + l;
+                                                        }
+#endif
                                                         if (after_home_user
                                                          && (*after_home_user == '/' || *after_home_user == '\0')
                                                         ) {
@@ -2272,9 +2342,16 @@ int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *comman
 
         INIT_S();
 
+#if ENABLE_PLATFORM_MINGW32
+        memset(initial_settings.c_cc, 0, sizeof(initial_settings.c_cc));
+        initial_settings.c_cc[VINTR] = CTRL('C');
+        initial_settings.c_cc[VEOF] = CTRL('D');
+        if (!isatty(0) || !isatty(1)) {
+#else
         if (tcgetattr(STDIN_FILENO, &initial_settings) < 0
          || (initial_settings.c_lflag & (ECHO|ICANON)) == ICANON
         ) {
+#endif
                 /* Happens when e.g. stty -echo was run before.
                  * But if ICANON is not set, we don't come here.
                  * (example: interactive python ^Z-backgrounded,
@@ -2383,6 +2460,11 @@ int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *comman
                 }
 
                 ic = ic_raw = lineedit_read_key(read_key_buffer, timeout);
+#if ENABLE_PLATFORM_MINGW32
+                /* scroll to cursor position on any keypress */
+                if (isatty(fileno(stdin)) && isatty(fileno(stdout)))
+                        move_cursor_row(0);
+#endif
 
 #if ENABLE_FEATURE_REVERSE_SEARCH
  again:
@@ -2650,6 +2732,44 @@ int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *comman
                                 vi_cmdmode = 1;
                                 input_backward(1);
                         }
+                        /* Handle a few ESC-<key> combinations the same way
+                         * standard readline bindings (IOW: bash) do.
+                         * Often, Alt-<key> generates ESC-<key>.
+                         */
+                        ic = lineedit_read_key(read_key_buffer, 20);
+                        switch (ic) {
+                                //case KEYCODE_LEFT: - bash doesn't do this
+                                case 'b':
+                                        ctrl_left();
+                                        break;
+                                //case KEYCODE_RIGHT: - bash doesn't do this
+                                case 'f':
+                                        ctrl_right();
+                                        break;
+                                //case KEYCODE_DELETE: - bash doesn't do this
+                                case 'd':  /* Alt-D */
+                                {
+                                        /* Delete word forward */
+                                        int nc, sc = cursor;
+                                        ctrl_right();
+                                        nc = cursor - sc;
+                                        input_backward(nc);
+                                        while (--nc >= 0)
+                                                input_delete(1);
+                                        break;
+                                }
+                                case '\b':   /* Alt-Backspace(?) */
+                                case '\x7f': /* Alt-Backspace(?) */
+                                //case 'w': - bash doesn't do this
+                                {
+                                        /* Delete word backward */
+                                        int sc = cursor;
+                                        ctrl_left();
+                                        while (sc-- > cursor)
+                                                input_delete(1);
+                                        break;
+                                }
+                        }
                         break;
 #endif /* FEATURE_COMMAND_EDITING_VI */