1 files changed, 103 insertions, 4 deletions

diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index fa28d433b..401475f18 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -105,6 +105,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)
 {
@@ -165,7 +166,7 @@ void FAST_FUNC bb_show_usage(void)
                         ap--;
                 }
                 full_write2_str(bb_banner);
-                full_write2_str(" multi-call binary.\n");
+                full_write2_str(" multi-call binary\n");
                 if (*p == '\b')
                         full_write2_str("\nNo help available.\n\n");
                 else {
@@ -309,6 +310,22 @@ int FAST_FUNC find_applet_by_name(const char *name)
 #endif
 }
 
+# if ENABLE_PLATFORM_MINGW32 && ENABLE_FEATURE_SH_NOFORK
+int FAST_FUNC long_running_applet(int applet_no)
+{
+        int ret = 0;
+
+#if defined(APPLET_NO_seq)
+        ret |= (applet_no == APPLET_NO_seq);
+#endif
+#if defined(APPLET_NO_yes)
+        ret |= (applet_no == APPLET_NO_yes);
+#endif
+
+        return ret;
+}
+#endif
+
 
 void lbb_prepare(const char *applet
                 IF_FEATURE_INDIVIDUAL(, char **argv))
@@ -325,6 +342,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 */
@@ -715,6 +736,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[] = {
@@ -759,6 +781,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,
@@ -798,16 +843,26 @@ int busybox_main(int argc UNUSED_PARAM, char **argv)
 
                 dup2(1, 2);
                 full_write2_str(bb_banner); /* reuse const string */
-                full_write2_str(" multi-call binary.\n"); /* reuse */
+                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"
@@ -825,6 +880,11 @@ int busybox_main(int argc UNUSED_PARAM, 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;
@@ -856,7 +916,7 @@ int busybox_main(int argc UNUSED_PARAM, 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
@@ -870,6 +930,7 @@ int busybox_main(int argc UNUSED_PARAM, char **argv)
         }
 
         if (ENABLE_FEATURE_INSTALLER && strcmp(argv[1], "--install") == 0) {
+#if !ENABLE_PLATFORM_MINGW32
                 int use_symbolic_links;
                 const char *busybox;
 
@@ -890,6 +951,14 @@ int busybox_main(int argc UNUSED_PARAM, 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;
         }
 
@@ -1031,6 +1100,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 */
@@ -1062,6 +1143,24 @@ int main(int argc UNUSED_PARAM, char **argv)
         applet_name = argv[0];
         if (applet_name[0] == '-')
                 applet_name++;
+        if (ENABLE_PLATFORM_MINGW32) {
+                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);
 
 # if defined(__linux__)