From nobody Tue Jul 18 08:07:45 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4R4s4x3krrz4nwJy; Tue, 18 Jul 2023 08:07:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R4s4x3GxKz4JrF; Tue, 18 Jul 2023 08:07:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689667665; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zl4cLXusL3DTpSX3Kk4ThN/JQs0ETlvPgwNJXpGFjAA=; b=YQuGyovETyps6NbJCArFPMr3jqhXeLMedUMgTijhuciUsBu9bBtRZLc0wrWPrug8EmYsE6 IVxZv5a4ddFDUbpV/YeXxNoVwJf+JrBeZ+phaokftukOav4qugqOtAWLKqB6CMqgL/5E/X gljRB5UvUa4K2edZNfEPjXDfzUmSHFm5f5hJ8VXGsoXDO4IaiB2W0mM7qnHUm9jBU4ZdYi 1bxCBlBXAVWGvElB+zXF3bByn+hclc0SD2+a6OxaX+XCYJSLQYzBAISemSqnDIpfJq32CF iQmYwgDc1D3H1J/P/iBn3f1ZXwy98UhY8MtJ+d+d3Kd55LrgtSu81ythYonf1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689667665; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zl4cLXusL3DTpSX3Kk4ThN/JQs0ETlvPgwNJXpGFjAA=; b=PGfxCsskNX3OJAT6cfuyZTAtwtfJ6ki6eyVlTN4xxkR/eNU6zK48ciycExdl6Vduvmy2m7 /io+1QW2hofi1BAR9zDQgvilrhiwlCh1jawMYsH5iSs5DOvFFiFF5/r/Gu6P9bLXs4PreX lKBkyagE6AvS9WN712YOSF8yBOUzvAwkskEy23Hd+mlUWyx7Sa1BCRxTBdF8X3XaECok0K lar9iPib/yubOQoPBvBzAydLc+k0pRtFyyPaiQPAiGGuYvrll/lBcgxccI3dos+2FxZfhs C+adWjJJEf5j59TbI5THsdllwas0h1tgpQd8gqaGO2mmlfOuogZA0Iy2o8/RDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689667665; a=rsa-sha256; cv=none; b=xFi6T0xwWmeo/fYfA32CXt08zVQEHbJr4rfXZJo/fQs9eswpCzIQO+1XewCKIBS1/7vMAU RdO3h7mWAqCt0Uw6j+GgrHjrqYwGSd1/meRYNWf3EvAJ5QEWFZhFMaGUtg1xMGORwPFN9a mXLXs6iHYCyjp2UhOV8zjdpXgyyXk6iuXfvbyHk09WkWe4akZFMxFLcssNZbFHprtqLHTg 09Mb5Mj15honrReozdRGUqOerqzzxsxos+fUXZqOt6aaHuZXOxQGgR4uObH7fZB9w+k/qU e5xpeGTGdvBn1O7tBlgLzInVb2vDElhacEN7Ntm3shR20Ey+tieX5cgZNBcJvw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R4s4x2JRSzyFs; Tue, 18 Jul 2023 08:07:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36I87jhK004408; Tue, 18 Jul 2023 08:07:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36I87jWB004407; Tue, 18 Jul 2023 08:07:45 GMT (envelope-from git) Date: Tue, 18 Jul 2023 08:07:45 GMT Message-Id: <202307180807.36I87jWB004407@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: 829dbdcac20d - stable/12 - logger(1): MFC: fix timestamps in case of long run List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 829dbdcac20d1237ac9693d2e5489857e151754a Auto-Submitted: auto-generated The branch stable/12 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=829dbdcac20d1237ac9693d2e5489857e151754a commit 829dbdcac20d1237ac9693d2e5489857e151754a Author: Eugene Grosbein AuthorDate: 2023-04-27 16:43:16 +0000 Commit: Eugene Grosbein CommitDate: 2023-07-18 07:24:26 +0000 logger(1): MFC: fix timestamps in case of long run An example: ( echo test; sleep 2; echo test2 ) | logger -h /var/run/log Before fix, logger assigned same timestamp to both records. Fixes: 65547fb33db901a9f352aacb0ed45ce68b0bd275 Reported by: Vadim Goncharov (cherry picked from commit 83fd35b3f3fa580d2b99874abd1f67ee61dcb659) --- usr.bin/logger/logger.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/usr.bin/logger/logger.c b/usr.bin/logger/logger.c index 936bfc98803c..a99db27f6b1b 100644 --- a/usr.bin/logger/logger.c +++ b/usr.bin/logger/logger.c @@ -175,22 +175,23 @@ main(int argc, char *argv[]) openlog(tag, logflags, 0); (void) fclose(stdout); - (void )time(&now); - (void )ctime_r(&now, tbuf); - tbuf[19] = '\0'; - timestamp = tbuf + 4; - if (hostname == NULL) { hostname = hbuf; (void )gethostname(hbuf, MAXHOSTNAMELEN); *strchrnul(hostname, '.') = '\0'; } + timestamp = tbuf + 4; + /* log input line if appropriate */ if (argc > 0) { char *p, *endp; size_t len; + (void )time(&now); + (void )ctime_r(&now, tbuf); + tbuf[19] = '\0'; + for (p = buf, endp = buf + sizeof(buf) - 2; *argv;) { len = strlen(*argv); if (p + len > endp && p > buf) { @@ -212,9 +213,14 @@ main(int argc, char *argv[]) logmessage(pri, timestamp, hostname, tag, socks, nsock, buf); } else - while (fgets(buf, sizeof(buf), stdin) != NULL) + while (fgets(buf, sizeof(buf), stdin) != NULL) { + (void )time(&now); + (void )ctime_r(&now, tbuf); + tbuf[19] = '\0'; + logmessage(pri, timestamp, hostname, tag, socks, nsock, buf); + } exit(0); }