mirror of
https://github.com/systemd/systemd.git
synced 2025-01-11 09:18:07 +03:00
logs-show: fix condition for ellipsizing multi-line messages
falconindy> the ellipsizing seems a bit wrong here.... I got a bit carried away with putting dots everywhere :)
This commit is contained in:
parent
cf40f0be1a
commit
2526d62691
@ -132,14 +132,14 @@ static bool print_multiline(FILE *f, unsigned prefix, unsigned n_columns, Output
|
||||
len = end - pos;
|
||||
assert(len >= 0);
|
||||
|
||||
/* We need to figure out when we are showing the last line, and
|
||||
/* We need to figure out when we are showing not-last line, *and*
|
||||
* will skip subsequent lines. In that case, we will put the dots
|
||||
* at the end of the line, instead of putting dots in the middle
|
||||
* or not at all.
|
||||
*/
|
||||
tail_line =
|
||||
line + 1 == PRINT_LINE_THRESHOLD ||
|
||||
end + 1 >= message + message_len;
|
||||
end + 1 >= message + PRINT_CHAR_THRESHOLD;
|
||||
|
||||
if (flags & (OUTPUT_FULL_WIDTH | OUTPUT_SHOW_ALL) ||
|
||||
(prefix + len + 1 < n_columns && !tail_line)) {
|
||||
|
Loading…
Reference in New Issue
Block a user