wt/finit
1
0 Fork 0
mirror of https://github.com/troglobit/finit.git synced 2026-10-17 10:49:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

initctl: handle ~ECHONL properly in top command

Browse Source 
Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg committed 2021-04-08 14:36:15 +02:00
1 parent 98c4e7764f
commit 37eb1901f9
1 file changed
+10 -9
Download Patch File Download Diff File Expand all files Collapse all files
src/cgutil.c
+10 -9
View File
@@ -388,7 +388,7 @@ int cgroup_tree(char *path, char *pfx, int mode, int pos)
switch (mode) { switch (mode) {
case 1: case 1:
cg = cg_stats(path); cg = cg_stats(path);
snprintf(row, rplen, " %6.6s %6.6s %6.6s %5.1f %5.1f %s", snprintf(row, rplen, "\r %6.6s %6.6s %6.6s %5.1f %5.1f %s",
memsz(cg->cg_vmsize, s, sizeof(s)), memsz(cg->cg_vmsize, s, sizeof(s)),
memsz(cg->cg_rss, r, sizeof(r)), memsz(cg->cg_rss, r, sizeof(r)),
memsz(cg->cg_vmlib, l, sizeof(l)), memsz(cg->cg_vmlib, l, sizeof(l)),
@@ -396,13 +396,14 @@ int cgroup_tree(char *path, char *pfx, int mode, int pos)
break; break;
case 2: case 2:
cg = cg_conf(path); cg = cg_conf(path);
snprintf(row, rplen, "%6.6s [%-6.6s%6.6s] %6s [%-6.6s%6.6s] %s", snprintf(row, rplen, "\r%6.6s [%-6.6s%6.6s] %6s [%-6.6s%6.6s] %s",
memsz(cg->cg_vmsize, s, sizeof(s)), memsz(cg->cg_vmsize, s, sizeof(s)),
cg->cg_mem.min, cg->cg_mem.max, cg->cg_cpu.set, cg->cg_mem.min, cg->cg_mem.max, cg->cg_cpu.set,
cg->cg_cpu.weight, cg->cg_cpu.max, path); cg->cg_cpu.weight, cg->cg_cpu.max, path);
break; break;
default: default:
strlcpy(row, path, rplen); strlcpy(row, "\r", rplen);
strlcat(row, path, rplen);
break; break;
} }
@@ -429,13 +430,13 @@ int cgroup_tree(char *path, char *pfx, int mode, int pos)
switch (mode) { switch (mode) {
case 1: case 1:
snprintf(row, rplen, "%37s", " "); snprintf(row, rplen, "\r%37s", " ");
break; break;
case 2: case 2:
snprintf(row, rplen, " --.-- [ ] [ ] "); snprintf(row, rplen, "\r --.-- [ ] [ ] ");
break; break;
default: default:
row[0] = 0; strlcpy(row, "\r", rplen);
break; break;
} }
@@ -481,7 +482,7 @@ int cgroup_tree(char *path, char *pfx, int mode, int pos)
case 1: case 1:
cg = cg_stats(buf); cg = cg_stats(buf);
snprintf(row, rplen, snprintf(row, rplen,
" %6.6s %6.6s %6.6s %5.1f %5.1f ", "\r %6.6s %6.6s %6.6s %5.1f %5.1f ",
memsz(cg->cg_vmsize, s, sizeof(s)), memsz(cg->cg_vmsize, s, sizeof(s)),
memsz(cg->cg_rss, r, sizeof(r)), memsz(cg->cg_rss, r, sizeof(r)),
memsz(cg->cg_vmlib, l, sizeof(l)), memsz(cg->cg_vmlib, l, sizeof(l)),
@@ -489,13 +490,13 @@ int cgroup_tree(char *path, char *pfx, int mode, int pos)
break; break;
case 2: case 2:
cg = cg_conf(buf); cg = cg_conf(buf);
snprintf(row, rplen, "%6.6s [%-6.6s%6.6s] %6.6s [%-6.6s%6.6s] ", snprintf(row, rplen, "\r%6.6s [%-6.6s%6.6s] %6.6s [%-6.6s%6.6s] ",
memsz(cg->cg_vmsize, s, sizeof(s)), memsz(cg->cg_vmsize, s, sizeof(s)),
cg->cg_mem.min, cg->cg_mem.max, cg->cg_mem.min, cg->cg_mem.max,
cg->cg_cpu.set, cg->cg_cpu.weight, cg->cg_cpu.max); cg->cg_cpu.set, cg->cg_cpu.weight, cg->cg_cpu.max);
break; break;
default: default:
row[0] = 0; strlcpy(row, "\r", rplen);
break; break;
} }