chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
shared: conf-files - use root parameter and convert to auto-cleanup
[elogind.git]
/
src
/
cgls
/
cgls.c
diff --git
a/src/cgls/cgls.c
b/src/cgls/cgls.c
index fd02d52c23f0fd6e7e9b35c6a0acb604de355e0e..a05f9795be26b0e351273751c6c062d254860e42 100644
(file)
--- a/
src/cgls/cgls.c
+++ b/
src/cgls/cgls.c
@@
-29,18
+29,26
@@
#include "cgroup-show.h"
#include "cgroup-util.h"
#include "log.h"
#include "cgroup-show.h"
#include "cgroup-util.h"
#include "log.h"
+#include "path-util.h"
#include "util.h"
#include "pager.h"
#include "util.h"
#include "pager.h"
+#include "build.h"
+#include "output-mode.h"
static bool arg_no_pager = false;
static bool arg_kernel_threads = false;
static bool arg_no_pager = false;
static bool arg_kernel_threads = false;
+static bool arg_all = false;
+static int arg_full = -1;
static void help(void) {
printf("%s [OPTIONS...] [CGROUP...]\n\n"
"Recursively show control group contents.\n\n"
" -h --help Show this help\n"
static void help(void) {
printf("%s [OPTIONS...] [CGROUP...]\n\n"
"Recursively show control group contents.\n\n"
" -h --help Show this help\n"
+ " --version Show package version\n"
" --no-pager Do not pipe output into a pager\n"
" --no-pager Do not pipe output into a pager\n"
+ " -a --all Show all groups, including empty\n"
+ " --full Do not ellipsize output\n"
" -k Include kernel threads in output\n",
program_invocation_short_name);
}
" -k Include kernel threads in output\n",
program_invocation_short_name);
}
@@
-48,12
+56,17
@@
static void help(void) {
static int parse_argv(int argc, char *argv[]) {
enum {
static int parse_argv(int argc, char *argv[]) {
enum {
- ARG_NO_PAGER = 0x100
+ ARG_NO_PAGER = 0x100,
+ ARG_VERSION,
+ ARG_FULL,
};
static const struct option options[] = {
{ "help", no_argument, NULL, 'h' },
};
static const struct option options[] = {
{ "help", no_argument, NULL, 'h' },
+ { "version", no_argument, NULL, ARG_VERSION },
{ "no-pager", no_argument, NULL, ARG_NO_PAGER },
{ "no-pager", no_argument, NULL, ARG_NO_PAGER },
+ { "all", no_argument, NULL, 'a' },
+ { "full", no_argument, NULL, ARG_FULL },
{ NULL, 0, NULL, 0 }
};
{ NULL, 0, NULL, 0 }
};
@@
-62,7
+75,7
@@
static int parse_argv(int argc, char *argv[]) {
assert(argc >= 1);
assert(argv);
assert(argc >= 1);
assert(argv);
- while ((c = getopt_long(argc, argv, "hk", options, NULL)) >= 0) {
+ while ((c = getopt_long(argc, argv, "hk
a
", options, NULL)) >= 0) {
switch (c) {
switch (c) {
@@
-70,10
+83,23
@@
static int parse_argv(int argc, char *argv[]) {
help();
return 0;
help();
return 0;
+ case ARG_VERSION:
+ puts(PACKAGE_STRING);
+ puts(SYSTEMD_FEATURES);
+ return 0;
+
case ARG_NO_PAGER:
arg_no_pager = true;
break;
case ARG_NO_PAGER:
arg_no_pager = true;
break;
+ case 'a':
+ arg_all = true;
+ break;
+
+ case ARG_FULL:
+ arg_full = true;
+ break;
+
case 'k':
arg_kernel_threads = true;
break;
case 'k':
arg_kernel_threads = true;
break;
@@
-92,6
+118,7
@@
static int parse_argv(int argc, char *argv[]) {
int main(int argc, char *argv[]) {
int r = 0, retval = EXIT_FAILURE;
int main(int argc, char *argv[]) {
int r = 0, retval = EXIT_FAILURE;
+ int output_flags;
log_parse_environment();
log_open();
log_parse_environment();
log_open();
@@
-104,8
+131,17
@@
int main(int argc, char *argv[]) {
goto finish;
}
goto finish;
}
- if (!arg_no_pager)
- pager_open();
+ if (!arg_no_pager) {
+ r = pager_open();
+ if (r > 0) {
+ if (arg_full == -1)
+ arg_full = true;
+ }
+ }
+
+ output_flags =
+ arg_all * OUTPUT_SHOW_ALL |
+ (arg_full > 0) * OUTPUT_FULL_WIDTH;
if (optind < argc) {
unsigned i;
if (optind < argc) {
unsigned i;
@@
-114,13
+150,14
@@
int main(int argc, char *argv[]) {
int q;
printf("%s:\n", argv[i]);
int q;
printf("%s:\n", argv[i]);
- q = show_cgroup_by_path(argv[i], NULL, 0, arg_kernel_threads);
+ q = show_cgroup_by_path(argv[i], NULL, 0,
+ arg_kernel_threads, output_flags);
if (q < 0)
r = q;
}
} else {
if (q < 0)
r = q;
}
} else {
- char *p;
+ char
_cleanup_free_
*p;
p = get_current_dir_name();
if (!p) {
p = get_current_dir_name();
if (!p) {
@@
-130,9
+167,10
@@
int main(int argc, char *argv[]) {
if (path_startswith(p, "/sys/fs/cgroup")) {
printf("Working Directory %s:\n", p);
if (path_startswith(p, "/sys/fs/cgroup")) {
printf("Working Directory %s:\n", p);
- r = show_cgroup_by_path(p, NULL, 0, arg_kernel_threads);
+ r = show_cgroup_by_path(p, NULL, 0,
+ arg_kernel_threads, output_flags);
} else {
} else {
- char *root = NULL;
+ char
_cleanup_free_
*root = NULL;
const char *t = NULL;
r = cg_get_by_pid(SYSTEMD_CGROUP_CONTROLLER, 1, &root);
const char *t = NULL;
r = cg_get_by_pid(SYSTEMD_CGROUP_CONTROLLER, 1, &root);
@@
-145,11
+183,9
@@
int main(int argc, char *argv[]) {
t = root[0] ? root : "/";
}
t = root[0] ? root : "/";
}
- r = show_cgroup(SYSTEMD_CGROUP_CONTROLLER, t, NULL, 0,
arg_kernel_threads);
-
free(root
);
+ r = show_cgroup(SYSTEMD_CGROUP_CONTROLLER, t, NULL, 0,
+
arg_kernel_threads, output_flags
);
}
}
-
- free(p);
}
if (r < 0)
}
if (r < 0)