From nobody Mon Jun 19 15:28:56 2023 X-Original-To: dev-commits-src-main@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 4QlDFP335mz4dtmN; Mon, 19 Jun 2023 15:28:57 +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 4QlDFP0JR2z4Ll7; Mon, 19 Jun 2023 15:28:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687188537; 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=nUVVgiHJrNLTTr+6/RJb3lScCRepigYhd5HmjSy4B0o=; b=qKASwubp//2PrbuHs5cGtVGpGsK294Cp77HqyV704TML6KS2KjsqfiW7ocTcTG3/w3DLJ5 aTCZVAfnNkR4gzpusnkM2osyhn8ec2VFjiV3TgNem26T0c5IMiy5RYpp9YtaoqDe4iWhk4 Syn7dVs4dDrpQieUlYtNEm/ABTcsGNHUeqo1cHiCQNCmPzARfV3glnJkFP+nkfc0JWtUZo +lGXyhOZ4cKSPD4KkkSFaOtirNx+/SRIH0LJUkpQej6/rHE/Ks8SJeo69WrMRvLJCzEazY 3EggI8KpV1bnFzUHPOxQ8MJjrbDA4u2ElcihAL+erpt+FitgODpUo4ycWNSiwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687188537; 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=nUVVgiHJrNLTTr+6/RJb3lScCRepigYhd5HmjSy4B0o=; b=TRgh1xej66wHtP0qBO5MhjAo3VYWG1fdXnMUL/dRe8MVJzrbS81A336jn+6Iv0kMgKRxTg MIj9Oooi7WuVrCFA/J+GM9ucTf8bSkTbKsH1nFwPP00CR9+/UzWcY7o7twecgZo3iZJSPm wlQxRzTyy4w3mfzBK3g16ky+ZkHaXW/obRQUA+g/IquUPFei7ybZYkiNcX0P5Ru7FKL1sY cxhxBZe/CDezEDQkdvL72inrWZ51hzQxBgRCt3AI2EDccjqa5nOfGcQyL/aqH5hA68IxqW TXFAbY9ALsMl2F6ZoRmL3PuPGnhtH7ly/gTe0ozl7rehqw/K5sZAVK5vBWxDdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687188537; a=rsa-sha256; cv=none; b=hcqHFtXRBfC86AsmhJfcXeY0ha/2INY+y57G1mxNaBRg0ua1JfLBJLNaMI0lZ1e1g8yfOO yLRT4Lbx6H84ajZHMT6hwunBSDdUs9hJONN4KAvv2SgNzaQEB5jtGshoKAmVyY+BV7VCJ8 vX9U6enwr43EyyNfukT3NEXKWjeL6UeE86aOFHJIC7tjysHUGwM7C5USqnFj10lVEoZwxp ys3k3dlXnF60/dEqRDjsGapam7OhYFU+E9jj6YlWXdhd9AU9Ih+BpiOnlbpPM9aEYUhmYN VEXpax6CMD8HPzfPaZ0rmiXB6BI0UBJMzVJF0JQr6qAHWAgKiBO0zV2w8QRn8w== 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 4QlDFN6BsDzMt2; Mon, 19 Jun 2023 15:28:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35JFSuUQ066772; Mon, 19 Jun 2023 15:28:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35JFSusJ066771; Mon, 19 Jun 2023 15:28:56 GMT (envelope-from git) Date: Mon, 19 Jun 2023 15:28:56 GMT Message-Id: <202306191528.35JFSusJ066771@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: e54db9a9ccd5 - main - seq: fix check for rounding error/truncation List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e54db9a9ccd588f650a2e57bf9d1cbbafc0e12eb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e54db9a9ccd588f650a2e57bf9d1cbbafc0e12eb commit e54db9a9ccd588f650a2e57bf9d1cbbafc0e12eb Author: Ed Maste AuthorDate: 2023-06-19 01:37:06 +0000 Commit: Ed Maste CommitDate: 2023-06-19 15:02:38 +0000 seq: fix check for rounding error/truncation Based on OpenBSD 30f0fd29ba6c: > We need to compare the printable version of the last value displayed, > not the floating point representation. Otherwise, we may print the > last value twice. PR: 271964 Reported by: Daniel Kolesa Reviewed by: yuripv Obtained from: OpenBSD Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40601 --- usr.bin/seq/seq.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/usr.bin/seq/seq.c b/usr.bin/seq/seq.c index 85fca6e88792..3618a106ec9e 100644 --- a/usr.bin/seq/seq.c +++ b/usr.bin/seq/seq.c @@ -88,14 +88,14 @@ main(int argc, char *argv[]) { const char *sep, *term; struct lconv *locale; - char pad, *fmt, *cur_print, *last_print; - double first, last, incr, last_shown_value, cur, step; + char pad, *fmt, *cur_print, *last_print, *prev_print; + double first, last, incr, prev, cur, step; int c, errflg, equalize; pad = ZERO; fmt = NULL; first = 1.0; - last = incr = last_shown_value = 0.0; + last = incr = prev = 0.0; c = errflg = equalize = 0; sep = "\n"; term = NULL; @@ -186,7 +186,7 @@ main(int argc, char *argv[]) cur = first + incr * step++) { printf(fmt, cur); fputs(sep, stdout); - last_shown_value = cur; + prev = cur; } /* @@ -194,10 +194,9 @@ main(int argc, char *argv[]) * * We might have, so check if the printable version of the last * computed value ('cur') and desired 'last' value are equal. If they - * are equal after formatting truncation, but 'cur' and - * 'last_shown_value' are not equal, it means the exit condition of the - * loop held true due to a rounding error and we still need to print - * 'last'. + * are equal after formatting truncation, but 'cur' and 'prev' are not + * equal, it means the exit condition of the loop held true due to a + * rounding error and we still need to print 'last'. */ if (asprintf(&cur_print, fmt, cur) < 0) { err(1, "asprintf"); @@ -205,12 +204,17 @@ main(int argc, char *argv[]) if (asprintf(&last_print, fmt, last) < 0) { err(1, "asprintf"); } - if (strcmp(cur_print, last_print) == 0 && cur != last_shown_value) { + if (asprintf(&prev_print, fmt, prev) < 0) { + err(1, "asprintf"); + } + if (strcmp(cur_print, last_print) == 0 && + strcmp(cur_print, prev_print) != 0) { fputs(last_print, stdout); fputs(sep, stdout); } free(cur_print); free(last_print); + free(prev_print); if (term != NULL) fputs(term, stdout);