picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

journalctl: show lines in full with --all

Browse source 
In 31f7bf1 "logs-show: print multiline messages", I forgot
to take into account the fact that --all implies --full for
journalctl.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2013-06-20 16:15:04 -04:00
parent 6c10d39970
commit 8c1396b1c2
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/shared/logs-show.c
View file

@ -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);