From 0ab896b343afeaa70f69881626a50855dc518d68 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 27 May 2018 19:03:03 +0200 Subject: [PATCH] journal-remote: do not send _BOOT_ID twice Also remove the comma from the comment everywhere, I think the comma unnecessarilly put emphasis on the clause after the comma. Fixes #9090. Reproducer: systemd-journal-remote --split-mode=none -o /tmp/msg6.journal --trust=all --listen-http=8080 systemd-journal-upload -u http://localhost:8080 journalctl --file /tmp/msg6.journal -o verbose -n1 --- src/journal-remote/journal-upload-journal.c | 12 +++++++++--- src/shared/logs-show.c | 9 ++++----- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/journal-remote/journal-upload-journal.c b/src/journal-remote/journal-upload-journal.c index 909905d1cd3..66af9d5dcbc 100644 --- a/src/journal-remote/journal-upload-journal.c +++ b/src/journal-remote/journal-upload-journal.c @@ -8,12 +8,14 @@ #include #include +#include "sd-daemon.h" + #include "alloc-util.h" #include "journal-upload.h" #include "log.h" +#include "string-util.h" #include "utf8.h" #include "util.h" -#include "sd-daemon.h" /** * Write up to size bytes to buf. Return negative on error, and number of @@ -139,8 +141,12 @@ static ssize_t write_entry(char *buf, size_t size, Uploader *u) { continue; } - if (!utf8_is_printable_newline(u->field_data, - u->field_length, false)) { + /* We already printed the boot id from the data in + * the header, hence let's suppress it here */ + if (memory_startswith(u->field_data, u->field_length, "_BOOT_ID=")) + continue; + + if (!utf8_is_printable_newline(u->field_data, u->field_length, false)) { u->entry_state = ENTRY_BINARY_FIELD_START; continue; } diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c index 739af3986d3..5af23e44d70 100644 --- a/src/shared/logs-show.c +++ b/src/shared/logs-show.c @@ -657,10 +657,8 @@ static int output_export( JOURNAL_FOREACH_DATA_RETVAL(j, data, length, r) { const char *c; - /* We already printed the boot id, from the data in - * the header, hence let's suppress it here */ - if (length >= 9 && - startswith(data, "_BOOT_ID=")) + /* We already printed the boot id from the data in the header, hence let's suppress it here */ + if (memory_startswith(data, length, "_BOOT_ID=")) continue; c = memchr(data, '=', length); @@ -873,7 +871,8 @@ static int output_json( size_t m; unsigned u; - /* We already printed the boot id, from the data in the header, hence let's suppress it here */ + /* We already printed the boot id from the data in + * the header, hence let's suppress it here */ if (memory_startswith(data, length, "_BOOT_ID=")) continue; -- 2.47.3