1 files changed, 70 insertions, 1 deletions

diff --git a/coreutils/timeout.c b/coreutils/timeout.c
index 06108f315..74df31d10 100644
--- a/coreutils/timeout.c
+++ b/coreutils/timeout.c
@@ -42,11 +42,38 @@
 //usage:       "[-s SIG] [-k KILL_SECS] SECS PROG ARGS"
 //usage:#define timeout_full_usage "\n\n"
 //usage:       "Run PROG. Send SIG to it if it is not gone in SECS seconds.\n"
-//usage:       "Default SIG: TERM."
+//usage:       "Default SIG: TERM.\n"
 //usage:       "If it still exists in KILL_SECS seconds, send KILL.\n"
 
 #include "libbb.h"
 
+#if ENABLE_PLATFORM_MINGW32
+static HANDLE child = INVALID_HANDLE_VALUE;
+
+static void kill_child(void)
+{
+        if (child != INVALID_HANDLE_VALUE) {
+                kill_SIGTERM_by_handle(child);
+        }
+}
+
+/* Return TRUE if child exits before timeout expires */
+static NOINLINE int timeout_wait(int timeout, HANDLE proc, DWORD *status)
+{
+        /* Just sleep(HUGE_NUM); kill(parent) may kill wrong process! */
+        while (1) {
+                sleep1();
+                if (--timeout <= 0)
+                        break;
+                if (WaitForSingleObject(proc, 0) == WAIT_OBJECT_0) {
+                        /* process is gone */
+                        GetExitCodeProcess(proc, status);
+                        return TRUE;
+                }
+        }
+        return FALSE;
+}
+#else
 static NOINLINE int timeout_wait(int timeout, pid_t pid)
 {
         /* Just sleep(HUGE_NUM); kill(parent) may kill wrong process! */
@@ -61,12 +88,18 @@ static NOINLINE int timeout_wait(int timeout, pid_t pid)
         }
         return EXIT_FAILURE;
 }
+#endif
 
 int timeout_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int timeout_main(int argc UNUSED_PARAM, char **argv)
 {
         int signo;
+#if !ENABLE_PLATFORM_MINGW32
         int status;
+#else
+        intptr_t ret;
+        DWORD status = EXIT_SUCCESS;
+#endif
         int parent = 0;
         int timeout;
         int kill_timeout;
@@ -77,6 +110,10 @@ int timeout_main(int argc UNUSED_PARAM, char **argv)
         const char *opt_s = "TERM";
         char *opt_k = NULL;
 
+#if ENABLE_PLATFORM_MINGW32
+        xfunc_error_retval = 125;
+#endif
+
         /* -p option is not documented, it is needed to support NOMMU. */
 
         /* -t SECONDS; -p PARENT_PID */
@@ -85,7 +122,11 @@ int timeout_main(int argc UNUSED_PARAM, char **argv)
         /*argv += optind; - no, wait for bb_daemonize_or_rexec! */
 
         signo = get_signum(opt_s);
+#if !ENABLE_PLATFORM_MINGW32
         if (signo < 0)
+#else
+        if (signo != SIGTERM && signo != SIGKILL && signo != 0)
+#endif
                 bb_error_msg_and_die("unknown signal '%s'", opt_s);
 
         kill_timeout = 0;
@@ -98,6 +139,7 @@ int timeout_main(int argc UNUSED_PARAM, char **argv)
         if (!argv[optind]) /* no PROG? */
                 bb_show_usage();
 
+#if !ENABLE_PLATFORM_MINGW32
         /* We want to create a grandchild which will watch
          * and kill the grandparent. Other methods:
          * making parent watch child disrupts parent<->child link
@@ -150,4 +192,31 @@ int timeout_main(int argc UNUSED_PARAM, char **argv)
         argv[1] = sv2;
 #endif
         BB_EXECVP_or_die(argv);
+#else /* ENABLE_PLATFORM_MINGW32 */
+        argv += optind;
+        if ((ret=mingw_spawn_proc((const char **)argv)) == -1) {
+                xfunc_error_retval = errno == EACCES ? 126 : 127;
+                bb_perror_msg_and_die("can't execute '%s'", argv[0]);
+        }
+
+        child = (HANDLE)ret;
+        atexit(kill_child);
+        if (timeout_wait(timeout, child, &status))
+                goto finish;
+        status = signo == SIGKILL ? 137 : 124;
+
+        pid = (pid_t)GetProcessId(child);
+        kill(pid, signo);
+
+        if (kill_timeout > 0) {
+                if (timeout_wait(kill_timeout, child, &status))
+                        goto finish;
+                kill(parent, SIGKILL);
+                status = 137;
+        }
+ finish:
+        CloseHandle(child);
+        child = INVALID_HANDLE_VALUE;
+        return status;
+#endif
 }