summaryrefslogtreecommitdiff
path: root/src/shared/logs-show.h
diff options
context:
space:
mode:
authorLukas Nykryn <lnykryn@redhat.com>2013-01-14 18:16:50 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-01-16 12:11:47 -0500
commit9bdbc2e2ec523dbefe1c1c7e164b5544aff0b185 (patch)
tree5a24260ea36f9984b1f03162fa4d418429d9f268 /src/shared/logs-show.h
parent2e72983463fc0b95f5aac3528334848e8d1d0744 (diff)
systemctl,loginctl,cgls: do not ellipsize cgroup members when --full is specified
New file output.h with output flags and modes. --full parameter also for cgls and loginctl. Include 'all' parameter in flags (show_cgroup_by_path, show_cgroup, show_cgroup_and_extra, show_cgroup_and_extra_by_spec). get_process_cmdline with max_length == 0 will not ellipsize output. Replace LINE_MAX with 0 in some calls of get_process_cmdline. [zj: Default to --full when under pager for clgs. Drop '-f' since it wasn't documented and didn't actually work. Reindent a bit. ]
Diffstat (limited to 'src/shared/logs-show.h')
-rw-r--r--src/shared/logs-show.h23
1 files changed, 1 insertions, 22 deletions
diff --git a/src/shared/logs-show.h b/src/shared/logs-show.h
index 11cb41aab3..6c32aa7a72 100644
--- a/src/shared/logs-show.h
+++ b/src/shared/logs-show.h
@@ -26,28 +26,7 @@
#include <systemd/sd-journal.h>
#include "util.h"
-
-typedef enum OutputMode {
- OUTPUT_SHORT,
- OUTPUT_SHORT_MONOTONIC,
- OUTPUT_VERBOSE,
- OUTPUT_EXPORT,
- OUTPUT_JSON,
- OUTPUT_JSON_PRETTY,
- OUTPUT_JSON_SSE,
- OUTPUT_CAT,
- _OUTPUT_MODE_MAX,
- _OUTPUT_MODE_INVALID = -1
-} OutputMode;
-
-typedef enum OutputFlags {
- OUTPUT_SHOW_ALL = 1 << 0,
- OUTPUT_FOLLOW = 1 << 1,
- OUTPUT_WARN_CUTOFF = 1 << 2,
- OUTPUT_FULL_WIDTH = 1 << 3,
- OUTPUT_COLOR = 1 << 4,
- OUTPUT_CATALOG = 1 << 5
-} OutputFlags;
+#include "output-mode.h"
int output_journal(
FILE *f,