19 files changed, 241 insertions, 16 deletions

diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src
index 7fb687227..d94b65008 100644
--- a/libbb/Kbuild.src
+++ b/libbb/Kbuild.src
@@ -37,25 +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 += info_msg.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
@@ -76,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
@@ -85,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
@@ -110,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
diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index 54300bd87..dba66cc93 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -187,6 +187,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 */
@@ -642,10 +646,19 @@ static int busybox_main(char **argv)
                         )
                         "   or: function [arguments]...\n"
                         "\n"
+                        IF_NOT_FEATURE_SH_STANDALONE(
                         "\tBusyBox is a multi-call binary that combines many common Unix\n"
                         "\tutilities into a single executable.  Most people will create a\n"
                         "\tlink to busybox for each function they wish to use and BusyBox\n"
                         "\twill act like whatever it was invoked as.\n"
+                        )
+                        IF_FEATURE_SH_STANDALONE(
+                        "\tBusyBox is a multi-call binary that combines many common Unix\n"
+                        "\tutilities into a single executable.  This version has been\n"
+                        "\tconfigured to prefer built-in utilities to external binaries.\n"
+                        "\tThis avoids having to install a link to busybox for each\n"
+                        "\tfunction to be invoked.\n"
+                        )
                         "\n"
                         "Currently defined functions:\n"
                 );
@@ -815,6 +828,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 */
         if (argv[1] && strncmp(argv[0], "busybox", 7) == 0) {
@@ -830,6 +855,25 @@ 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 {
+                        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 */
diff --git a/libbb/copy_file.c b/libbb/copy_file.c
index a4be875d2..a427c441f 100644
--- a/libbb/copy_file.c
+++ b/libbb/copy_file.c
@@ -100,12 +100,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 85ecc3e6c..12a48cea3 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..b9bc1dd76 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];
+        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..db4be68ad 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;
 }
 
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 d0e83d88e..ae019b26b 100644
--- a/libbb/getopt32.c
+++ b/libbb/getopt32.c
@@ -540,7 +540,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 720a4951e..3d96a8e9f 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -346,7 +346,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];
@@ -409,6 +409,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)
 {
@@ -465,6 +501,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
@@ -477,6 +514,7 @@ static void input_backward(unsigned num)
                         } while (--num);
                         return;
                 }
+#endif
                 printf(ESC"[%uD", num);
                 return;
         }
@@ -608,7 +646,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
@@ -719,7 +761,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++;
@@ -732,7 +778,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' */
@@ -1886,7 +1936,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] = '~';
@@ -2255,9 +2309,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|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,
@@ -2611,7 +2672,7 @@ int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *comman
                          * standard readline bindings (IOW: bash) do.
                          * Often, Alt-<key> generates ESC-<key>.
                          */
-                        ic = lineedit_read_key(read_key_buffer, 50);
+                        ic = lineedit_read_key(read_key_buffer, 20);
                         switch (ic) {
                                 //case KEYCODE_LEFT: - bash doesn't do this
                                 case 'b':
diff --git a/libbb/make_directory.c b/libbb/make_directory.c
index 89352ca1f..3980376ec 100644
--- a/libbb/make_directory.c
+++ b/libbb/make_directory.c
@@ -45,6 +45,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 fad82c9da..ef42b30d7 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 a316f60de..3e768d0b9 100644
--- a/libbb/printable_string.c
+++ b/libbb/printable_string.c
@@ -45,7 +45,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 5b68d3431..3c99ac6e7 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
 
@@ -620,6 +621,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 5ed6e3632..ef4911cd5 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 ed1f86f0c..6611dabfa 100644
--- a/libbb/vfork_daemon_rexec.c
+++ b/libbb/vfork_daemon_rexec.c
@@ -25,6 +25,9 @@ pid_t FAST_FUNC spawn(char **argv)
         volatile int failed;
         pid_t pid;
 
+        if (ENABLE_PLATFORM_MINGW32)
+                return mingw_spawn(argv);
+
         fflush_all();
 
         /* Be nice to nommu machines. */
@@ -183,7 +186,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/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;
                 }