X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcgls%2Fcgls.c;h=a05f9795be26b0e351273751c6c062d254860e42;hb=0eff0f3bce1d0826765f6e84ff046b10fe5a1a12;hp=b2cd968e46cfeeae5b39f347db7b50739235ff82;hpb=9eb977db5b89b44f254ab40c1876a76b7d7ea2d0;p=elogind.git

diff --git a/src/cgls/cgls.c b/src/cgls/cgls.c
index b2cd968e4..a05f9795b 100644
--- a/src/cgls/cgls.c
+++ b/src/cgls/cgls.c
@@ -33,10 +33,12 @@
 #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_all = false;
+static int arg_full = -1;
 
 static void help(void) {
 
@@ -46,6 +48,7 @@ static void help(void) {
                "     --version        Show package version\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);
 }
@@ -54,7 +57,8 @@ static int parse_argv(int argc, char *argv[]) {
 
         enum {
                 ARG_NO_PAGER = 0x100,
-                ARG_VERSION
+                ARG_VERSION,
+                ARG_FULL,
         };
 
         static const struct option options[] = {
@@ -62,6 +66,7 @@ static int parse_argv(int argc, char *argv[]) {
                 { "version",   no_argument,       NULL, ARG_VERSION  },
                 { "no-pager",  no_argument,       NULL, ARG_NO_PAGER },
                 { "all",       no_argument,       NULL, 'a'          },
+                { "full",      no_argument,       NULL, ARG_FULL     },
                 { NULL,        0,                 NULL, 0            }
         };
 
@@ -80,7 +85,6 @@ static int parse_argv(int argc, char *argv[]) {
 
                 case ARG_VERSION:
                         puts(PACKAGE_STRING);
-                        puts(DISTRIBUTION);
                         puts(SYSTEMD_FEATURES);
                         return 0;
 
@@ -92,6 +96,10 @@ static int parse_argv(int argc, char *argv[]) {
                         arg_all = true;
                         break;
 
+                case ARG_FULL:
+                        arg_full = true;
+                        break;
+
                 case 'k':
                         arg_kernel_threads = true;
                         break;
@@ -110,6 +118,7 @@ static int parse_argv(int argc, char *argv[]) {
 
 int main(int argc, char *argv[]) {
         int r = 0, retval = EXIT_FAILURE;
+        int output_flags;
 
         log_parse_environment();
         log_open();
@@ -122,8 +131,17 @@ int main(int argc, char *argv[]) {
                 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;
@@ -132,13 +150,14 @@ int main(int argc, char *argv[]) {
                         int q;
                         printf("%s:\n", argv[i]);
 
-                        q = show_cgroup_by_path(argv[i], NULL, 0, arg_kernel_threads, arg_all);
+                        q = show_cgroup_by_path(argv[i], NULL, 0,
+                                                arg_kernel_threads, output_flags);
                         if (q < 0)
                                 r = q;
                 }
 
         } else {
-                char *p;
+                char _cleanup_free_ *p;
 
                 p = get_current_dir_name();
                 if (!p) {
@@ -148,9 +167,10 @@ int main(int argc, char *argv[]) {
 
                 if (path_startswith(p, "/sys/fs/cgroup")) {
                         printf("Working Directory %s:\n", p);
-                        r = show_cgroup_by_path(p, NULL, 0, arg_kernel_threads, arg_all);
+                        r = show_cgroup_by_path(p, NULL, 0,
+                                                arg_kernel_threads, output_flags);
                 } else {
-                        char *root = NULL;
+                        char _cleanup_free_ *root = NULL;
                         const char *t = NULL;
 
                         r = cg_get_by_pid(SYSTEMD_CGROUP_CONTROLLER, 1, &root);
@@ -163,11 +183,9 @@ int main(int argc, char *argv[]) {
                                 t = root[0] ? root : "/";
                         }
 
-                        r = show_cgroup(SYSTEMD_CGROUP_CONTROLLER, t, NULL, 0, arg_kernel_threads, arg_all);
-                        free(root);
+                        r = show_cgroup(SYSTEMD_CGROUP_CONTROLLER, t, NULL, 0,
+                                        arg_kernel_threads, output_flags);
                 }
-
-                free(p);
         }
 
         if (r < 0)