chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
logs-show: fix indentation for 2nd and later lines, show lines in full
[elogind.git]
/
src
/
shared
/
logs-show.c
diff --git
a/src/shared/logs-show.c
b/src/shared/logs-show.c
index 51cd7d51c54451b791a60b1dc03a01f5db811c45..2270c3b0305913109f57760dc349c37b53fdf4a9 100644
(file)
--- a/
src/shared/logs-show.c
+++ b/
src/shared/logs-show.c
@@
-135,9
+135,13
@@
static bool print_multiline(FILE *f, unsigned prefix, unsigned n_columns, Output
e = ellipsize_mem(pos, len, n_columns - prefix, 90);
if (!e)
e = ellipsize_mem(pos, len, n_columns - prefix, 90);
if (!e)
- fprintf(f, "%s%.*s%s\n", color_on, len, pos, color_off);
+ fprintf(f, "%*s%s%.*s%s\n",
+ continuation * prefix, "",
+ color_on, len, pos, color_off);
else
else
- fprintf(f, "%s%s%s\n", color_on, e, color_off);
+ fprintf(f, "%*s%s%s%s\n",
+ continuation * prefix, "",
+ color_on, e, color_off);
} else {
ellipsized = true;
fputs("...\n", f);
} else {
ellipsized = true;
fputs("...\n", f);
@@
-168,7
+172,7
@@
static int output_short(
assert(f);
assert(j);
assert(f);
assert(j);
- sd_journal_set_data_threshold(j, flags &
OUTPUT_SHOW_ALL
? 0 : PRINT_THRESHOLD);
+ sd_journal_set_data_threshold(j, flags &
(OUTPUT_SHOW_ALL|OUTPUT_FULL_WIDTH)
? 0 : PRINT_THRESHOLD);
JOURNAL_FOREACH_DATA_RETVAL(j, data, length, r) {
JOURNAL_FOREACH_DATA_RETVAL(j, data, length, r) {