summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUoti Urpala <uoti.urpala@pp1.inet.fi>2014-02-20 03:00:09 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-02-27 00:43:24 -0500
commit47d80904a1f72d559962cc5ad32fffd46672a34a (patch)
tree734c02be2ec7cc31183a608f6becae086aec66f1
parent911f4d4d60eae3cfa5b8ca122169f3ca21da4afc (diff)
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
-rw-r--r--src/shared/logs-show.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c
index 61c3652bd5..12d4a1caec 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++) {