From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oa1-x35.google.com (mail-oa1-x35.google.com [IPv6:2001:4860:4864:20::35]) by sourceware.org (Postfix) with ESMTPS id 9EC6A3857017 for ; Mon, 5 Sep 2022 12:55:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 9EC6A3857017 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org Received: by mail-oa1-x35.google.com with SMTP id 586e51a60fabf-1272fc7f51aso7897280fac.12 for ; Mon, 05 Sep 2022 05:55:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date; bh=koofy7mRqCZrYzC95NfArOMAA1qXSmyDe+0+FCzJPgg=; b=aNNUTkJjhqjTyOhLQwWrzGqlozfD5r5qWZ6fAWEfKmJN7RQKxdwHlApxh90oUg0TKk 471ewBbfyL2OePCoj9Jzmg6OvpqAKbiP1HvZU1N6HUqGjhQZ5RwJzdBLBrgG9z0Aixdo CS8pEAwd6acmRP+8cHUVPguTKS9n8szO/Ix/kbExPszcOIKmM9Gw2eqNppYNqeI1SZ37 waaHRckerKPUPYLXmnoh08RJzN5yyXaVqnrH2bFhSeIWmNT7zpirmad9YZvv7DF/+Fs2 D8SyMsDphdLtSVBSjJBh2vt416XBT9OnjdfttVvRw2frY3Xqv78Nfz8jkkb5MzHFotJ+ sKuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date; bh=koofy7mRqCZrYzC95NfArOMAA1qXSmyDe+0+FCzJPgg=; b=eyS4DKttWWDTeihY2QvxaQmtcoZmIX+tNoRNPBESm9sHszI/5S7jYVKNbIt0dWwt8s pQLCxP3WKUQWAzcbcPSDmFoCXzGSmUBKrQS8d+v1WtB1TZ13VFTpVVhzz6mLSUAUpAqF JXCs1JD3f4yEEUB3r4v5Pk+NYRXKvfJPvEuMOgoFGo0+ywdEqJ85OvCnxi78/zZK5fHl MRw5LqijWEuG5HeHy4sPT0iEXoRnzZtxozc9wSQS/Jc9SsX5S4SqUTrtEAQEX2iIcksq edzsQfTMkWQBFyf3w56Hg1vMG5ufAhxNwYKDwmsB+PZAE9ggT9cDEhy9de+L+D6TEY46 uTOA== X-Gm-Message-State: ACgBeo0+HvT6tmZ4tjP2Fst64aYPAsf8kVwm7K9BX741zn/QzrxDW7iS u/T2RakWTT3enQ28ntMFIjzHSQRpx88jqA== X-Google-Smtp-Source: AA6agR56gnQXF04UYoXey4ys0Ch7I+JvhsWqtqo61TuYqe2gZJ2cEAUyE1E0akIJugnDLSQNd+EPCQ== X-Received: by 2002:a05:6870:61d3:b0:127:79b9:bb0 with SMTP id b19-20020a05687061d300b0012779b90bb0mr1601437oah.282.1662382524598; Mon, 05 Sep 2022 05:55:24 -0700 (PDT) Received: from mandiga.. ([2804:1b3:a7c0:dfed:168f:3c48:ec1f:784d]) by smtp.gmail.com with ESMTPSA id a7-20020a05683012c700b00636a8dafdc9sm4549051otq.2.2022.09.05.05.55.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Sep 2022 05:55:24 -0700 (PDT) From: Adhemerval Zanella To: libc-stable@sourceware.org Subject: [COMMITTED 2.36] syslog: Remove extra whitespace between timestamp and message (BZ#29544) Date: Mon, 5 Sep 2022 09:55:21 -0300 Message-Id: <20220905125521.463797-1-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: The rfc3164 clear states that a single space character must follow the timestamp field. Checked on x86_64-linux-gnu. --- misc/syslog.c | 2 +- misc/tst-syslog.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/misc/syslog.c b/misc/syslog.c index b88f66c835..f67d4b58a4 100644 --- a/misc/syslog.c +++ b/misc/syslog.c @@ -167,7 +167,7 @@ __vsyslog_internal (int pri, const char *fmt, va_list ap, _nl_C_locobj_ptr); #define SYSLOG_HEADER(__pri, __timestamp, __msgoff, pid) \ - "<%d>%s %n%s%s%.0d%s: ", \ + "<%d>%s%n%s%s%.0d%s: ", \ __pri, __timestamp, __msgoff, \ LogTag == NULL ? __progname : LogTag, \ "[" + (pid == 0), pid, "]" + (pid == 0) diff --git a/misc/tst-syslog.c b/misc/tst-syslog.c index 1d332ece53..3560b518a2 100644 --- a/misc/tst-syslog.c +++ b/misc/tst-syslog.c @@ -275,16 +275,19 @@ parse_syslog_msg (const char *msg) { struct msg_t r = { .pid = -1 }; int number; + int wsb, wsa; #define STRINPUT(size) XSTRINPUT(size) #define XSTRINPUT(size) "%" # size "s" /* The message in the form: - <179>Apr 8 14:51:19 tst-syslog: message 176 3 */ - int n = sscanf (msg, "<%3d>%*s %*d %*d:%*d:%*d " STRINPUT(IDENT_LENGTH) + <179>Apr 8 14:51:19 tst-syslog: message 176 3 */ + int n = sscanf (msg, "<%3d>%*s %*d %*d:%*d:%*d%n %n" STRINPUT(IDENT_LENGTH) " " STRINPUT(MSG_LENGTH) " %*d %*d", - &number, r.ident, r.msg); + &number, &wsb, &wsa, r.ident, r.msg); TEST_COMPARE (n, 3); + /* It should only one space between timestamp and message. */ + TEST_COMPARE (wsa - wsb, 1); r.facility = number & LOG_FACMASK; r.priority = number & LOG_PRIMASK; -- 2.34.1