From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oa1-x2e.google.com (mail-oa1-x2e.google.com [IPv6:2001:4860:4864:20::2e]) by sourceware.org (Postfix) with ESMTPS id 7955A3857016 for ; Mon, 5 Sep 2022 12:42:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 7955A3857016 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-x2e.google.com with SMTP id 586e51a60fabf-127a3a39131so330437fac.13 for ; Mon, 05 Sep 2022 05:42:43 -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=BoLLigacEhuaPdg27ta1HA4NH7d5Yh3xp9FhYFQwE4zGHw2MM2xk6/9Dl1CvlYivox WBTwJlCXP8/p880LkKSSq9px7R8Lkh60zznlf3c9xb4z6H+SjBI8kJDFC+u+M8qrjnl+ iDa/kVf4fiheWefLdYhxcV6GS647XIW/mKmwRwPW6X8rlCFOJsP/Tn1JLNJqGHAAy8Xy BWFOeGd2u834/tmk48ayZlJ3bBpkXY8ljlukvJ1gkmHipqREUwkwn8P2Al5A0tJNjBeF Ofu55HZpKbGkMZmhrnnrXj3CSKJZmu2EczJgzFLlIOcIO0ojXE7Ys50zFhbRaDceMCIc Ti8g== 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=cIQDzh+jgj9BxOgLvWd1n/R7T6xtxemWExWe3mPLP1cJKoFYD6Xv9GyaR6Q34XRNlo z9NX/VsVLNqySxV0s3MCD6E6tr11NcwtEg0cPi2wx2FzI29NY3xZTU80s52D39orogFM 6pW0tN1uAcf+q7pF259uA6IJPvWLTKW0ZMUKOsKJkjK+Am9m6NNiEddkw6qIoiu+TfNE RZdbH3w6BWuuycbX+xlZuvXj3kxJgp/XvezGmsP30ogdN+2LXeSo0tkC9/MYRhDWDKEt iGXmRuR0mQ2DV1hLURkwiWCeeS5UAf6yoCu78tj0h/d+3w15i4snOvCUAJC/vuYl5Q01 +HEw== X-Gm-Message-State: ACgBeo2XgpS7X5kmaDAjChCF75xmjiKCPSME4CFH3OYDvQ3IF9HAjHx4 drkyX/ncUJlasSlJgrzkZoEJr1EYhP6qDA== X-Google-Smtp-Source: AA6agR795T4ywZE2u6lAKMQFyyUlNJjhd7pOeEf55MRnJxwUVV85qcmPp6TR9aq2b/L1x4Gup9mRUw== X-Received: by 2002:a05:6808:190d:b0:344:d816:6ea1 with SMTP id bf13-20020a056808190d00b00344d8166ea1mr7512320oib.154.1662381762096; Mon, 05 Sep 2022 05:42:42 -0700 (PDT) Received: from mandiga.. ([2804:1b3:a7c0:dfed:168f:3c48:ec1f:784d]) by smtp.gmail.com with ESMTPSA id l21-20020a9d7a95000000b00616d25dc933sm4465387otn.69.2022.09.05.05.42.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Sep 2022 05:42:41 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [COMMITTED] syslog: Remove extra whitespace between timestamp and message (BZ#29544) Date: Mon, 5 Sep 2022 09:42:32 -0300 Message-Id: <20220905124232.373184-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