From ec5ff4445cca6a1d786b8da36cf6fe0acc0b94c8 Mon Sep 17 00:00:00 2001 From: Filipe Brandenburger Date: Wed, 10 Jun 2015 22:33:44 -0700 Subject: [PATCH] journald: do not strip leading whitespace from messages Keep leading whitespace for compatibility with older syslog implementations. Also useful when piping formatted output to the `logger` command. Keep removing trailing whitespace. Tested with `pstree | logger` and checking that the output of `journalctl | tail` included aligned and formatted output. Confirmed that all test cases still pass as expected. --- src/journal/journald-syslog.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c index 90b75309463..ffba451955f 100644 --- a/src/journal/journald-syslog.c +++ b/src/journal/journald-syslog.c @@ -234,7 +234,8 @@ size_t syslog_parse_identifier(const char **buf, char **identifier, char **pid) if (t) *identifier = t; - e += strspn(p + e, WHITESPACE); + if (strchr(WHITESPACE, p[e])) + e++; *buf = p + e; return e; }