timeout: provide a basic implementation for WIN32

Only the TERM signal is supported.

3 files changed, 37 insertions, 2 deletions

diff --git a/configs/mingw32_defconfig b/configs/mingw32_defconfig
index 8d331acfe..8f5a2e701 100644
--- a/configs/mingw32_defconfig
+++ b/configs/mingw32_defconfig
@@ -314,7 +314,7 @@ CONFIG_TEST=y
 CONFIG_TEST1=y
 CONFIG_TEST2=y
 CONFIG_FEATURE_TEST_64=y
-# CONFIG_TIMEOUT is not set
+CONFIG_TIMEOUT=y
 CONFIG_TOUCH=y
 # CONFIG_FEATURE_TOUCH_NODEREF is not set
 CONFIG_FEATURE_TOUCH_SUSV3=y
diff --git a/configs/mingw64_defconfig b/configs/mingw64_defconfig
index 8fa05cd05..1ccb47268 100644
--- a/configs/mingw64_defconfig
+++ b/configs/mingw64_defconfig
@@ -314,7 +314,7 @@ CONFIG_TEST=y
 CONFIG_TEST1=y
 CONFIG_TEST2=y
 CONFIG_FEATURE_TEST_64=y
-# CONFIG_TIMEOUT is not set
+CONFIG_TIMEOUT=y
 CONFIG_TOUCH=y
 # CONFIG_FEATURE_TOUCH_NODEREF is not set
 CONFIG_FEATURE_TOUCH_SUSV3=y
diff --git a/coreutils/timeout.c b/coreutils/timeout.c
index 4a6117f59..4cdde4366 100644
--- a/coreutils/timeout.c
+++ b/coreutils/timeout.c
@@ -50,10 +50,17 @@ 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;
+#endif
         int parent = 0;
         int timeout = 10;
+#if !ENABLE_PLATFORM_MINGW32
         pid_t pid;
+#else
+        intptr_t ret;
+        HANDLE h;
+#endif
 #if !BB_MMU
         char *sv1, *sv2;
 #endif
@@ -66,6 +73,7 @@ int timeout_main(int argc UNUSED_PARAM, char **argv)
         getopt32(argv, "+s:t:+" USE_FOR_NOMMU("p:+"), &opt_s, &timeout, &parent);
         /*argv += optind; - no, wait for bb_daemonize_or_rexec! */
         signo = get_signum(opt_s);
+#if !ENABLE_PLATFORM_MINGW32
         if (signo < 0)
                 bb_error_msg_and_die("unknown signal '%s'", opt_s);
 
@@ -124,4 +132,31 @@ int timeout_main(int argc UNUSED_PARAM, char **argv)
         argv[1] = sv2;
 #endif
         BB_EXECVP_or_die(argv);
+#else /* ENABLE_PLATFORM_MINGW32 */
+        if (signo != SIGTERM)
+                bb_error_msg_and_die("unknown signal '%s'", opt_s);
+
+        argv += optind;
+        if (argv[0] == NULL)
+                bb_show_usage();
+
+        if ((ret=mingw_spawn_proc(argv)) == -1)
+                bb_perror_msg_and_die("can't execute '%s'", argv[0]);
+
+        h = (HANDLE)ret;
+        while (1) {
+                sleep(1);
+                if (--timeout <= 0)
+                        break;
+                if (WaitForSingleObject(h, 0) == WAIT_OBJECT_0) {
+                        /* process is gone */
+                        goto finish;
+                }
+        }
+
+        TerminateProcess(h, 0);
+ finish:
+        CloseHandle(h);
+        return EXIT_SUCCESS;
+#endif
 }