From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Wed, 21 Aug 2013 05:34:57 +0000 (-0400)
Subject: logs-show: fix condition for ellipsizing multi-line messages
X-Git-Tag: v207~98
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=2526d6269112ba8b4f771a2c42fa1aa28563cd48

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 :)
---

diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c
index 89a73a586..f0236eeae 100644
--- a/src/shared/logs-show.c
+++ b/src/shared/logs-show.c
@@ -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)) {