1 files changed, 44 insertions, 0 deletions

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 */