1 files changed, 179 insertions, 5 deletions

diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index c15014a34..8efb1754a 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -48,6 +48,15 @@
 # define IF_FEATURE_INDIVIDUAL(...) __VA_ARGS__
 #endif
 
+#if (ENABLE_FEATURE_INSTALLER && !ENABLE_PLATFORM_MINGW32) || \
+        (ENABLE_PLATFORM_MINGW32 && (ENABLE_FEATURE_PREFER_APPLETS \
+                || ENABLE_FEATURE_SH_STANDALONE \
+                || ENABLE_FEATURE_SH_NOFORK))
+# define IF_FULL_LIST_OPTION(...) __VA_ARGS__
+#else
+# define IF_FULL_LIST_OPTION(...)
+#endif
+
 #include "usage_compressed.h"
 
 #if ENABLE_FEATURE_SH_EMBEDDED_SCRIPTS
@@ -57,6 +66,7 @@
 # define NUM_SCRIPTS 0
 #endif
 #if NUM_SCRIPTS > 0
+# define BB_ARCHIVE_PUBLIC
 # include "bb_archive.h"
 static const char packed_scripts[] ALIGN1 = { PACKED_SCRIPTS };
 #endif
@@ -106,6 +116,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"
 # define unpack_usage_messages() \
         unpack_bz2_data(packed_usage, sizeof(packed_usage), sizeof(UNPACKED_USAGE))
@@ -149,7 +160,7 @@ void FAST_FUNC bb_show_usage(void)
                         ap--;
                 }
                 full_write2_str(bb_banner);
-                full_write2_str(" multi-call binary.\n"); /* common string */
+                full_write2_str(" multi-call binary\n");
                 if (*p == '\b')
                         full_write2_str("\nNo help available\n");
                 else {
@@ -312,6 +323,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 */
@@ -702,6 +717,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[] = {
@@ -746,6 +762,30 @@ 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 ||
+                                strcmp("busybox.exe", bb_basename(fpc)) != 0)) {
+                        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,
@@ -829,20 +869,31 @@ 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 (sizeof(MINGW_VER) > 5) {
+                        full_write2_str(MINGW_VER "\n\n");
+                }
+#endif
                 full_write2_str(
-                        "BusyBox is copyrighted by many authors between 1998-2015.\n"
+                        "BusyBox is copyrighted by many authors between 1998-2018.\n"
                         "Licensed under GPLv2. See source distribution for detailed\n"
                         "copyright notices.\n"
                         "\n"
                         "Usage: busybox [function [arguments]...]\n"
-                        "   or: busybox --list"IF_FEATURE_INSTALLER("[-full]")"\n"
+                        "   or: busybox --list"IF_FULL_LIST_OPTION("[-full]")"\n"
 #  if ENABLE_FEATURE_SHOW_SCRIPT && NUM_SCRIPTS > 0
                         "   or: busybox --show SCRIPT\n"
 #  endif
                         IF_FEATURE_INSTALLER(
+                        IF_NOT_PLATFORM_MINGW32(
                         "   or: busybox --install [-s] [DIR]\n"
                         )
+                        IF_PLATFORM_MINGW32(
+                        "   or: busybox --install [DIR]\n"
+                        "   or: busybox --uninstall [-n] file\n"
+                        )
+                        )
                         "   or: function [arguments]...\n"
                         "\n"
                         IF_NOT_FEATURE_SH_STANDALONE(
@@ -859,6 +910,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;
@@ -903,9 +959,27 @@ 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);
+#  elif ENABLE_PLATFORM_MINGW32 && (ENABLE_FEATURE_PREFER_APPLETS \
+                || ENABLE_FEATURE_SH_STANDALONE \
+                || ENABLE_FEATURE_SH_NOFORK)
+                        if (argv[1][6]) { /* --list-full? */
+                                const char *str;
+
+                                if (APPLET_IS_NOFORK(i))
+                                        str = "NOFORK  ";
+                                else if (APPLET_IS_NOEXEC(i))
+                                        str = "noexec  ";
+#   if NUM_SCRIPTS > 0
+                                else if (applet_main[i] == scripted_main)
+                                        str = "script  ";
+#   endif
+                                else
+                                        str = "        ";
+                                full_write2_str(str);
+                        }
 #  endif
                         full_write2_str(a);
                         full_write2_str("\n");
@@ -917,6 +991,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;
 
@@ -937,9 +1012,40 @@ 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;
         }
 
+#if ENABLE_PLATFORM_MINGW32 && ENABLE_FEATURE_INSTALLER
+        if (strcmp(argv[1], "--uninstall") == 0) {
+                char name[PATH_MAX];
+                int dry_run = (argv[2] && strcmp(argv[2], "-n") == 0 && ++argv);
+                const char *file = argv[2];
+
+                if (!argv[2])
+                        bb_error_msg_and_die(bb_msg_requires_arg, "--uninstall");
+
+                while (enumerate_links(file, name)) {
+                        if (dry_run) {
+                                full_write1_str(name);
+                                full_write1_str("\n");
+                        }
+                        else if (unlink(name) != 0) {
+                                bb_simple_perror_msg(name);
+                        }
+                        file = NULL;
+                }
+                return 0;
+        }
+#endif
+
         if (strcmp(argv[1], "--help") == 0) {
                 /* "busybox --help [<applet>]" */
                 if (!argv[2])
@@ -959,15 +1065,42 @@ int busybox_main(int argc UNUSED_PARAM, char **argv)
 # endif
 
 # if NUM_APPLETS > 0
+
+#  if ENABLE_PLATFORM_MINGW32
+static int interp = 0;
+char bb_comm[COMM_LEN];
+char bb_command_line[128];
+#  endif
+
 void FAST_FUNC run_applet_no_and_exit(int applet_no, const char *name, char **argv)
 {
         int argc = string_array_len(argv);
+#  if ENABLE_PLATFORM_MINGW32
+        int i;
+        const char *vmask;
+        unsigned int mask;
+#  endif
 
         /*
          * We do not use argv[0]: do not want to repeat massaging of
          * "-/sbin/halt" -> "halt", for example.
          */
         applet_name = name;
+#  if ENABLE_PLATFORM_MINGW32
+        safe_strncpy(bb_comm,
+                                        interp ? bb_basename(argv[interp]) : applet_name,
+                                        sizeof(bb_comm));
+
+        safe_strncpy(bb_command_line, applet_name, sizeof(bb_command_line));
+        for (i=1; i < argc && argv[i] &&
+                        strlen(bb_command_line) + strlen(argv[i]) + 2 < 128; ++i) {
+                strcat(strcat(bb_command_line, " "), argv[i]);
+        }
+
+        vmask = getenv("BB_UMASK");
+        if (vmask && sscanf(vmask, "%o", &mask) == 1)
+                umask((mode_t)(mask&0777));
+#  endif
 
         /* Special case. POSIX says "test --help"
          * should be no different from e.g. "test --foo".
@@ -993,6 +1126,7 @@ void FAST_FUNC run_applet_no_and_exit(int applet_no, const char *name, char **ar
         }
         if (ENABLE_FEATURE_SUID)
                 check_suid(applet_no);
+
         xfunc_error_retval = applet_main[applet_no](argc, argv);
         /* Note: applet_main() may also not return (die on a xfunc or such) */
         xfunc_die();
@@ -1075,6 +1209,31 @@ int main(int argc UNUSED_PARAM, char **argv)
                 argv[0][0] &= 0x7f;
         }
 #endif
+#if ENABLE_PLATFORM_MINGW32
+        /* detect if we're running an interpreted script */
+        if (argv[0][1] == ':' && argv[0][2] == '/') {
+                switch (argv[0][0]) {
+                case '1':
+                        interp = 1;
+                        break;
+                case'2':
+                        interp = 2;
+                        break;
+                }
+        }
+#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)
 
@@ -1107,6 +1266,21 @@ 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;
+
+                str_tolower(argv[0]);
+                convert_slashes(argv[0]);
+                if (has_exe_suffix_or_dot(argv[0]) && (s=strrchr(argv[0], '.'))) {
+                        *s = '\0';
+                }
+        }
+# endif
         applet_name = bb_basename(applet_name);
 
         /* If we are a result of execv("/proc/self/exe"), fix ugly comm of "exe" */