1 files changed, 37 insertions, 12 deletions

diff --git a/miscutils/time.c b/miscutils/time.c
index a73a837d8..e377bb6b7 100644
--- a/miscutils/time.c
+++ b/miscutils/time.c
@@ -21,10 +21,14 @@
 //kbuild:lib-$(CONFIG_TIME) += time.o
 
 //usage:#define time_trivial_usage
-//usage:       "[-v] PROG ARGS"
+//usage:       "[-vpa] [-o FILE] PROG ARGS"
 //usage:#define time_full_usage "\n\n"
 //usage:       "Run PROG, display resource usage when it exits\n"
 //usage:     "\n        -v      Verbose"
+//usage:     "\n        -p      POSIX output format"
+//usage:     "\n        -f FMT  Custom format"
+//usage:     "\n        -o FILE Write result to FILE"
+//usage:     "\n        -a      Append (else overwrite)"
 
 #include "libbb.h"
 #include <sys/resource.h> /* getrusage */
@@ -397,7 +401,7 @@ static void run_command(char *const *cmd, resource_t *resp)
         }
 
         /* Have signals kill the child but not self (if possible).  */
-//TODO: just block all sigs? and reenable them in the very end in main?
+//TODO: just block all sigs? and re-enable them in the very end in main?
         interrupt_signal = signal(SIGINT, SIG_IGN);
         quit_signal = signal(SIGQUIT, SIG_IGN);
 
@@ -412,29 +416,50 @@ int time_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int time_main(int argc UNUSED_PARAM, char **argv)
 {
         resource_t res;
-        const char *output_format = default_format;
+        /* $TIME has lowest prio (-v,-p,-f FMT overrride it) */
+        const char *output_format = getenv("TIME") ? : default_format;
+        char *output_filename;
+        int output_fd;
         int opt;
+        int ex;
+        enum {
+                OPT_v = (1 << 0),
+                OPT_p = (1 << 1),
+                OPT_a = (1 << 2),
+                OPT_o = (1 << 3),
+                OPT_f = (1 << 4),
+        };
 
         opt_complementary = "-1"; /* at least one arg */
         /* "+": stop on first non-option */
-        opt = getopt32(argv, "+vp");
+        opt = getopt32(argv, "+vpao:f:", &output_filename, &output_format);
         argv += optind;
-        if (opt & 1)
+        if (opt & OPT_v)
                 output_format = long_format;
-        if (opt & 2)
+        if (opt & OPT_p)
                 output_format = posix_format;
+        output_fd = STDERR_FILENO;
+        if (opt & OPT_o) {
+                output_fd = xopen(output_filename,
+                        (opt & OPT_a) /* append? */
+                        ? (O_CREAT | O_WRONLY | O_CLOEXEC | O_APPEND)
+                        : (O_CREAT | O_WRONLY | O_CLOEXEC | O_TRUNC)
+                );
+        }
 
         run_command(argv, &res);
 
         /* Cheat. printf's are shorter :) */
-        xdup2(STDERR_FILENO, STDOUT_FILENO);
+        xdup2(output_fd, STDOUT_FILENO);
         summarize(output_format, argv, &res);
 
+        ex = WEXITSTATUS(res.waitstatus);
+        /* Impossible: we do not use WUNTRACED flag in wait()...
         if (WIFSTOPPED(res.waitstatus))
-                return WSTOPSIG(res.waitstatus);
+                ex = WSTOPSIG(res.waitstatus);
+        */
         if (WIFSIGNALED(res.waitstatus))
-                return WTERMSIG(res.waitstatus);
-        if (WIFEXITED(res.waitstatus))
-                return WEXITSTATUS(res.waitstatus);
-        fflush_stdout_and_exit(EXIT_SUCCESS);
+                ex = WTERMSIG(res.waitstatus);
+
+        fflush_stdout_and_exit(ex);
 }