1 files changed, 51 insertions, 0 deletions

diff --git a/miscutils/time.c b/miscutils/time.c
index 77d35a832..9a1039be9 100644
--- a/miscutils/time.c
+++ b/miscutils/time.c
@@ -22,10 +22,17 @@
 //kbuild:lib-$(CONFIG_TIME) += time.o
 
 //usage:#define time_trivial_usage
+//usage:     IF_NOT_PLATFORM_MINGW32(
 //usage:       "[-vpa] [-o FILE] PROG ARGS"
+//usage:     )
+//usage:     IF_PLATFORM_MINGW32(
+//usage:       "[-pa] [-f FMT] [-o FILE] PROG ARGS"
+//usage:     )
 //usage:#define time_full_usage "\n\n"
 //usage:       "Run PROG, display resource usage when it exits\n"
+//usage:     IF_NOT_PLATFORM_MINGW32(
 //usage:     "\n        -v      Verbose"
+//usage:     )
 //usage:     "\n        -p      POSIX output format"
 //usage:     "\n        -f FMT  Custom format"
 //usage:     "\n        -o FILE Write result to FILE"
@@ -57,6 +64,7 @@ static const char default_format[] ALIGN1 = "real\t%E\nuser\t%u\nsys\t%T";
 /* The output format for the -p option .*/
 static const char posix_format[] ALIGN1 = "real %e\nuser %U\nsys %S";
 
+#if !ENABLE_PLATFORM_MINGW32
 /* Format string for printing all statistics verbosely.
    Keep this output to 24 lines so users on terminals can see it all.*/
 static const char long_format[] ALIGN1 =
@@ -83,6 +91,7 @@ static const char long_format[] ALIGN1 =
         "\tSignals delivered: %k\n"
         "\tPage size (bytes): %Z\n"
         "\tExit status: %x";
+#endif
 
 /* Wait for and fill in data on child process PID.
    Return 0 on error, 1 if ok.  */
@@ -93,7 +102,11 @@ static void resuse_end(pid_t pid, resource_t *resp)
 
         /* Ignore signals, but don't ignore the children.  When wait3
          * returns the child process, set the time the command finished. */
+#if !ENABLE_PLATFORM_MINGW32
         while ((caught = wait3(&resp->waitstatus, 0, &resp->ru)) != pid) {
+#else
+        while ((caught=mingw_wait3(pid, &resp->waitstatus, 0, &resp->ru)) != pid) {
+#endif
                 if (caught == -1 && errno != EINTR) {
                         bb_simple_perror_msg("wait");
                         return;
@@ -189,9 +202,11 @@ static unsigned long ptok(const unsigned pagesize, const unsigned long pages)
 
 static void summarize(const char *fmt, char **command, resource_t *resp)
 {
+#if !ENABLE_PLATFORM_MINGW32
         unsigned vv_ms;     /* Elapsed virtual (CPU) milliseconds */
         unsigned cpu_ticks; /* Same, in "CPU ticks" */
         unsigned pagesize = bb_getpagesize();
+#endif
 
         /* Impossible: we do not use WUNTRACED flag in wait()...
         if (WIFSTOPPED(resp->waitstatus))
@@ -205,6 +220,7 @@ static void summarize(const char *fmt, char **command, resource_t *resp)
                 printf("Command exited with non-zero status %u\n",
                                 WEXITSTATUS(resp->waitstatus));
 
+#if !ENABLE_PLATFORM_MINGW32
         vv_ms = (resp->ru.ru_utime.tv_sec + resp->ru.ru_stime.tv_sec) * 1000
               + (resp->ru.ru_utime.tv_usec + resp->ru.ru_stime.tv_usec) / 1000;
 
@@ -215,6 +231,7 @@ static void summarize(const char *fmt, char **command, resource_t *resp)
         cpu_ticks = vv_ms * (unsigned long long)TICKS_PER_SEC / 1000;
 #endif
         if (!cpu_ticks) cpu_ticks = 1; /* we divide by it, must be nonzero */
+#endif
 
         while (*fmt) {
                 /* Handle leading literal part */
@@ -242,6 +259,7 @@ static void summarize(const char *fmt, char **command, resource_t *resp)
                         case 'C':       /* The command that got timed.  */
                                 printargv(command);
                                 break;
+#if !ENABLE_PLATFORM_MINGW32
                         case 'D':       /* Average unshared data size.  */
                                 /* (linux kernel sets ru_idrss/isrss/ixrss to 0,
                                  * docs say the value is in kbytes, so ptok() is wrong) */
@@ -251,6 +269,7 @@ static void summarize(const char *fmt, char **command, resource_t *resp)
                                         ) / cpu_ticks
                                 );
                                 break;
+#endif
                         case 'E': {     /* Elapsed real (wall clock) time.  */
                                 unsigned seconds = resp->elapsed_ms / 1000;
                                 if (seconds >= 3600)    /* One hour -> h:m:s.  */
@@ -265,6 +284,7 @@ static void summarize(const char *fmt, char **command, resource_t *resp)
                                                         (unsigned)(resp->elapsed_ms / 10) % 100);
                                 break;
                         }
+#if !ENABLE_PLATFORM_MINGW32
                         case 'F':       /* Major page faults.  */
                                 printf("%lu", resp->ru.ru_majflt);
                                 break;
@@ -297,6 +317,7 @@ static void summarize(const char *fmt, char **command, resource_t *resp)
                         case 'R':       /* Minor page faults (reclaims).  */
                                 printf("%lu", resp->ru.ru_minflt);
                                 break;
+#endif
                         case 'S':       /* System time.  */
                                 printf("%u.%02u",
                                                 (unsigned)resp->ru.ru_stime.tv_sec,
@@ -331,6 +352,7 @@ static void summarize(const char *fmt, char **command, resource_t *resp)
                                                         (unsigned)(resp->ru.ru_utime.tv_sec % 60),
                                                         (unsigned)(resp->ru.ru_utime.tv_usec / 10000));
                                 break;
+#if !ENABLE_PLATFORM_MINGW32
                         case 'W':       /* Times swapped out.  */
                                 printf("%lu", resp->ru.ru_nswap);
                                 break;
@@ -343,11 +365,13 @@ static void summarize(const char *fmt, char **command, resource_t *resp)
                         case 'c':       /* Involuntary context switches.  */
                                 printf("%lu", resp->ru.ru_nivcsw);
                                 break;
+#endif
                         case 'e':       /* Elapsed real time in seconds.  */
                                 printf("%u.%02u",
                                                 (unsigned)resp->elapsed_ms / 1000,
                                                 (unsigned)(resp->elapsed_ms / 10) % 100);
                                 break;
+#if !ENABLE_PLATFORM_MINGW32
                         case 'k':       /* Signals delivered.  */
                                 printf("%lu", resp->ru.ru_nsignals);
                                 break;
@@ -366,6 +390,7 @@ static void summarize(const char *fmt, char **command, resource_t *resp)
                         case 'w':       /* Voluntary context switches.  */
                                 printf("%lu", resp->ru.ru_nvcsw);
                                 break;
+#endif
                         case 'x':       /* Exit status.  */
                                 printf("%u", WEXITSTATUS(resp->waitstatus));
                                 break;
@@ -409,6 +434,7 @@ static void summarize(const char *fmt, char **command, resource_t *resp)
 static void run_command(char *const *cmd, resource_t *resp)
 {
         pid_t pid;
+#if !ENABLE_PLATFORM_MINGW32
         void (*interrupt_signal)(int);
         void (*quit_signal)(int);
 
@@ -429,6 +455,13 @@ static void run_command(char *const *cmd, resource_t *resp)
         /* Re-enable signals.  */
         signal(SIGINT, interrupt_signal);
         signal(SIGQUIT, quit_signal);
+#else
+        resp->elapsed_ms = monotonic_ms();
+        if ((pid=spawn((char **)cmd)) == -1)
+                bb_perror_msg_and_die("can't execute %s", cmd[0]);
+
+        resuse_end(pid, resp);
+#endif
 }
 
 int time_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
@@ -442,20 +475,35 @@ int time_main(int argc UNUSED_PARAM, char **argv)
         int opt;
         int ex;
         enum {
+#if !ENABLE_PLATFORM_MINGW32
                 OPT_v = (1 << 0),
                 OPT_p = (1 << 1),
                 OPT_a = (1 << 2),
                 OPT_o = (1 << 3),
                 OPT_f = (1 << 4),
+#else
+                OPT_p = (1 << 0),
+                OPT_a = (1 << 1),
+                OPT_o = (1 << 2),
+                OPT_f = (1 << 3),
+#endif
         };
 
         /* "+": stop on first non-option */
+#if !ENABLE_PLATFORM_MINGW32
         opt = getopt32(argv, "^+" "vpao:f:" "\0" "-1"/*at least one arg*/,
                                 &output_filename, &output_format
         );
+#else
+        opt = getopt32(argv, "^+" "pao:f:" "\0" "-1"/*at least one arg*/,
+                                &output_filename, &output_format
+        );
+#endif
         argv += optind;
+#if !ENABLE_PLATFORM_MINGW32
         if (opt & OPT_v)
                 output_format = long_format;
+#endif
         if (opt & OPT_p)
                 output_format = posix_format;
         output_fd = STDERR_FILENO;
@@ -476,6 +524,9 @@ int time_main(int argc UNUSED_PARAM, char **argv)
 
         /* Cheat. printf's are shorter :) */
         xdup2(output_fd, STDOUT_FILENO);
+#if ENABLE_PLATFORM_MINGW32
+        setvbuf(stdout, NULL, _IOFBF, 256);
+#endif
         summarize(output_format, argv, &res);
 
         ex = WEXITSTATUS(res.waitstatus);