From 494bf9d6d22406676c63822cbf941214fed3111c Mon Sep 17 00:00:00 2001

From: Uoti Urpala <uoti.urpala@pp1.inet.fi>

Date: Thu, 20 Feb 2014 03:00:09 +0200

Subject: [PATCH] logs-show: fix corrupt output with empty messages

If a message had zero length, journalctl would print no newline, and

two output lines would be concatenated. Fix. The problem was

introduced in commit 31f7bf199452 ("logs-show: print multiline

messages"). Affected short and verbose output modes.

Before fix:

Feb 09 21:16:17 glyph dhclient[1323]: Feb 09 21:16:17 glyph NetworkManager[788]: <info> (enp4s2): DHCPv4 state changed nbi -> preinit

after:

Feb 09 21:16:17 glyph dhclient[1323]:

Feb 09 21:16:17 glyph NetworkManager[788]: <info> (enp4s2): DHCPv4 state changed nbi -> preinit

(cherry picked from commit 47d80904a1f72d559962cc5ad32fffd46672a34a)

---

 src/shared/logs-show.c | 5 +++++

 1 file changed, 5 insertions(+)

diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c

index 61c3652..12d4a1c 100644

--- a/src/shared/logs-show.c

+++ b/src/shared/logs-show.c

@@ -124,6 +124,11 @@ static bool print_multiline(FILE *f, unsigned prefix, unsigned n_columns, Output

                 }

         }

+        /* A special case: make sure that we print a newline when

+           the message is empty. */

+        if (message_len == 0)

+                fputs("\n", f);

+

         for (pos = message;

              pos < message + message_len;

              pos = end + 1, line++) {