[systemd-commits] src/shared

[Zbigniew Jędrzejewski-Szmek]

 src/shared/logs-show.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2526d6269112ba8b4f771a2c42fa1aa28563cd48
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Wed Aug 21 01:34:57 2013 -0400

    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 89a73a5..f0236ee 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)) {