1 files changed, 148 insertions, 5 deletions

diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index e8d721e61..7c46fa5db 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -371,7 +371,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];
@@ -434,6 +434,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)
 {
@@ -493,6 +529,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
@@ -505,6 +542,7 @@ static void input_backward(unsigned num)
                         } while (--num);
                         return;
                 }
+#endif
                 printf(ESC"[%uD", num);
                 return;
         }
@@ -643,7 +681,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
@@ -654,6 +696,14 @@ static void input_forward(void)
 //Also, perhaps "foo b<TAB> needs to complete to "foo bar" <cursor>,
 //not "foo bar <cursor>...
 
+# if ENABLE_PLATFORM_MINGW32
+/* use case-insensitive comparisons for filenames */
+#  define is_prefixed_with(s, k) is_prefixed_with_case(s, k)
+#  define qsort_string_vector(s, c) qsort_string_vector_case(s, c)
+#  define strcmp(s, t) strcasecmp(s, t)
+#  define strncmp(s, t, n) strncasecmp(s, t, n)
+# endif
+
 static void free_tab_completion_data(void)
 {
         if (matches) {
@@ -670,8 +720,12 @@ static void add_match(char *matched)
         while (*p) {
                 /* ESC attack fix: drop any string with control chars */
                 if (*p < ' '
+# if !ENABLE_PLATFORM_MINGW32
                  || (!ENABLE_UNICODE_SUPPORT && *p >= 0x7f)
                  || (ENABLE_UNICODE_SUPPORT && *p == 0x7f)
+# else
+                 || *p == 0x7f
+# endif
                 ) {
                         free(matched);
                         return;
@@ -690,13 +744,16 @@ static void add_match(char *matched)
  */
 static char *username_path_completion(char *ud)
 {
+#  if !ENABLE_PLATFORM_MINGW32
         struct passwd *entry;
+#endif
         char *tilde_name = ud;
         char *home = NULL;
 
         ud++; /* skip ~ */
         if (*ud == '/') {       /* "~/..." */
                 home = home_pwd_buf;
+#  if !ENABLE_PLATFORM_MINGW32
         } else {
                 /* "~user/..." */
                 ud = strchr(ud, '/');
@@ -705,6 +762,7 @@ static char *username_path_completion(char *ud)
                 *ud = '/';            /* restore "~user/..." */
                 if (entry)
                         home = entry->pw_dir;
+#  endif
         }
         if (home) {
                 ud = concat_path_file(home, ud);
@@ -714,6 +772,7 @@ static char *username_path_completion(char *ud)
         return tilde_name;
 }
 
+#  if !ENABLE_PLATFORM_MINGW32
 /* ~use<tab> - find all users with this prefix.
  * Return the length of the prefix used for matching.
  */
@@ -736,6 +795,7 @@ static NOINLINE unsigned complete_username(const char *ud)
 
         return 1 + userlen;
 }
+#  endif
 # endif  /* FEATURE_USERNAME_COMPLETION */
 
 enum {
@@ -765,7 +825,7 @@ static unsigned path_parse(char ***p)
         tmp = (char*)pth;
         npth = 1; /* path component count */
         while (1) {
-                tmp = strchr(tmp, ':');
+                tmp = strchr(tmp, PATH_SEP);
                 if (!tmp)
                         break;
                 tmp++;
@@ -776,7 +836,7 @@ static unsigned path_parse(char ***p)
         res[0] = tmp = xstrdup(pth);
         npth = 1;
         while (1) {
-                tmp = strchr(tmp, ':');
+                tmp = strchr(tmp, PATH_SEP);
                 if (!tmp)
                         break;
                 *tmp++ = '\0'; /* ':' -> '\0' */
@@ -804,6 +864,17 @@ static NOINLINE unsigned complete_cmd_dir_file(const char *command, int type)
         path1[0] = (char*)".";
 
         basecmd = strrchr(command, '/');
+#if ENABLE_PLATFORM_MINGW32
+        if (!basecmd && has_dos_drive_prefix(command) && command[2] != '\0') {
+                char buffer[PATH_MAX];
+
+                /* path is of form c:path with no '/' */
+                if (get_drive_cwd(command, buffer, PATH_MAX)) {
+                        basecmd = command + 2;
+                        path1[0] = dirbuf = xstrdup(buffer);
+                }
+        } else
+#endif
         if (!basecmd) {
                 if (type == FIND_EXE_ONLY)
                         npaths = path_parse(&paths);
@@ -861,6 +932,9 @@ static NOINLINE unsigned complete_cmd_dir_file(const char *command, int type)
                 }
 
                 lpath = *paths[i] ? paths[i] : ".";
+#if ENABLE_PLATFORM_MINGW32
+                lpath = auto_string(alloc_system_drive(lpath));
+#endif
                 dir = opendir(lpath);
                 if (!dir)
                         continue; /* don't print an error */
@@ -883,6 +957,12 @@ 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 ENABLE_PLATFORM_MINGW32
+                        if (type == FIND_EXE_ONLY && S_ISREG(st.st_mode) &&
+                                        !(st.st_mode & S_IXUSR))
+                                goto cont;
+# endif
+
                         /* Save only name */
                         len = strlen(name_found);
                         found = xrealloc(found, len + 2); /* +2: for slash and NUL */
@@ -966,7 +1046,13 @@ static NOINLINE int build_match_prefix(char *match_buf)
 
         /* Mark every \c as "quoted c" */
         for (i = 0; int_buf[i]; i++) {
+#if ENABLE_PLATFORM_MINGW32
+                /* Trailing backslash is effectively removed which confuses
+                 * the code to display case-preserved filenames. */
+                if (int_buf[i] == '\\' && int_buf[i+1] != '\0') {
+#else
                 if (int_buf[i] == '\\') {
+#endif
                         remove_chunk(int_buf, i, i + 1);
                         int_buf[i] |= QUOT;
                 }
@@ -1167,6 +1253,11 @@ static NOINLINE void input_tab(smallint *lastWasTab)
         size_t len_found;
         /* Length of string used for matching */
         unsigned match_pfx_len = match_pfx_len;
+#if ENABLE_PLATFORM_MINGW32
+        unsigned orig_pfx_len;
+        char *target;
+        const char *source;
+#endif
         int find_type;
 # if ENABLE_UNICODE_SUPPORT
         /* cursor pos in command converted to multibyte form */
@@ -1214,7 +1305,7 @@ static NOINLINE void input_tab(smallint *lastWasTab)
         /* Free up any memory already allocated */
         free_tab_completion_data();
 
-# if ENABLE_FEATURE_USERNAME_COMPLETION
+# if ENABLE_FEATURE_USERNAME_COMPLETION && !ENABLE_PLATFORM_MINGW32
         /* If the word starts with ~ and there is no slash in the word,
          * then try completing this word as a username. */
         if (state->flags & USERNAME_COMPLETION)
@@ -1231,6 +1322,9 @@ static NOINLINE void input_tab(smallint *lastWasTab)
         {
                 const char *e = match_buf + strlen(match_buf);
                 const char *s = e - match_pfx_len;
+#if ENABLE_PLATFORM_MINGW32
+                orig_pfx_len = match_pfx_len;
+#endif
                 while (s < e)
                         if (is_special_char(*s++))
                                 match_pfx_len++;
@@ -1265,7 +1359,11 @@ static NOINLINE void input_tab(smallint *lastWasTab)
                 for (cp = chosen_match; *cp; cp++) {
                         unsigned n;
                         for (n = 1; n < num_matches; n++) {
+# if !ENABLE_PLATFORM_MINGW32
                                 if (matches[n][cp - chosen_match] != *cp) {
+# else
+                                if (tolower(matches[n][cp - chosen_match]) != tolower(*cp)) {
+# endif
                                         goto stop;
                                 }
                         }
@@ -1301,7 +1399,21 @@ static NOINLINE void input_tab(smallint *lastWasTab)
                 /* save tail */
                 strcpy(match_buf, &command_ps[cursor]);
                 /* add match and tail */
+#  if ENABLE_PLATFORM_MINGW32
+                if (match_pfx_len == orig_pfx_len) {
+                        /* replace match prefix to allow for altered case */
+                        target = &command_ps[cursor-match_pfx_len];
+                        source = chosen_match;
+                }
+                else {
+                        /* only replace tail of match if special characters are quoted */
+                        target = &command_ps[cursor];
+                        source = chosen_match + match_pfx_len;
+                }
+                strcpy(stpcpy(target, source), match_buf);
+#  else
                 sprintf(&command_ps[cursor], "%s%s", chosen_match + match_pfx_len, match_buf);
+#  endif
                 command_len = strlen(command_ps);
                 /* new pos */
                 pos = cursor + len_found - match_pfx_len;
@@ -1338,6 +1450,13 @@ static NOINLINE void input_tab(smallint *lastWasTab)
         free(match_buf);
 }
 
+# if ENABLE_PLATFORM_MINGW32
+#  undef is_prefixed_with
+#  undef qsort_string_vector
+#  undef strcmp
+#  undef strncmp
+# endif
+
 #endif  /* FEATURE_TAB_COMPLETION */
 
 
@@ -2383,7 +2502,7 @@ static void sigaction2(int sig, struct sigaction *act)
  */
 int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *command, int maxsize)
 {
-        int len, n;
+        int len IF_NOT_PLATFORM_MINGW32(, n);
         int timeout;
 #if ENABLE_FEATURE_TAB_COMPLETION
         smallint lastWasTab = 0;
@@ -2393,7 +2512,9 @@ int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *comman
         smallint vi_cmdmode = 0;
 #endif
         struct termios initial_settings;
+#if !ENABLE_PLATFORM_MINGW32
         struct termios new_settings;
+#endif
         char read_key_buffer[KEYCODE_BUFFER_SIZE];
 
         INIT_S();
@@ -2403,10 +2524,16 @@ int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *comman
         IF_USERNAME_OR_HOMEDIR(home_pwd_buf = (char*)null_str;)
         IF_FEATURE_EDITING_VI(delptr = delbuf;)
 
+#if !ENABLE_PLATFORM_MINGW32
         n = get_termios_and_make_raw(STDIN_FILENO, &new_settings, &initial_settings, 0
                 | TERMIOS_CLEAR_ISIG /* turn off INTR (ctrl-C), QUIT, SUSP */
         );
         if (n != 0 || (initial_settings.c_lflag & (ECHO|ICANON)) == ICANON) {
+#else
+        initial_settings.c_cc[VINTR] = CTRL('C');
+        initial_settings.c_cc[VEOF] = CTRL('D');
+        if (!isatty(0) || !isatty(1)) {
+#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,
@@ -2458,7 +2585,9 @@ int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *comman
 #endif
 #define command command_must_not_be_used
 
+#if !ENABLE_PLATFORM_MINGW32
         tcsetattr_stdin_TCSANOW(&new_settings);
+#endif
 
 #if ENABLE_USERNAME_OR_HOMEDIR
         {
@@ -2511,6 +2640,11 @@ int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *comman
                 }
 #endif
                 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:
@@ -2572,6 +2706,13 @@ int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *comman
                         input_tab(&lastWasTab);
                         break;
 #endif
+#if ENABLE_PLATFORM_MINGW32
+                case CTRL('Z'):
+                        command_ps[command_len] = '\0';
+                        bs_to_slash(command_ps);
+                        redraw(cmdedit_y, 0);
+                        break;
+#endif
                 case CTRL('K'):
                         /* Control-k -- clear to end of line */
                         command_ps[cursor] = BB_NUL;
@@ -2945,8 +3086,10 @@ int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *comman
         free_tab_completion_data();
 #endif
 
+#if !ENABLE_PLATFORM_MINGW32
         /* restore initial_settings */
         tcsetattr_stdin_TCSANOW(&initial_settings);
+#endif
 #if ENABLE_FEATURE_EDITING_WINCH
         /* restore SIGWINCH handler */
         sigaction_set(SIGWINCH, &S.SIGWINCH_handler);