1 files changed, 50 insertions, 0 deletions

diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index 95e589e74..1d6a4b274 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -62,6 +62,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)
 {
@@ -187,6 +188,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 */
@@ -629,6 +634,11 @@ 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"
@@ -655,6 +665,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;
@@ -825,6 +840,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] && is_prefixed_with(argv[0], "busybox")) {
@@ -840,6 +867,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 */