emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Merge branch 'master' into newlib

Browse Source 
Conflicts:
	pgrep.c
	proc/sysinfo.c
	ps/output.c
	skill.c
	top/top.c
	top/top.h
	w.c
This commit is contained in:
Craig Small
2015-10-28 21:09:26 +11:00
parent 2b0dd2d702 94e4749be3
commit 471cf4cd36
20 changed files with 4022 additions and 723 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
free.c
View File

@@ -150,7 +150,7 @@ static const char *scale_size(unsigned long size, int flags, struct commandline_
/* human readable output */
up = nextup;
for (i = 1; up[0] != '0'; i++, up++) {
for (i = 1; up[0] != 0; i++, up++) {
switch (i) {
case 1:
if (4 >= snprintf(buf, sizeof(buf), "%ld%c", (long)size * 1024, *up))
@@ -326,6 +326,7 @@ int main(int argc, char **argv)
break;
case 's':
flags |= FREE_REPEAT;
errno = 0;
args.repeat_interval = (1000000 * strtof(optarg, &endptr));
if (errno || optarg == endptr || (endptr && *endptr))
xerrx(EXIT_FAILURE, _("seconds argument `%s' failed"), optarg);