diff options
author | Rob Landley <rob@landley.net> | 2015-12-29 11:52:12 -0600 |
---|---|---|
committer | Rob Landley <rob@landley.net> | 2015-12-29 11:52:12 -0600 |
commit | 4d3ad67ab37a25d0edfccdc34d29ec550e0802b6 (patch) | |
tree | 2ea5d17313d4efbd358add3d45580244c1190136 /toys/other/vmstat.c | |
parent | 1bf844232802d2deec7a2e9bee355e4c26259101 (diff) | |
download | toybox-4d3ad67ab37a25d0edfccdc34d29ec550e0802b6.tar.gz |
Add strafter() to lib.
Diffstat (limited to 'toys/other/vmstat.c')
-rw-r--r-- | toys/other/vmstat.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/toys/other/vmstat.c b/toys/other/vmstat.c index df35db12..ae856cf6 100644 --- a/toys/other/vmstat.c +++ b/toys/other/vmstat.c @@ -62,10 +62,7 @@ static void get_vmstat_proc(struct vmstat_proc *vmstat_proc) xreadfile(name = vmstuff[i], toybuf, sizeof(toybuf)); continue; - } else { - if (!(p = strstr(toybuf, vmstuff[i]))) goto error; - p += strlen(vmstuff[i]); - } + } else if (!(p = strafter(toybuf, vmstuff[i]))) goto error; if (1 != sscanf(p, "%"PRIu64"%n", new++, &j)) goto error; p += j; } @@ -123,7 +120,7 @@ void vmstat_main(void) if (!loop) { char *s = toybuf; - xreadfile("/proc/uptime", toybuf, sizeof(toybuf)-1); + xreadfile("/proc/uptime", toybuf, sizeof(toybuf)); while (*(s++) > ' '); sscanf(s, "%"PRIu64, &units); } else units = loop_delay; |