PWN-Hunter/android_external_toybox
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make ./top -d .1234567890m work.

Browse Source
This commit is contained in:
Rob Landley 2018-10-21 21:48:29 -05:00
parent 07a3b91920
commit f80065b3b4
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/xwrap.c
View File

@ -791,20 +791,20 @@ double xstrtod(char *s)
// parse fractional seconds with optional s/m/h/d suffix
long xparsetime(char *arg, long zeroes, long *fraction)
{
long l, fr;
long l, fr = 0, mask = 1;
char *end;
if (*arg != '.' && !isdigit(*arg)) error_exit("Not a number '%s'", arg);
l = strtoul(arg, &end, 10);
fr = 0;
if (*end == '.') {
end++;
while (zeroes--) {
fr *= 10;
mask *= 10;
if (isdigit(*end)) fr += *end++-'0';
}
while (isdigit(*end)) end++;
}
if (fraction) *fraction = fr;
// Parse suffix
if (*end) {
@ -812,7 +812,11 @@ long xparsetime(char *arg, long zeroes, long *fraction)
if (i == -1 || *(end+1)) error_exit("Unknown suffix '%s'", end);
l *= ismhd[i];
fr *= ismhd[i];
l += fr/mask;
fr %= mask;
}
if (fraction) *fraction = fr;
return l;
}