1 files changed, 26 insertions, 1 deletions

diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 93ab86426..7f64a9691 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -338,7 +338,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];
@@ -643,6 +643,7 @@ static char *username_path_completion(char *ud)
         if (*ud == '/') {       /* "~/..." */
                 home = home_pwd_buf;
         } else {
+#if !ENABLE_PLATFORM_MINGW32
                 /* "~user/..." */
                 ud = strchr(ud, '/');
                 *ud = '\0';           /* "~user" */
@@ -650,6 +651,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);
@@ -664,15 +666,18 @@ static char *username_path_completion(char *ud)
  */
 static NOINLINE unsigned complete_username(const char *ud)
 {
+#if !ENABLE_PLATFORM_MINGW32
         /* Using _r function to avoid pulling in static buffers */
         char line_buff[256];
         struct passwd pwd;
         struct passwd *result;
+#endif
         unsigned userlen;
 
         ud++; /* skip ~ */
         userlen = strlen(ud);
 
+#if !ENABLE_PLATFORM_MINGW32
         setpwent();
         while (!getpwent_r(&pwd, line_buff, sizeof(line_buff), &result)) {
                 /* Null usernames should result in all users as possible completions. */
@@ -681,6 +686,7 @@ static NOINLINE unsigned complete_username(const char *ud)
                 }
         }
         endpwent();
+#endif
 
         return 1 + userlen;
 }
@@ -711,7 +717,11 @@ static int path_parse(char ***p)
         tmp = (char*)pth;
         npth = 1; /* path component count */
         while (1) {
+#if ENABLE_PLATFORM_MINGW32
+                tmp = next_path_sep(tmp);
+#else
                 tmp = strchr(tmp, ':');
+#endif
                 if (!tmp)
                         break;
                 tmp++;
@@ -724,7 +734,11 @@ static int path_parse(char ***p)
         res[0] = tmp = xstrdup(pth);
         npth = 1;
         while (1) {
+#if ENABLE_PLATFORM_MINGW32
+                tmp = next_path_sep(tmp);
+#else
                 tmp = strchr(tmp, ':');
+#endif
                 if (!tmp)
                         break;
                 *tmp++ = '\0'; /* ':' -> '\0' */
@@ -1863,7 +1877,11 @@ static void parse_and_put_prompt(const char *prmt_ptr)
                                                         /* /home/user[/something] -> ~[/something] */
                                                         l = strlen(home_pwd_buf);
                                                         if (l != 0
+#if !ENABLE_PLATFORM_MINGW32
                                                          && strncmp(home_pwd_buf, cwd_buf, l) == 0
+#else
+                                                         && strncasecmp(home_pwd_buf, cwd_buf, l) == 0
+#endif
                                                          && (cwd_buf[l] == '/' || cwd_buf[l] == '\0')
                                                         ) {
                                                                 cwd_buf[0] = '~';
@@ -2210,9 +2228,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, sizeof(initial_settings.c_cc), 0);
+        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)
         ) {
+#endif
                 /* Happens when e.g. stty -echo was run before */
                 parse_and_put_prompt(prompt);
                 /* fflush_all(); - done by parse_and_put_prompt */