summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-06-20 16:15:04 -0400
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-06-20 16:15:04 -0400
commit8c1396b1c2dfecbb59af61064f6a0f624385004d (patch)
treebeee51da8ad39500b853ecebe912baa6d1e6958c
parent6c10d3997019c4f09dad5650209b49c5ccd11551 (diff)
journalctl: show lines in full with --all
In 31f7bf1 "logs-show: print multiline messages", I forgot to take into account the fact that --all implies --full for journalctl.
-rw-r--r--src/shared/logs-show.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c
index 013a281eac..40efad3273 100644
--- a/src/shared/logs-show.c
+++ b/src/shared/logs-show.c
@@ -101,7 +101,7 @@ static bool shall_print(const char *p, size_t l, OutputFlags flags) {
return true;
}
-static void print_multiline(FILE *f, unsigned prefix, unsigned n_columns, int flags, int priority, const char* message, size_t message_len) {
+static void print_multiline(FILE *f, unsigned prefix, unsigned n_columns, OutputMode flags, int priority, const char* message, size_t message_len) {
const char *color_on = "", *color_off = "";
const char *pos, *end;
bool continuation = false;
@@ -123,7 +123,7 @@ static void print_multiline(FILE *f, unsigned prefix, unsigned n_columns, int fl
len = end - pos;
assert(len >= 0);
- if ((flags & OUTPUT_FULL_WIDTH) || (prefix + len + 1 < n_columns))
+ if (flags & (OUTPUT_FULL_WIDTH | OUTPUT_SHOW_ALL) || prefix + len + 1 < n_columns)
fprintf(f, "%*s%s%.*s%s\n",
continuation * prefix, "",
color_on, len, pos, color_off);