chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prep v228: Clean up the new src/basic/*-util-[hc] files:
[elogind.git]
/
src
/
shared
/
cgroup-show.c
diff --git
a/src/shared/cgroup-show.c
b/src/shared/cgroup-show.c
index 530e6f2501c40bc6f5db2ab8611dc8ef4a29d6f2..42399077eefe28b61bbd3a47877a4dc7812cc8c4 100644
(file)
--- a/
src/shared/cgroup-show.c
+++ b/
src/shared/cgroup-show.c
@@
-19,18
+19,23
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <stdio.h>
-#include <string.h>
#include <dirent.h>
#include <errno.h>
#include <dirent.h>
#include <errno.h>
+#include <stdio.h>
+#include <string.h>
-#include "util.h"
+#include "alloc-util.h"
+#include "cgroup-show.h"
+#include "cgroup-util.h"
+#include "fd-util.h"
#include "formats-util.h"
#include "formats-util.h"
+#include "locale-util.h"
#include "macro.h"
#include "path-util.h"
#include "macro.h"
#include "path-util.h"
-#include "
cgroup
-util.h"
-#include "
cgroup-show
.h"
+#include "
process
-util.h"
+#include "
string-util
.h"
#include "terminal-util.h"
#include "terminal-util.h"
+#include "util.h"
static int compare(const void *a, const void *b) {
const pid_t *p = a, *q = b;
static int compare(const void *a, const void *b) {
const pid_t *p = a, *q = b;
@@
-151,7
+156,7
@@
int show_cgroup_by_path(const char *path, const char *prefix, unsigned n_columns
if (!k)
return -ENOMEM;
if (!k)
return -ENOMEM;
- if (!(flags & OUTPUT_SHOW_ALL) && cg_is_empty_recursive(NULL, k
, false
) > 0)
+ if (!(flags & OUTPUT_SHOW_ALL) && cg_is_empty_recursive(NULL, k) > 0)
continue;
if (!shown_pids) {
continue;
if (!shown_pids) {
@@
-160,8
+165,7
@@
int show_cgroup_by_path(const char *path, const char *prefix, unsigned n_columns
}
if (last) {
}
if (last) {
- printf("%s%s%s\n", prefix, draw_special_char(DRAW_TREE_BRANCH),
- basename(last));
+ printf("%s%s%s\n", prefix, draw_special_char(DRAW_TREE_BRANCH), cg_unescape(basename(last)));
if (!p1) {
p1 = strappend(prefix, draw_special_char(DRAW_TREE_VERTICAL));
if (!p1) {
p1 = strappend(prefix, draw_special_char(DRAW_TREE_VERTICAL));
@@
-184,8
+188,7
@@
int show_cgroup_by_path(const char *path, const char *prefix, unsigned n_columns
show_cgroup_one_by_path(path, prefix, n_columns, !!last, kernel_threads, flags);
if (last) {
show_cgroup_one_by_path(path, prefix, n_columns, !!last, kernel_threads, flags);
if (last) {
- printf("%s%s%s\n", prefix, draw_special_char(DRAW_TREE_RIGHT),
- basename(last));
+ printf("%s%s%s\n", prefix, draw_special_char(DRAW_TREE_RIGHT), cg_unescape(basename(last)));
if (!p2) {
p2 = strappend(prefix, " ");
if (!p2) {
p2 = strappend(prefix, " ");