shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-29 06:50:16 +03:00
Code

systemctl: fix parsing of cgroup contents

Browse Source
This commit is contained in:
Lennart Poettering 2010-07-06 05:38:12 +02:00
parent 72f957066d
commit 5f75059770
1 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/systemctl.c
View File

@ -935,9 +935,9 @@ finish:
}
static void show_cgroup(const char *name) {
char *fn, *pids;
int r;
char *p;
char *fn;
FILE *f;
pid_t last = 0;
if (!startswith(name, "name=systemd:"))
return;
@ -945,30 +945,41 @@ static void show_cgroup(const char *name) {
if (asprintf(&fn, "/cgroup/systemd/%s/tasks", name + 13) < 0)
return;
r = read_one_line_file(fn, &pids);
f = fopen(fn, "r");
free(fn);
if (r < 0)
if (!f)
return;
p = pids;
while (p[0]) {
printf("\t\t │\n");
while (!feof(f)) {
unsigned long ul;
char *t = NULL;
p += strspn(p, WHITESPACE);
errno = 0;
ul = strtoul(p, &p, 0);
if (errno != 0 || ul <= 0)
if (fscanf(f, "%lu", &ul) != 1)
break;
get_process_cmdline((pid_t) ul, 60, &t);
printf("\t\t%lu %s\n", ul, strna(t));
if (ul <= 0)
continue;
if (last > 0) {
char *t = NULL;
get_process_cmdline(last, 60, &t);
printf("\t\t ├ %lu %s\n", (unsigned long) last, strna(t));
free(t);
}
last = (pid_t) ul;
}
if (last > 0) {
char *t = NULL;
get_process_cmdline(last, 60, &t);
printf("\t\t └ %lu %s\n", (unsigned long) last, strna(t));
free(t);
}
free(pids);
fclose(f);
}
typedef struct UnitStatusInfo {