20 files changed, 376 insertions, 23 deletions

diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src
index 898a51a89..fc9371db1 100644
--- a/libbb/Kbuild.src
+++ b/libbb/Kbuild.src
@@ -37,24 +37,19 @@ lib-y += fgets_str.o
 lib-y += find_pid_by_name.o
 lib-y += find_root_device.o
 lib-y += full_write.o
-lib-y += get_console.o
 lib-y += get_last_path_component.o
 lib-y += get_line_from_file.o
 lib-y += getopt32.o
-lib-y += getpty.o
 lib-y += get_volsize.o
 lib-y += herror_msg.o
 lib-y += human_readable.o
 lib-y += inet_common.o
 lib-y += inode_hash.o
 lib-y += isdirectory.o
-lib-y += kernel_version.o
 lib-y += last_char_is.o
 lib-y += lineedit.o lineedit_ptr_hack.o
 lib-y += llist.o
-lib-y += login.o
 lib-y += make_directory.o
-lib-y += makedev.o
 lib-y += hash_md5_sha.o
 # Alternative (disabled) MD5 implementation
 #lib-y += hash_md5prime.o
@@ -75,7 +70,6 @@ lib-y += progress.o
 lib-y += ptr_to_globals.o
 lib-y += read.o
 lib-y += read_printf.o
-lib-y += read_key.o
 lib-y += recursive_action.o
 lib-y += remove_file.o
 lib-y += run_shell.o
@@ -84,7 +78,6 @@ lib-y += safe_poll.o
 lib-y += safe_strncpy.o
 lib-y += safe_write.o
 lib-y += setup_environment.o
-lib-y += signals.o
 lib-y += simplify_path.o
 lib-y += single_argv.o
 lib-y += skip_whitespace.o
@@ -109,10 +102,20 @@ lib-y += xfuncs.o
 lib-y += xfuncs_printf.o
 lib-y += xfunc_die.o
 lib-y += xgetcwd.o
-lib-y += xgethostbyname.o
 lib-y += xreadlink.o
 lib-y += xrealloc_vector.o
 
+lib-$(CONFIG_PLATFORM_POSIX) += get_console.o
+lib-$(CONFIG_PLATFORM_POSIX) += getpty.o
+lib-$(CONFIG_PLATFORM_POSIX) += inet_common.o
+lib-$(CONFIG_PLATFORM_POSIX) += kernel_version.o
+lib-$(CONFIG_PLATFORM_POSIX) += login.o
+lib-$(CONFIG_PLATFORM_POSIX) += makedev.o
+lib-$(CONFIG_PLATFORM_POSIX) += read_key.o
+lib-$(CONFIG_PLATFORM_POSIX) += signals.o
+lib-$(CONFIG_PLATFORM_POSIX) += udp_io.o
+lib-$(CONFIG_PLATFORM_POSIX) += xgethostbyname.o
+
 lib-$(CONFIG_PLATFORM_LINUX) += match_fstype.o
 
 lib-$(CONFIG_FEATURE_UTMP) += utmp.o
@@ -124,7 +127,7 @@ lib-$(CONFIG_FEATURE_MTAB_SUPPORT) += mtab.o
 lib-$(CONFIG_UNICODE_SUPPORT) += unicode.o
 lib-$(CONFIG_FEATURE_CHECK_NAMES) += die_if_bad_username.o
 
-lib-$(CONFIG_NC) += udp_io.o
+lib-$(CONFIG_NC_110_COMPAT) += udp_io.o
 lib-$(CONFIG_DNSD) += udp_io.o
 lib-$(CONFIG_NTPD) += udp_io.o
 lib-$(CONFIG_TFTP) += udp_io.o
diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index ee8b4ec14..ac3e414f5 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -61,6 +61,7 @@ static const char usage_messages[] ALIGN1 = UNPACKED_USAGE;
 #if ENABLE_FEATURE_COMPRESS_USAGE
 
 static const char packed_usage[] ALIGN1 = { PACKED_USAGE };
+#define BB_ARCHIVE_PUBLIC
 # include "bb_archive.h"
 static const char *unpack_usage_messages(void)
 {
@@ -281,6 +282,10 @@ void lbb_prepare(const char *applet
         if (ENABLE_LOCALE_SUPPORT)
                 setlocale(LC_ALL, "");
 
+#if ENABLE_PLATFORM_MINGW32
+        init_winsock();
+#endif
+
 #if ENABLE_FEATURE_INDIVIDUAL
         /* Redundant for busybox (run_applet_and_exit covers that case)
          * but needed for "individual applet" mode */
@@ -656,6 +661,7 @@ static void check_suid(int applet_no)
 
 
 # if ENABLE_FEATURE_INSTALLER
+#  if !ENABLE_PLATFORM_MINGW32
 static const char usr_bin [] ALIGN1 = "/usr/bin/";
 static const char usr_sbin[] ALIGN1 = "/usr/sbin/";
 static const char *const install_dir[] = {
@@ -700,6 +706,29 @@ static void install_links(const char *busybox, int use_symbolic_links,
                         continue;
         }
 }
+#  else /* ENABLE_PLATFORM_MINGW32 */
+static void install_links(const char *busybox,
+                int use_symbolic_links UNUSED_PARAM, char *custom_install_dir)
+{
+        char *fpc;
+        const char *appname = applet_names;
+        int rc;
+
+        if (!is_directory(custom_install_dir, FALSE))
+                bb_error_msg_and_die("'%s' is not a directory", custom_install_dir);
+
+        while (*appname) {
+                fpc = xasprintf("%s/%s.exe", custom_install_dir, appname);
+                rc = link(busybox, fpc);
+                if (rc != 0 && errno != EEXIST) {
+                        bb_simple_perror_msg(fpc);
+                }
+                free(fpc);
+                while (*appname++ != '\0')
+                        continue;
+        }
+}
+#  endif
 # elif ENABLE_BUSYBOX
 static void install_links(const char *busybox UNUSED_PARAM,
                 int use_symbolic_links UNUSED_PARAM,
@@ -729,15 +758,25 @@ static int busybox_main(char **argv)
                 dup2(1, 2);
                 full_write2_str(bb_banner); /* reuse const string */
                 full_write2_str(" multi-call binary.\n"); /* reuse */
+#if defined(MINGW_VER)
+                if (strlen(MINGW_VER)) {
+                        full_write2_str(MINGW_VER "\n\n");
+                }
+#endif
                 full_write2_str(
                         "BusyBox is copyrighted by many authors between 1998-2015.\n"
                         "Licensed under GPLv2. See source distribution for detailed\n"
                         "copyright notices.\n"
                         "\n"
                         "Usage: busybox [function [arguments]...]\n"
+                        IF_NOT_PLATFORM_MINGW32(
                         "   or: busybox --list"IF_FEATURE_INSTALLER("[-full]")"\n"
+                        )
+                        IF_PLATFORM_MINGW32(
+                        "   or: busybox --list\n"
+                        )
                         IF_FEATURE_INSTALLER(
-                        "   or: busybox --install [-s] [DIR]\n"
+                        "   or: busybox --install "IF_NOT_PLATFORM_MINGW32("[-s] ")"[DIR]\n"
                         )
                         "   or: function [arguments]...\n"
                         "\n"
@@ -755,6 +794,11 @@ static int busybox_main(char **argv)
                         "\tTo run external program, use full path (/sbin/ip instead of ip).\n"
                         )
                         "\n"
+#if ENABLE_GLOBBING
+                        "\tSupport for native Windows wildcards is enabled.  In some\n"
+                        "\tcases this may result in wildcards being processed twice.\n"
+                        "\n"
+#endif
                         "Currently defined functions:\n"
                 );
                 col = 0;
@@ -786,7 +830,7 @@ static int busybox_main(char **argv)
                 const char *a = applet_names;
                 dup2(1, 2);
                 while (*a) {
-#  if ENABLE_FEATURE_INSTALLER
+#  if ENABLE_FEATURE_INSTALLER && !ENABLE_PLATFORM_MINGW32
                         if (argv[1][6]) /* --list-full? */
                                 full_write2_str(install_dir[APPLET_INSTALL_LOC(i)] + 1);
 #  endif
@@ -800,6 +844,7 @@ static int busybox_main(char **argv)
         }
 
         if (ENABLE_FEATURE_INSTALLER && strcmp(argv[1], "--install") == 0) {
+#if !ENABLE_PLATFORM_MINGW32
                 int use_symbolic_links;
                 const char *busybox;
 
@@ -820,6 +865,14 @@ static int busybox_main(char **argv)
                  */
                 use_symbolic_links = (argv[2] && strcmp(argv[2], "-s") == 0 && ++argv);
                 install_links(busybox, use_symbolic_links, argv[2]);
+#else
+                /* busybox --install [DIR]
+                 * where DIR is the directory to install to.  If DIR is not
+                 * provided put the links in the same directory as busybox.
+                 */
+                install_links(bb_busybox_exec_path, FALSE, argv[2] ? argv[2] :
+                                dirname(xstrdup(bb_busybox_exec_path)));
+#endif
                 return 0;
         }
 
@@ -960,6 +1013,18 @@ int main(int argc UNUSED_PARAM, char **argv)
         }
 #endif
 
+#if defined(__MINGW64_VERSION_MAJOR)
+        if ( stdin ) {
+                _setmode(fileno(stdin), _O_BINARY);
+        }
+        if ( stdout ) {
+                _setmode(fileno(stdout), _O_BINARY);
+        }
+        if ( stderr ) {
+                _setmode(fileno(stderr), _O_BINARY);
+        }
+#endif
+
 #if defined(SINGLE_APPLET_MAIN)
 
         /* Only one applet is selected in .config */
@@ -987,6 +1052,29 @@ int main(int argc UNUSED_PARAM, char **argv)
         applet_name = argv[0];
         if (applet_name[0] == '-')
                 applet_name++;
+        if (ENABLE_PLATFORM_MINGW32) {
+                const char *applet_name_env = getenv("BUSYBOX_APPLET_NAME");
+                if (applet_name_env && *applet_name_env) {
+                        applet_name = applet_name_env;
+                        unsetenv("BUSYBOX_APPLET_NAME");
+                }
+                else if ( argv[1] && argv[2] && strcmp(argv[1], "--busybox") == 0 ) {
+                        argv += 2;
+                        applet_name = argv[0];
+                }
+                else {
+                        char *s = argv[0];
+                        int i, len = strlen(s);
+
+                        for ( i=0; i < len; ++i ) {
+                                s[i] = tolower(s[i]);
+                        }
+                        if (len > 4 && !strcmp(s+len-4, ".exe")) {
+                                len -= 4;
+                                s[len] = '\0';
+                        }
+                }
+        }
         applet_name = bb_basename(applet_name);
         parse_config_file(); /* ...maybe, if FEATURE_SUID_CONFIG */
         run_applet_and_exit(applet_name, argv);
diff --git a/libbb/copy_file.c b/libbb/copy_file.c
index 23c0f8320..cb6d12359 100644
--- a/libbb/copy_file.c
+++ b/libbb/copy_file.c
@@ -105,12 +105,15 @@ int FAST_FUNC copy_file(const char *source, const char *dest, int flags)
                         return -1;
                 }
         } else {
+#if !ENABLE_PLATFORM_MINGW32
+        /* MinGW does not have inode, and does not use device */
                 if (source_stat.st_dev == dest_stat.st_dev
                  && source_stat.st_ino == dest_stat.st_ino
                 ) {
                         bb_error_msg("'%s' and '%s' are the same file", source, dest);
                         return -1;
                 }
+#endif
                 dest_exists = 1;
         }
 
diff --git a/libbb/executable.c b/libbb/executable.c
index 3a1d4ff44..5f0ff8c6e 100644
--- a/libbb/executable.c
+++ b/libbb/executable.c
@@ -28,6 +28,10 @@ int FAST_FUNC file_is_executable(const char *name)
  * return NULL otherwise; (PATHp is undefined)
  * in all cases (*PATHp) contents will be trashed (s/:/NUL/).
  */
+#if !ENABLE_PLATFORM_MINGW32
+#define next_path_sep(s) strchr(s, ':')
+#endif
+
 char* FAST_FUNC find_executable(const char *filename, char **PATHp)
 {
         /* About empty components in $PATH:
@@ -39,10 +43,13 @@ char* FAST_FUNC find_executable(const char *filename, char **PATHp)
          * following the rest of the list.
          */
         char *p, *n;
+#if ENABLE_PLATFORM_MINGW32
+        char *w;
+#endif
 
         p = *PATHp;
         while (p) {
-                n = strchr(p, ':');
+                n = (char*)next_path_sep(p);
                 if (n)
                         *n++ = '\0';
                 p = concat_path_file(
@@ -53,6 +60,13 @@ char* FAST_FUNC find_executable(const char *filename, char **PATHp)
                         *PATHp = n;
                         return p;
                 }
+#if ENABLE_PLATFORM_MINGW32
+                else if ((w=file_is_win32_executable(p))) {
+                        *PATHp = n;
+                        free(p);
+                        return w;
+                }
+#endif
                 free(p);
                 p = n;
         } /* on loop exit p == NULL */
diff --git a/libbb/find_mount_point.c b/libbb/find_mount_point.c
index 9676b5f52..de314a3c7 100644
--- a/libbb/find_mount_point.c
+++ b/libbb/find_mount_point.c
@@ -24,10 +24,18 @@ struct mntent* FAST_FUNC find_mount_point(const char *name, int subdir_too)
         struct mntent *mountEntry;
         dev_t devno_of_name;
         bool block_dev;
+#if ENABLE_PLATFORM_MINGW32
+        static char mnt_fsname[4];
+        static char mnt_dir[4];
+        static struct mntent my_mount_entry = { mnt_fsname, mnt_dir, "", "", 0, 0 };
+        char *current, *path;
+        DWORD len;
+#endif
 
         if (stat(name, &s) != 0)
                 return NULL;
 
+#if !ENABLE_PLATFORM_MINGW32
         devno_of_name = s.st_dev;
         block_dev = 0;
         /* Why S_ISCHR? - UBI volumes use char devices, not block */
@@ -64,6 +72,35 @@ struct mntent* FAST_FUNC find_mount_point(const char *name, int subdir_too)
                         break;
         }
         endmntent(mtab_fp);
+#else
+        mountEntry = NULL;
+        path = NULL;
+        current = NULL;
+
+        if ( isalpha(name[0]) && name[1] == ':' ) {
+                path = name;
+        }
+        else {
+                if ( (len=GetCurrentDirectory(0, NULL)) > 0 &&
+                                (current=malloc(len+1)) != NULL &&
+                                GetCurrentDirectory(len, current) ) {
+                        path = current;
+                }
+        }
+
+        if ( path && isalpha(path[0]) && path[1] == ':' ) {
+                mnt_fsname[0] = path[0];
+                mnt_fsname[1] = path[1];
+                mnt_fsname[2] = '\0';
+                mnt_dir[0] = path[0];
+                mnt_dir[1] = path[1];
+                mnt_dir[2] = '\\';
+                mnt_dir[3] = '\0';
+
+                mountEntry = &my_mount_entry;
+        }
+        free(current);
+#endif
 
         return mountEntry;
 }
diff --git a/libbb/find_pid_by_name.c b/libbb/find_pid_by_name.c
index db823d05b..d4bea8ab5 100644
--- a/libbb/find_pid_by_name.c
+++ b/libbb/find_pid_by_name.c
@@ -56,6 +56,7 @@ static int comm_match(procps_status_t *p, const char *procName)
          * This can be crazily_long_script_name.sh!
          * The telltale sign is basename(argv[1]) == procName */
 
+#if !ENABLE_PLATFORM_MINGW32
         if (!p->argv0)
                 return 0;
 
@@ -66,6 +67,7 @@ static int comm_match(procps_status_t *p, const char *procName)
 
         if (strcmp(bb_basename(argv1), procName) != 0)
                 return 0;
+#endif
 
         return 1;
 }
@@ -88,10 +90,12 @@ pid_t* FAST_FUNC find_pid_by_name(const char *procName)
         pidList = xzalloc(sizeof(*pidList));
         while ((p = procps_scan(p, PSSCAN_PID|PSSCAN_COMM|PSSCAN_ARGVN|PSSCAN_EXE))) {
                 if (comm_match(p, procName)
+#if !ENABLE_PLATFORM_MINGW32
                 /* or we require argv0 to match (essential for matching reexeced /proc/self/exe)*/
                  || (p->argv0 && strcmp(bb_basename(p->argv0), procName) == 0)
                 /* or we require /proc/PID/exe link to match */
                  || (p->exe && strcmp(bb_basename(p->exe), procName) == 0)
+#endif
                 ) {
                         pidList = xrealloc_vector(pidList, 2, i);
                         pidList[i++] = p->pid;
diff --git a/libbb/get_last_path_component.c b/libbb/get_last_path_component.c
index 04fdf2a3e..15eb85ca8 100644
--- a/libbb/get_last_path_component.c
+++ b/libbb/get_last_path_component.c
@@ -13,6 +13,11 @@ const char* FAST_FUNC bb_basename(const char *name)
         const char *cp = strrchr(name, '/');
         if (cp)
                 return cp + 1;
+#if ENABLE_PLATFORM_MINGW32
+        cp = strrchr(name, '\\');
+        if (cp)
+                return cp + 1;
+#endif
         return name;
 }
 
@@ -26,8 +31,18 @@ char* FAST_FUNC bb_get_last_path_component_nostrip(const char *path)
 {
         char *slash = strrchr(path, '/');
 
+#if ENABLE_PLATFORM_MINGW32
+        const char *start = has_dos_drive_prefix(path) ? path+2 : path;
+
+        if (!slash)
+                slash = strrchr(path, '\\');
+
+        if (!slash || (slash == start && !slash[1]))
+                return (char*)path;
+#else
         if (!slash || (slash == path && !slash[1]))
                 return (char*)path;
+#endif
 
         return slash + 1;
 }
@@ -42,9 +57,20 @@ char* FAST_FUNC bb_get_last_path_component_strip(char *path)
 {
         char *slash = last_char_is(path, '/');
 
+#if ENABLE_PLATFORM_MINGW32
+        const char *start = has_dos_drive_prefix(path) ? path+2 : path;
+
+        if (!slash)
+                slash = last_char_is(path, '\\');
+
+        if (slash)
+                while ((*slash == '/' || *slash == '\\') && slash != start)
+                        *slash-- = '\0';
+#else
         if (slash)
                 while (*slash == '/' && slash != path)
                         *slash-- = '\0';
+#endif
 
         return bb_get_last_path_component_nostrip(path);
 }
diff --git a/libbb/get_line_from_file.c b/libbb/get_line_from_file.c
index a98dd35eb..2038fac7d 100644
--- a/libbb/get_line_from_file.c
+++ b/libbb/get_line_from_file.c
@@ -57,6 +57,10 @@ char* FAST_FUNC xmalloc_fgetline(FILE *file)
 
         if (i && c[--i] == '\n')
                 c[i] = '\0';
+#if ENABLE_PLATFORM_MINGW32
+        if (i && c[--i] == '\r')
+                c[i] = '\0';
+#endif
 
         return c;
 }
diff --git a/libbb/getopt32.c b/libbb/getopt32.c
index 15b6efc09..ed9352191 100644
--- a/libbb/getopt32.c
+++ b/libbb/getopt32.c
@@ -576,7 +576,7 @@ getopt32(char **argv, const char *applet_opts, ...)
          * run_nofork_applet() does this, but we might end up here
          * also via gunzip_main() -> gzip_main(). Play safe.
          */
-#ifdef __GLIBC__
+#if defined(__GLIBC__) || ENABLE_PLATFORM_MINGW32
         optind = 0;
 #else /* BSD style */
         optind = 1;
diff --git a/libbb/inode_hash.c b/libbb/inode_hash.c
index f11c2afb2..64f43b885 100644
--- a/libbb/inode_hash.c
+++ b/libbb/inode_hash.c
@@ -59,6 +59,7 @@ char* FAST_FUNC is_in_ino_dev_hashtable(const struct stat *statbuf)
 /* Add statbuf to statbuf hash table */
 void FAST_FUNC add_to_ino_dev_hashtable(const struct stat *statbuf, const char *name)
 {
+#if !ENABLE_PLATFORM_MINGW32
         int i;
         ino_dev_hashtable_bucket_t *bucket;
 
@@ -76,6 +77,7 @@ void FAST_FUNC add_to_ino_dev_hashtable(const struct stat *statbuf, const char *
         i = hash_inode(statbuf->st_ino);
         bucket->next = ino_dev_hashtable[i];
         ino_dev_hashtable[i] = bucket;
+#endif
 }
 
 #if ENABLE_DU || ENABLE_FEATURE_CLEAN_UP
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 */
 
diff --git a/libbb/make_directory.c b/libbb/make_directory.c
index a6b7c28df..840c525b0 100644
--- a/libbb/make_directory.c
+++ b/libbb/make_directory.c
@@ -56,6 +56,31 @@ int FAST_FUNC bb_make_directory(char *path, long mode, int flags)
                 c = '\0';
 
                 if (flags & FILEUTILS_RECUR) {  /* Get the parent */
+#if ENABLE_PLATFORM_MINGW32
+                        if (s == path && *s && s[1] == ':') {
+                                /* skip drive letter */
+                                s += 2;
+                        }
+                        else if (s == path && s[0] == '/' && s[1] == '/' ) {
+                                /* skip UNC server and share */
+                                int count = 0;
+                                s += 2;
+                                while (*s) {
+                                        if (*s == '/') {
+                                                do {
+                                                        ++s;
+                                                } while (*s == '/');
+                                                if (++count == 2) {
+                                                        --s;
+                                                        break;
+                                                }
+                                        }
+                                        else {
+                                                ++s;
+                                        }
+                                }
+                        }
+#endif
                         /* Bypass leading non-'/'s and then subsequent '/'s */
                         while (*s) {
                                 if (*s == '/') {
diff --git a/libbb/messages.c b/libbb/messages.c
index cb0836de8..d74c237e7 100644
--- a/libbb/messages.c
+++ b/libbb/messages.c
@@ -35,7 +35,9 @@ const char bb_msg_standard_output[] ALIGN1 = "standard output";
 
 const char bb_hexdigits_upcase[] ALIGN1 = "0123456789ABCDEF";
 
+#if !ENABLE_PLATFORM_MINGW32
 const char bb_busybox_exec_path[] ALIGN1 = CONFIG_BUSYBOX_EXEC_PATH;
+#endif
 const char bb_default_login_shell[] ALIGN1 = LIBBB_DEFAULT_LOGIN_SHELL;
 /* util-linux manpage says /sbin:/bin:/usr/sbin:/usr/bin,
  * but I want to save a few bytes here. Check libbb.h before changing! */
diff --git a/libbb/printable_string.c b/libbb/printable_string.c
index 077d58d32..e638a178e 100644
--- a/libbb/printable_string.c
+++ b/libbb/printable_string.c
@@ -42,7 +42,7 @@ const char* FAST_FUNC printable_string(uni_stat_t *stats, const char *str)
                         unsigned char c = *d;
                         if (c == '\0')
                                 break;
-                        if (c < ' ' || c >= 0x7f)
+                        if (c < ' ' || (c >= 0x7f && !ENABLE_PLATFORM_MINGW32))
                                 *d = '?';
                         d++;
                 }
diff --git a/libbb/procps.c b/libbb/procps.c
index 4edc54d48..452b50b82 100644
--- a/libbb/procps.c
+++ b/libbb/procps.c
@@ -75,6 +75,7 @@ const char* FAST_FUNC get_cached_groupname(gid_t gid)
         return get_cached(&groupname, gid, gid2group_utoa);
 }
 
+#if !ENABLE_PLATFORM_MINGW32
 
 #define PROCPS_BUFSIZE 1024
 
@@ -618,6 +619,8 @@ void FAST_FUNC read_cmdline(char *buf, int col, unsigned pid, const char *comm)
         }
 }
 
+#endif  /* ENABLE_PLATFORM_MINGW32 */
+
 /* from kernel:
         //             pid comm S ppid pgid sid tty_nr tty_pgrp flg
         sprintf(buffer,"%d (%s) %c %d  %d   %d  %d     %d       %lu %lu \
diff --git a/libbb/read_printf.c b/libbb/read_printf.c
index b6a17cc36..e47ac7afe 100644
--- a/libbb/read_printf.c
+++ b/libbb/read_printf.c
@@ -93,6 +93,11 @@ char* FAST_FUNC xmalloc_reads(int fd, size_t *maxsz_p)
                         break;
                 p++;
         }
+#if ENABLE_PLATFORM_MINGW32
+        if ( p != buf && *(p-1) == '\r' ) {
+                --p;
+        }
+#endif
         *p = '\0';
         if (maxsz_p)
                 *maxsz_p  = p - buf;
diff --git a/libbb/setup_environment.c b/libbb/setup_environment.c
index 4258656fe..944ac5538 100644
--- a/libbb/setup_environment.c
+++ b/libbb/setup_environment.c
@@ -30,6 +30,14 @@
 
 #include "libbb.h"
 
+#if ENABLE_PLATFORM_MINGW32
+static void xsetenv_if_unset(const char *key, const char *value)
+{
+        if (!getenv(key))
+                xsetenv(key, value);
+}
+#endif
+
 void FAST_FUNC setup_environment(const char *shell, int flags, const struct passwd *pw)
 {
         if (!shell || !shell[0])
@@ -61,6 +69,9 @@ void FAST_FUNC setup_environment(const char *shell, int flags, const struct pass
                 //xsetenv("HOME",    pw->pw_dir);
                 //xsetenv("SHELL",   shell);
         } else if (flags & SETUP_ENV_CHANGEENV) {
+#if ENABLE_PLATFORM_MINGW32
+#define xsetenv(k, v) xsetenv_if_unset(k, v)
+#endif
                 /* Set HOME, SHELL, and if not becoming a super-user,
                  * USER and LOGNAME.  */
                 if (pw->pw_uid) {
diff --git a/libbb/vfork_daemon_rexec.c b/libbb/vfork_daemon_rexec.c
index c192829b5..766a89e5f 100644
--- a/libbb/vfork_daemon_rexec.c
+++ b/libbb/vfork_daemon_rexec.c
@@ -17,6 +17,7 @@
 
 #include "busybox.h" /* uses applet tables */
 
+#if !ENABLE_PLATFORM_MINGW32
 /* This does a fork/exec in one call, using vfork().  Returns PID of new child,
  * -1 for failure.  Runs argv[0], searching path if that has no / in it. */
 pid_t FAST_FUNC spawn(char **argv)
@@ -58,6 +59,7 @@ pid_t FAST_FUNC spawn(char **argv)
         }
         return pid;
 }
+#endif
 
 /* Die with an error message if we can't spawn a child process. */
 pid_t FAST_FUNC xspawn(char **argv)
@@ -194,7 +196,7 @@ int FAST_FUNC spawn_and_wait(char **argv)
                 {
                         return run_nofork_applet(a, argv);
                 }
-# if BB_MMU
+# if BB_MMU && !ENABLE_PLATFORM_MINGW32
                 /* MMU only */
                 /* a->noexec is true */
                 rc = fork();
diff --git a/libbb/xconnect.c b/libbb/xconnect.c
index 3a0dc2653..ee54898e3 100644
--- a/libbb/xconnect.c
+++ b/libbb/xconnect.c
@@ -98,15 +98,15 @@ len_and_sockaddr* FAST_FUNC get_peer_lsa(int fd)
         return get_lsa(fd, getpeername);
 }
 
-void FAST_FUNC xconnect(int s, const struct sockaddr *s_addr, socklen_t addrlen)
+void FAST_FUNC xconnect(int s, const struct sockaddr *saddr, socklen_t addrlen)
 {
-        if (connect(s, s_addr, addrlen) < 0) {
+        if (connect(s, saddr, addrlen) < 0) {
                 if (ENABLE_FEATURE_CLEAN_UP)
                         close(s);
-                if (s_addr->sa_family == AF_INET)
+                if (saddr->sa_family == AF_INET)
                         bb_perror_msg_and_die("%s (%s)",
                                 "can't connect to remote host",
-                                inet_ntoa(((struct sockaddr_in *)s_addr)->sin_addr));
+                                inet_ntoa(((struct sockaddr_in *)saddr)->sin_addr));
                 bb_perror_msg_and_die("can't connect to remote host");
         }
 }
@@ -353,6 +353,10 @@ int FAST_FUNC xsocket_type(len_and_sockaddr **lsap, int family, int sock_type)
 #if ENABLE_FEATURE_IPV6
                 fd = socket(AF_INET6, sock_type, 0);
                 if (fd >= 0) {
+#if ENABLE_PLATFORM_MINGW32
+                        DWORD buffer = 0;
+                        setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &buffer, sizeof(DWORD));
+#endif
                         family = AF_INET6;
                         goto done;
                 }
diff --git a/libbb/xreadlink.c b/libbb/xreadlink.c
index 7d4cb60a5..2c5a9ef39 100644
--- a/libbb/xreadlink.c
+++ b/libbb/xreadlink.c
@@ -65,7 +65,7 @@ char* FAST_FUNC xmalloc_follow_symlinks(const char *path)
                 linkpath = xmalloc_readlink(buf);
                 if (!linkpath) {
                         /* not a symlink, or doesn't exist */
-                        if (errno == EINVAL || errno == ENOENT)
+                        if (errno == EINVAL || errno == ENOENT || (ENABLE_PLATFORM_MINGW32 && errno == ENOSYS))
                                 return buf;
                         goto free_buf_ret_null;
                 }