bce8f29a0e
- Sync patches with Debian and Fedora: * Add man page (time.1). * Less nonverbose output (time-fedora-verbose.patch). * Fix maximal RSS report (time-fedora-ru_maxrss-is-in-kilobytes-on-Linux.patch, bnc#836049, Redhat#702826). * Switch to microsecond accuracy if miliseconds arithmetic rounds to zero (time-fedora-Recompute-CPU-usage-at-microsecond-level.patch, Redhat#527276). * When time exits in a non-normal way, return 128 plus the number of the signal which caused time to stop or abort (time-debian-non-normal-exit.patch). * struct rusage and sys/resource.h portability fix (time-debian-rusage-portability.patch, Debian#144819). * Add -q,--quiet functionality (time-debian-quiet.patch, Debian#56853). * Update bug reporting address (time-debian-bug-address.patch, Debian#542469). * Modernize the configure.in file to current autoconf style (time-debian-configure.patch). * Add a directory entry to the info page (time-debian-info-direntry.patch). - Fix FSF address (time-fsf-address.patch). - Update Summary. - Rename time-1.7.diff to time-alpha.patch. ... And cherry pick changelog entries relevant to time. OBS-URL: https://build.opensuse.org/request/show/198137 OBS-URL: https://build.opensuse.org/package/show/Base:System/time?expand=0&rev=3
20 lines
741 B
Diff
20 lines
741 B
Diff
--- time-1.7/time.c.verbose Fri Jun 14 05:38:21 1996
|
|
+++ time-1.7/time.c Sun Nov 4 16:21:09 2001
|
|
@@ -327,6 +327,8 @@
|
|
unsigned long r; /* Elapsed real milliseconds. */
|
|
unsigned long v; /* Elapsed virtual (CPU) milliseconds. */
|
|
|
|
+ if (verbose)
|
|
+ {
|
|
if (WIFSTOPPED (resp->waitstatus))
|
|
fprintf (fp, "Command stopped by signal %d\n",
|
|
WSTOPSIG (resp->waitstatus));
|
|
@@ -336,6 +338,7 @@
|
|
else if (WIFEXITED (resp->waitstatus) && WEXITSTATUS (resp->waitstatus))
|
|
fprintf (fp, "Command exited with non-zero status %d\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
|