From e5050ea67328ba5c4049666f68e2a6f8324fa732 Mon Sep 17 00:00:00 2001 From: Daniel Hokka Zakrisson Date: Mon, 21 Mar 2011 15:45:08 +0100 Subject: [PATCH] Drop trailing newlines --- src/vserver-stat.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/src/vserver-stat.c b/src/vserver-stat.c index 269edb0..a444d99 100644 --- a/src/vserver-stat.c +++ b/src/vserver-stat.c @@ -341,10 +341,14 @@ registerXidCgroups(struct Vector *vec, struct process_info *process) perror("read(cgroup/mnt)"); return; } - close(fd); - cgroup[cgroup_len] = '/'; - cgroup_len += 1; - cgroup[cgroup_len] = 0; + if (cgroup_len > 0) { + close(fd); + while (cgroup[cgroup_len - 1] == '\n' || cgroup[cgroup_len - 1] == '\r') + cgroup_len--; + cgroup[cgroup_len] = '/'; + cgroup_len += 1; + cgroup[cgroup_len] = 0; + } } if ((fd = open(DEFAULTCONFDIR "/cgroup/base", O_RDONLY)) != -1) { @@ -354,12 +358,16 @@ registerXidCgroups(struct Vector *vec, struct process_info *process) return; } close(fd); - cgroup_len += len; - if (cgroup[cgroup_len - 1] != '/') { - cgroup[cgroup_len] = '/'; - cgroup_len += 1; + if (len > 0) { + while (cgroup[cgroup_len + len - 1] == '\n' || cgroup[cgroup_len + len - 1] == '\r') + len--; + cgroup_len += len; + if (cgroup[cgroup_len - 1] != '/') { + cgroup[cgroup_len] = '/'; + cgroup_len += 1; + } + cgroup[cgroup_len] = 0; } - cgroup[cgroup_len] = 0; } len = strlen(vhi_name); -- 1.8.1.5