Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-12-22 14:30:31 +00:00
Code Issues Projects Releases Wiki Activity

Rewrite timescmd() function to avoid the use of floating point and to

Browse Source 
correct a bug in the seconds display where something like  65 seconds
would be output as "1m65.000000s".
This commit is contained in:
Manuel Novoa III 2003-08-13 17:48:47 +00:00
parent 5b3c05637d
commit 4456f25e8f
1 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
shell/ash.c
View File

@ -12417,27 +12417,35 @@ findvar(struct var **vpp, const char *name)
}
/* $NetBSD: setmode.c,v 1.29 2003/01/15 23:58:03 kleink Exp $ */
/*
* Copyright (c) 1999 Herbert Xu <herbert@debian.org>
* This code for the times builtin.
*/
#include <sys/times.h>
int timescmd(int ac, char **av) {
struct tms buf;
long int clk_tck = sysconf(_SC_CLK_TCK);
static const unsigned char timescmd_str[] = {
' ', offsetof(struct tms, tms_utime),
'\n', offsetof(struct tms, tms_stime),
' ', offsetof(struct tms, tms_cutime),
'\n', offsetof(struct tms, tms_cstime),
0
};
static int timescmd(int ac, char **av)
{
long int clk_tck, s, t;
const unsigned char *p;
struct tms buf;
clk_tck = sysconf(_SC_CLK_TCK);
times(&buf);
out1fmt("%dm%fs %dm%fs\n%dm%fs %dm%fs\n",
(int) (buf.tms_utime / clk_tck / 60),
((double) buf.tms_utime) / clk_tck,
(int) (buf.tms_stime / clk_tck / 60),
((double) buf.tms_stime) / clk_tck,
(int) (buf.tms_cutime / clk_tck / 60),
((double) buf.tms_cutime) / clk_tck,
(int) (buf.tms_cstime / clk_tck / 60),
((double) buf.tms_cstime) / clk_tck);
p = timescmd_str;
do {
t = *(clock_t *)(((char *) &buf) + p[1]);
s = t / clk_tck;
out1fmt("%ldm%ld.%.3lds%c",
s/60, s%60,
((t - s * clk_tck) * 1000) / clk_tck,
p[0]);
} while (*(p += 2));
return 0;
}