Changeset 1770 in MondoRescue for branches/stable/mindi-busybox/miscutils/time.c

Timestamp:

Nov 6, 2007, 11:01:53 AM (16 years ago)

Author:

Bruno Cornec

Message:

• Better output for mindi-busybox revision
• Remove dummy file created on NFS - report from Arnaud Tiger <arnaud.tiger_at_hp.com>
• strace useful for debug
• fix new versions for pb (2.0.0 for mindi and 1.7.2 for mindi-busybox)
• fix build process for mindi-busybox + options used in that version (dd for label-partitions-as-necessary)
• fix typo in label-partitions-as-necessary which doesn't seem to work
• Update to busybox 1.7.2
• perl is now required at restore time to support uuid swap partitions (and will be used for many other thigs

in the future for sure)

• next mindi version will be 2.0.0 due to all the changes made in it (udev may break working distros)
• small optimization in mindi on keyboard handling (one single find instead of multiple)
• better interaction for USB device when launching mindi manually
• attempt to automatically guess block disk size for ramdisk
• fix typos in bkphw
• Fix the remaining problem with UUID support for swap partitions
• Updates mondoarchive man page for USB support
• Adds preliminary Hardware support to mindi (Proliant SSSTK)
• Tries to add udev support also for rhel4
• Fix UUID support which was still broken.
• Be conservative in test for the start-nfs script
• Update config file for mindi-busybox for 1.7.2 migration
• Try to run around a busybox bug (1.2.2 pb on inexistant links)
• Add build content for mindi-busybox in pb
• Remove distributions content for mindi-busybox
• Fix a warning on inexistant raidtab
• Solve problem on tmpfs in restore init (Problem of inexistant symlink and busybox)
• Create MONDO_CACHE and use it everywhere + creation at start
• Really never try to eject a USB device
• Fix a issue with &> usage (replaced with 1> and 2>)
• Adds magic file to depllist in order to have file working + ldd which helps for debugging issues
• tty modes correct to avoid sh error messages
• Use ext3 normally and not ext2 instead
• USB device should be corrected after reading (take 1st part)
• Adds a mount_USB_here function derived from mount_CDROM_here
• usb detection place before /dev detection in device name at restore time
• Fix when restoring from USB: media is asked in interactive mode
• Adds USB support for mondorestore
• mount_cdrom => mount_media
• elilo.efi is now searched throughout /boot/efi and not in a fixed place as there is no standard
• untar-and-softlink => untar (+ interface change)
• suppress useless softlinks creation/removal in boot process
• avoids udevd messages on groups
• Increase # of disks to 99 as in mindi at restore time (should be a conf file parameter)
• skip existing big file creation
• seems to work correctly for USB mindi boot
• Adds group and tty link to udev conf
• Always load usb-torage (even 2.6) to initiate USB bus discovery
• Better printing of messages
• Attempt to fix a bug in supporting OpenSusE 10.3 kernel for initramfs (mindi may now use multiple regex for kernel initrd detection)
• Links were not correctly done as non relative for modules in mindi
• exclusion of modules denied now works
• Also create modules in their ordinary place, so that classical modprobe works + copy modules.dep
• Fix bugs for DENY_MODS handling
• Add device /dev/console for udev
• ide-generic should now really be excluded
• Fix a bug in major number for tty
• If udev then adds modprobe/insmod to rootfs
• tty0 is also cretaed with udev
• ide-generic put rather in DENY_MODS
• udevd remove from deplist s handled in mindi directly
• better default for mindi when using --usb
• Handles dynamically linked busybox (in case we want to use it soon ;-)
• Adds fixed devices to create for udev
• ide-generic should not be part of the initrd when using libata v2
• support a dynamically linked udev (case on Ubuntu 7.10 and Mandriva 2008.0 so should be quite generic) This will give incitation to move to dyn. linked binaries in the initrd which will help for other tasks (ia6 4)
• Improvement in udev support (do not use cl options not available in busybox)
• Udev in mindi
  • auto creation of the right links at boot time with udev-links.conf(from Mandriva 2008.0)
  • rework startup of udev as current makes kernel crash (from Mandriva 2008.0)
  • add support for 64 bits udev
• Try to render MyInsmod silent at boot time
• Adds udev support (mandatory for newest distributions to avoid remapping of devices in a different way as on the original system)
• We also need vaft format support for USB boot
• Adds libusual support (Ubuntu 7.10 needs it for USB)
• Improve Ubuntu/Debian keyboard detection and support
• pbinit adapted to new pb (0.8.10). Filtering of docs done in it
• Suppress some mondo warnings and errors on USB again
• Tries to fix lack of files in deb mindi package
• Verify should now work for USB devices
• More log/mesages improvement for USB support
• - Supress g_erase_tmpdir_and_scratchdir
• Improve some log messages for USB support
• Try to improve install in mindi to avoid issues with isolinux.cfg not installed vene if in the pkg :-(
• Improve mindi-busybox build
• In conformity with pb 0.8.9
• Add support for Ubuntu 7.10 in build process
• Add USB Key button to Menu UI (CD streamer removed)
• Attempt to fix error messages on tmp/scratch files at the end by removing those dir at the latest possible.
• Fix a bug linked to the size of the -E param which could be used (Arnaud Tiger/René Ribaud).
• Integrate ~/.pbrc content into mondorescue.pb (required project-builder >= 0.8.7)
• Put mondorescue in conformity with new pb filtering rules
• Add USB support at restore time (no test done yet). New start-usb script PB varibale added where useful
• Unmounting USB device before removal of temporary scratchdir
• Stil refining USB copy back to mondo (one command was not executed)
• No need to have the image subdor in the csratchdir when USB.
• umount the USB partition before attempting to use it
• Remove useless copy from mindi to mondo at end of USB handling

(risky merge, we are raising the limits of 2 diverging branches. The status of stable is not completely sure as such. Will need lots of tests, but it's not yet done :-()
(merge -r1692:1769 $SVN_M/branches/2.2.5)

File:

• branches/stable/mindi-busybox/miscutils/time.c (modified) (13 diffs)

branches/stable/mindi-busybox/miscutils/time.c

@@ -3 +3 @@
    Copyright (C) 1990, 91, 92, 93, 96 Free Software Foundation, Inc.
 
-   Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+   Licensed under GPL version 2, see file LICENSE in this tarball for details.
 */
 /* Originally written by David Keppel <pardo@cs.washington.edu>.
@@ -10 +10 @@
 */
 
-#include "busybox.h"
-#include <stdlib.h>
-#include <stdio.h>
-#include <signal.h>
-#include <errno.h>
-#include <getopt.h>
-#include <string.h>
-#include <limits.h>
-#include <unistd.h>
-#include <sys/types.h>  /* For pid_t. */
-#include <sys/wait.h>
-#include <sys/param.h>  /* For getpagesize, maybe.  */
-
-#define TV_MSEC tv_usec / 1000
-#include <sys/resource.h>
+#include "libbb.h"
 
 /* Information on the resources used by a child process.  */
@@ -30 +16 @@
     int waitstatus;
     struct rusage ru;
-    struct timeval start, elapsed;  /* Wallclock time of process.  */
+    unsigned elapsed_ms;    /* Wallclock time of process.  */
 } resource_t;
 
@@ -36 +22 @@
    usec = microseconds = 1/1,000,000 (1*10e-6) second.  */
 
-#ifndef TICKS_PER_SEC
-#define TICKS_PER_SEC 100
-#endif
-
-/* The number of milliseconds in one `tick' used by the `rusage' structure.  */
-#define MSEC_PER_TICK (1000 / TICKS_PER_SEC)
-
-/* Return the number of clock ticks that occur in M milliseconds.  */
-#define MSEC_TO_TICKS(m) ((m) / MSEC_PER_TICK)
-
 #define UL unsigned long
 
-static const char *const default_format = "real\t%E\nuser\t%u\nsys\t%T";
+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 *const posix_format = "real %e\nuser %U\nsys %S";
+static const char posix_format[] ALIGN1 = "real %e\nuser %U\nsys %S";
 
 
 /* Format string for printing all statistics verbosely.
    Keep this output to 24 lines so users on terminals can see it all.*/
-static const char *const long_format =
+static const char long_format[] ALIGN1 =
     "\tCommand being timed: \"%C\"\n"
     "\tUser time (seconds): %U\n"
@@ -78 +54 @@
     "\tSocket messages received: %r\n"
     "\tSignals delivered: %k\n"
-    "\tPage size (bytes): %Z\n" "\tExit status: %x";
-
-
-  /* Wait for and fill in data on child process PID.
-     Return 0 on error, 1 if ok.  */
+    "\tPage size (bytes): %Z\n"
+    "\tExit status: %x";
+
+
+/* Wait for and fill in data on child process PID.
+   Return 0 on error, 1 if ok.  */
 
 /* pid_t is short on BSDI, so don't try to promote it.  */
@@ -88 +65 @@
 {
     int status;
-
     pid_t caught;
 
@@ -97 +73 @@
             return 0;
     }
-
-    gettimeofday(&resp->elapsed, (struct timezone *) 0);
-    resp->elapsed.tv_sec -= resp->start.tv_sec;
-    if (resp->elapsed.tv_usec < resp->start.tv_usec) {
-        /* Manually carry a one from the seconds field.  */
-        resp->elapsed.tv_usec += 1000000;
-        --resp->elapsed.tv_sec;
-    }
-    resp->elapsed.tv_usec -= resp->start.tv_usec;
-
+    resp->elapsed_ms = (monotonic_us() / 1000) - resp->elapsed_ms;
     resp->waitstatus = status;
-
     return 1;
 }
 
-/* Print ARGV to FP, with each entry in ARGV separated by FILLER.  */
-static void fprintargv(FILE * fp, char *const *argv, const char *filler)
-{
-    char *const *av;
-
-    av = argv;
-    fputs(*av, fp);
-    while (*++av) {
-        fputs(filler, fp);
-        fputs(*av, fp);
-    }
-    if (ferror(fp))
-        bb_error_msg_and_die(bb_msg_write_error);
+/* Print ARGV, with each entry in ARGV separated by FILLER.  */
+static void printargv(char *const *argv, const char *filler)
+{
+    fputs(*argv, stdout);
+    while (*++argv) {
+        fputs(filler, stdout);
+        fputs(*argv, stdout);
+    }
 }
 
@@ -137 +98 @@
 static unsigned long ptok(unsigned long pages)
 {
-    static unsigned long ps = 0;
+    static unsigned long ps;
     unsigned long tmp;
-    static long size = LONG_MAX;
 
     /* Initialization.  */
     if (ps == 0)
-        ps = (long) getpagesize();
+        ps = getpagesize();
 
     /* Conversion.  */
     if (pages > (LONG_MAX / ps)) {  /* Could overflow.  */
         tmp = pages / 1024; /* Smaller first, */
-        size = tmp * ps;    /* then larger.  */
-    } else {            /* Could underflow.  */
-        tmp = pages * ps;   /* Larger first, */
-        size = tmp / 1024;  /* then smaller.  */
-    }
-    return size;
+        return tmp * ps;    /* then larger.  */
+    }
+    /* Could underflow.  */
+    tmp = pages * ps;   /* Larger first, */
+    return tmp / 1024;  /* then smaller.  */
 }
 
 /* summarize: Report on the system use of a command.
 
-   Copy the FMT argument to FP except that `%' sequences
+   Print the FMT argument except that `%' sequences
    have special meaning, and `\n' and `\t' are translated into
    newline and tab, respectively, and `\\' is translated into `\'.
@@ -196 +155 @@
    and dividing by elapsed real time.
 
-   FP is the stream to print to.
    FMT is the format string, interpreted as described above.
    COMMAND is the command and args that are being summarized.
    RESP is resource information on the command.  */
 
-static void summarize(FILE * fp, const char *fmt, char **command,
-                      resource_t * resp)
-{
-    unsigned long r;    /* Elapsed real milliseconds.  */
-    unsigned long v;    /* Elapsed virtual (CPU) milliseconds.  */
+#ifndef TICKS_PER_SEC
+#define TICKS_PER_SEC 100
+#endif
+
+static void summarize(const char *fmt, char **command, resource_t * resp)
+{
+    unsigned vv_ms;     /* Elapsed virtual (CPU) milliseconds */
+    unsigned cpu_ticks; /* Same, in "CPU ticks" */
 
     if (WIFSTOPPED(resp->waitstatus))
-        fprintf(fp, "Command stopped by signal %d\n",
+        printf("Command stopped by signal %u\n",
                 WSTOPSIG(resp->waitstatus));
     else if (WIFSIGNALED(resp->waitstatus))
-        fprintf(fp, "Command terminated by signal %d\n",
+        printf("Command terminated by signal %u\n",
                 WTERMSIG(resp->waitstatus));
     else if (WIFEXITED(resp->waitstatus) && WEXITSTATUS(resp->waitstatus))
-        fprintf(fp, "Command exited with non-zero status %d\n",
+        printf("Command exited with non-zero status %u\n",
                 WEXITSTATUS(resp->waitstatus));
 
-    /* Convert all times to milliseconds.  Occasionally, one of these values
-       comes out as zero.  Dividing by zero causes problems, so we first
-       check the time value.  If it is zero, then we take `evasive action'
-       instead of calculating a value.  */
-
-    r = resp->elapsed.tv_sec * 1000 + resp->elapsed.tv_usec / 1000;
-
-    v = resp->ru.ru_utime.tv_sec * 1000 + resp->ru.ru_utime.TV_MSEC +
-        resp->ru.ru_stime.tv_sec * 1000 + resp->ru.ru_stime.TV_MSEC;
+    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;
+
+#if (1000 / TICKS_PER_SEC) * TICKS_PER_SEC == 1000
+    /* 1000 is exactly divisible by TICKS_PER_SEC */
+    cpu_ticks = vv_ms / (1000 / TICKS_PER_SEC);
+#else
+    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 */
+
+    /* putchar() != putc(stdout) in glibc! */
 
     while (*fmt) {
+        /* Handle leading literal part */
+        int n = strcspn(fmt, "%\\");
+        if (n) {
+            printf("%.*s", n, fmt);
+            fmt += n;
+            continue;
+        }
+
         switch (*fmt) {
+#ifdef NOT_NEEDED
+        /* Handle literal char */
+        /* Usually we optimize for size, but there is a limit
+         * for everything. With this we do a lot of 1-byte writes */
+        default:
+            putc(*fmt, stdout);
+            break;
+#endif
+
         case '%':
             switch (*++fmt) {
-            case '%':   /* Literal '%'.  */
-                putc('%', fp);
-                break;
+#ifdef NOT_NEEDED_YET
+        /* Our format strings do not have these */
+        /* and we do not take format str from user */
+            default:
+                putc('%', stdout);
+                /*FALLTHROUGH*/
+            case '%':
+                if (!*fmt) goto ret;
+                putc(*fmt, stdout);
+                break;
+#endif
             case 'C':   /* The command that got timed.  */
-                fprintargv(fp, command, " ");
+                printargv(command, " ");
                 break;
             case 'D':   /* Average unshared data size.  */
-                fprintf(fp, "%lu",
-                        MSEC_TO_TICKS(v) == 0 ? 0 :
-                        ptok((UL) resp->ru.ru_idrss) / MSEC_TO_TICKS(v) +
-                        ptok((UL) resp->ru.ru_isrss) / MSEC_TO_TICKS(v));
-                break;
-            case 'E':   /* Elapsed real (wall clock) time.  */
-                if (resp->elapsed.tv_sec >= 3600)   /* One hour -> h:m:s.  */
-                    fprintf(fp, "%ldh %ldm %02lds",
-                            resp->elapsed.tv_sec / 3600,
-                            (resp->elapsed.tv_sec % 3600) / 60,
-                            resp->elapsed.tv_sec % 60);
+                printf("%lu",
+                        ptok((UL) resp->ru.ru_idrss) / cpu_ticks +
+                        ptok((UL) resp->ru.ru_isrss) / cpu_ticks);
+                break;
+            case 'E': { /* Elapsed real (wall clock) time.  */
+                unsigned seconds = resp->elapsed_ms / 1000;
+                if (seconds >= 3600)    /* One hour -> h:m:s.  */
+                    printf("%uh %um %02us",
+                            seconds / 3600,
+                            (seconds % 3600) / 60,
+                            seconds % 60);
                 else
-                    fprintf(fp, "%ldm %ld.%02lds",  /* -> m:s.  */
-                            resp->elapsed.tv_sec / 60,
-                            resp->elapsed.tv_sec % 60,
-                            resp->elapsed.tv_usec / 10000);
-                break;
+                    printf("%um %u.%02us",  /* -> m:s.  */
+                            seconds / 60,
+                            seconds % 60,
+                            (unsigned)(resp->elapsed_ms / 10) % 100);
+                break;
+            }
             case 'F':   /* Major page faults.  */
-                fprintf(fp, "%ld", resp->ru.ru_majflt);
+                printf("%lu", resp->ru.ru_majflt);
                 break;
             case 'I':   /* Inputs.  */
-                fprintf(fp, "%ld", resp->ru.ru_inblock);
+                printf("%lu", resp->ru.ru_inblock);
                 break;
             case 'K':   /* Average mem usage == data+stack+text.  */
-                fprintf(fp, "%lu",
-                        MSEC_TO_TICKS(v) == 0 ? 0 :
-                        ptok((UL) resp->ru.ru_idrss) / MSEC_TO_TICKS(v) +
-                        ptok((UL) resp->ru.ru_isrss) / MSEC_TO_TICKS(v) +
-                        ptok((UL) resp->ru.ru_ixrss) / MSEC_TO_TICKS(v));
+                printf("%lu",
+                        ptok((UL) resp->ru.ru_idrss) / cpu_ticks +
+                        ptok((UL) resp->ru.ru_isrss) / cpu_ticks +
+                        ptok((UL) resp->ru.ru_ixrss) / cpu_ticks);
                 break;
             case 'M':   /* Maximum resident set size.  */
-                fprintf(fp, "%lu", ptok((UL) resp->ru.ru_maxrss));
+                printf("%lu", ptok((UL) resp->ru.ru_maxrss));
                 break;
             case 'O':   /* Outputs.  */
-                fprintf(fp, "%ld", resp->ru.ru_oublock);
+                printf("%lu", resp->ru.ru_oublock);
                 break;
             case 'P':   /* Percent of CPU this job got.  */
                 /* % cpu is (total cpu time)/(elapsed time).  */
-                if (r > 0)
-                    fprintf(fp, "%lu%%", (v * 100 / r));
+                if (resp->elapsed_ms > 0)
+                    printf("%u%%", (unsigned)(vv_ms * 100 / resp->elapsed_ms));
                 else
-                    fprintf(fp, "?%%");
+                    printf("?%%");
                 break;
             case 'R':   /* Minor page faults (reclaims).  */
-                fprintf(fp, "%ld", resp->ru.ru_minflt);
+                printf("%lu", resp->ru.ru_minflt);
                 break;
             case 'S':   /* System time.  */
-                fprintf(fp, "%ld.%02ld",
-                        resp->ru.ru_stime.tv_sec,
-                        resp->ru.ru_stime.TV_MSEC / 10);
+                printf("%u.%02u",
+                        (unsigned)resp->ru.ru_stime.tv_sec,
+                        (unsigned)(resp->ru.ru_stime.tv_usec / 10000));
                 break;
             case 'T':   /* System time.  */
                 if (resp->ru.ru_stime.tv_sec >= 3600) /* One hour -> h:m:s.  */
-                    fprintf(fp, "%ldh %ldm %02lds",
-                            resp->ru.ru_stime.tv_sec / 3600,
-                            (resp->ru.ru_stime.tv_sec % 3600) / 60,
-                            resp->ru.ru_stime.tv_sec % 60);
+                    printf("%uh %um %02us",
+                            (unsigned)(resp->ru.ru_stime.tv_sec / 3600),
+                            (unsigned)(resp->ru.ru_stime.tv_sec % 3600) / 60,
+                            (unsigned)(resp->ru.ru_stime.tv_sec % 60));
                 else
-                    fprintf(fp, "%ldm %ld.%02lds",  /* -> m:s.  */
-                            resp->ru.ru_stime.tv_sec / 60,
-                            resp->ru.ru_stime.tv_sec % 60,
-                            resp->ru.ru_stime.tv_usec / 10000);
+                    printf("%um %u.%02us",  /* -> m:s.  */
+                            (unsigned)(resp->ru.ru_stime.tv_sec / 60),
+                            (unsigned)(resp->ru.ru_stime.tv_sec % 60),
+                            (unsigned)(resp->ru.ru_stime.tv_usec / 10000));
                 break;
             case 'U':   /* User time.  */
-                fprintf(fp, "%ld.%02ld",
-                        resp->ru.ru_utime.tv_sec,
-                        resp->ru.ru_utime.TV_MSEC / 10);
+                printf("%u.%02u",
+                        (unsigned)resp->ru.ru_utime.tv_sec,
+                        (unsigned)(resp->ru.ru_utime.tv_usec / 10000));
                 break;
             case 'u':   /* User time.  */
                 if (resp->ru.ru_utime.tv_sec >= 3600) /* One hour -> h:m:s.  */
-                    fprintf(fp, "%ldh %ldm %02lds",
-                            resp->ru.ru_utime.tv_sec / 3600,
-                            (resp->ru.ru_utime.tv_sec % 3600) / 60,
-                            resp->ru.ru_utime.tv_sec % 60);
+                    printf("%uh %um %02us",
+                            (unsigned)(resp->ru.ru_utime.tv_sec / 3600),
+                            (unsigned)(resp->ru.ru_utime.tv_sec % 3600) / 60,
+                            (unsigned)(resp->ru.ru_utime.tv_sec % 60));
                 else
-                    fprintf(fp, "%ldm %ld.%02lds",  /* -> m:s.  */
-                            resp->ru.ru_utime.tv_sec / 60,
-                            resp->ru.ru_utime.tv_sec % 60,
-                            resp->ru.ru_utime.tv_usec / 10000);
+                    printf("%um %u.%02us",  /* -> m:s.  */
+                            (unsigned)(resp->ru.ru_utime.tv_sec / 60),
+                            (unsigned)(resp->ru.ru_utime.tv_sec % 60),
+                            (unsigned)(resp->ru.ru_utime.tv_usec / 10000));
                 break;
             case 'W':   /* Times swapped out.  */
-                fprintf(fp, "%ld", resp->ru.ru_nswap);
+                printf("%lu", resp->ru.ru_nswap);
                 break;
             case 'X':   /* Average shared text size.  */
-                fprintf(fp, "%lu",
-                        MSEC_TO_TICKS(v) == 0 ? 0 :
-                        ptok((UL) resp->ru.ru_ixrss) / MSEC_TO_TICKS(v));
+                printf("%lu", ptok((UL) resp->ru.ru_ixrss) / cpu_ticks);
                 break;
             case 'Z':   /* Page size.  */
-                fprintf(fp, "%d", getpagesize());
+                printf("%u", getpagesize());
                 break;
             case 'c':   /* Involuntary context switches.  */
-                fprintf(fp, "%ld", resp->ru.ru_nivcsw);
+                printf("%lu", resp->ru.ru_nivcsw);
                 break;
             case 'e':   /* Elapsed real time in seconds.  */
-                fprintf(fp, "%ld.%02ld",
-                        resp->elapsed.tv_sec, resp->elapsed.tv_usec / 10000);
+                printf("%u.%02u",
+                        (unsigned)resp->elapsed_ms / 1000,
+                        (unsigned)(resp->elapsed_ms / 10) % 100);
                 break;
             case 'k':   /* Signals delivered.  */
-                fprintf(fp, "%ld", resp->ru.ru_nsignals);
+                printf("%lu", resp->ru.ru_nsignals);
                 break;
             case 'p':   /* Average stack segment.  */
-                fprintf(fp, "%lu",
-                        MSEC_TO_TICKS(v) == 0 ? 0 :
-                        ptok((UL) resp->ru.ru_isrss) / MSEC_TO_TICKS(v));
+                printf("%lu", ptok((UL) resp->ru.ru_isrss) / cpu_ticks);
                 break;
             case 'r':   /* Incoming socket messages received.  */
-                fprintf(fp, "%ld", resp->ru.ru_msgrcv);
+                printf("%lu", resp->ru.ru_msgrcv);
                 break;
             case 's':   /* Outgoing socket messages sent.  */
-                fprintf(fp, "%ld", resp->ru.ru_msgsnd);
+                printf("%lu", resp->ru.ru_msgsnd);
                 break;
             case 't':   /* Average resident set size.  */
-                fprintf(fp, "%lu",
-                        MSEC_TO_TICKS(v) == 0 ? 0 :
-                        ptok((UL) resp->ru.ru_idrss) / MSEC_TO_TICKS(v));
+                printf("%lu", ptok((UL) resp->ru.ru_idrss) / cpu_ticks);
                 break;
             case 'w':   /* Voluntary context switches.  */
-                fprintf(fp, "%ld", resp->ru.ru_nvcsw);
+                printf("%lu", resp->ru.ru_nvcsw);
                 break;
             case 'x':   /* Exit status.  */
-                fprintf(fp, "%d", WEXITSTATUS(resp->waitstatus));
-                break;
-            case '\0':
-                putc('?', fp);
-                return;
-            default:
-                putc('?', fp);
-                putc(*fmt, fp);
+                printf("%u", WEXITSTATUS(resp->waitstatus));
+                break;
             }
-            ++fmt;
             break;
 
+#ifdef NOT_NEEDED_YET
         case '\\':      /* Format escape.  */
             switch (*++fmt) {
+            default:
+                putc('\\', stdout);
+                /*FALLTHROUGH*/
+            case '\\':
+                if (!*fmt) goto ret;
+                putc(*fmt, stdout);
+                break;
             case 't':
-                putc('\t', fp);
+                putc('\t', stdout);
                 break;
             case 'n':
-                putc('\n', fp);
-                break;
-            case '\\':
-                putc('\\', fp);
-                break;
-            default:
-                putc('?', fp);
-                putc('\\', fp);
-                putc(*fmt, fp);
+                putc('\n', stdout);
+                break;
             }
-            ++fmt;
             break;
-
-        default:
-            putc(*fmt++, fp);
+#endif
         }
-
-        if (ferror(fp))
-            bb_error_msg_and_die(bb_msg_write_error);
-    }
-    putc('\n', fp);
-
-    if (ferror(fp))
-        bb_error_msg_and_die(bb_msg_write_error);
+        ++fmt;
+    }
+ /* ret: */
+    putc('\n', stdout);
 }
 
@@ -410 +381 @@
     __sighandler_t interrupt_signal, quit_signal;
 
-    gettimeofday(&resp->start, (struct timezone *) 0);
+    resp->elapsed_ms = monotonic_us() / 1000;
     pid = vfork();      /* Run CMD as child process.  */
     if (pid < 0)
@@ -417 +388 @@
         /* Don't cast execvp arguments; that causes errors on some systems,
            versus merely warnings if the cast is left off.  */
-        execvp(cmd[0], cmd);
+        BB_EXECVP(cmd[0], cmd);
         bb_error_msg("cannot run %s", cmd[0]);
         _exit(errno == ENOENT ? 127 : 126);
@@ -434 +405 @@
 }
 
+int time_main(int argc, char **argv);
 int time_main(int argc, char **argv)
 {
-    int gotone;
     resource_t res;
     const char *output_format = default_format;
-
-    argc--;
-    argv++;
+    char c;
+
+    goto next;
     /* Parse any options  -- don't use getopt() here so we don't
      * consume the args of our client application... */
-    while (argc > 0 && **argv == '-') {
-        gotone = 0;
-        while (gotone == 0 && *++(*argv)) {
-            switch (**argv) {
+    while (argc > 0 && argv[0][0] == '-') {
+        while ((c = *++*argv)) {
+            switch (c) {
             case 'v':
                 output_format = long_format;
@@ -457 +427 @@
                 bb_show_usage();
             }
-            argc--;
-            argv++;
-            gotone = 1;
         }
-    }
-
-    if (argv == NULL || *argv == NULL)
-        bb_show_usage();
+ next:
+        argv++;
+        argc--;
+        if (!argc)
+            bb_show_usage();
+    }
 
     run_command(argv, &res);
-    summarize(stderr, output_format, argv, &res);
-    fflush(stderr);
+
+    /* Cheat. printf's are shorter :) */
+    stdout = stderr;
+    dup2(2, 1); /* just in case libc does something silly :( */
+    summarize(output_format, argv, &res);
 
     if (WIFSTOPPED(res.waitstatus))
-        exit(WSTOPSIG(res.waitstatus));
-    else if (WIFSIGNALED(res.waitstatus))
-        exit(WTERMSIG(res.waitstatus));
-    else if (WIFEXITED(res.waitstatus))
-        exit(WEXITSTATUS(res.waitstatus));
-    return 0;
-}
+        return WSTOPSIG(res.waitstatus);
+    if (WIFSIGNALED(res.waitstatus))
+        return WTERMSIG(res.waitstatus);
+    if (WIFEXITED(res.waitstatus))
+        return WEXITSTATUS(res.waitstatus);
+    fflush_stdout_and_exit(0);
+}