From 12503ae51db22449309ea2284ae15cf02cadb174 Mon Sep 17 00:00:00 2001 From: Roopesh Chander Date: Thu, 13 Dec 2018 17:10:24 +0530 Subject: Logging: ringlogger.c: Trim trailing newlines Signed-off-by: Roopesh Chander --- WireGuard/Shared/Logging/ringlogger.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'WireGuard/Shared/Logging/ringlogger.c') diff --git a/WireGuard/Shared/Logging/ringlogger.c b/WireGuard/Shared/Logging/ringlogger.c index ea862de..11de0c3 100644 --- a/WireGuard/Shared/Logging/ringlogger.c +++ b/WireGuard/Shared/Logging/ringlogger.c @@ -29,6 +29,13 @@ void write_msg_to_log(struct log *log, const char *msg) strncpy(line->line, msg, MAX_LOG_LINE_LENGTH - 1); line->line[MAX_LOG_LINE_LENGTH - 1] = '\0'; + // Trim trailing newlines + unsigned long length = strlen(msg); + while ((length > 0) && (msg[length - 1] == '\n' || msg[length - 1] == '\r')) { + line->line[length - 1] = '\0'; + length--; + } + msync(&log->header, sizeof(log->header), MS_ASYNC); msync(line, sizeof(*line), MS_ASYNC); } -- cgit v1.2.3-59-g8ed1b