From nobody Tue Aug 1 21:06:51 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 4RFnjT0cthz4prlD; Tue, 1 Aug 2023 21:06:52 +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 4RFnjR3Y6bz3Lhp; Tue, 1 Aug 2023 21:06:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690924011; 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=5nN7+gKR44KWa7zXZ6Mpm9RMgBUczQwIblAjrNkpyRQ=; b=G7svrM/83/MOoNwk7ytfyKelk+FguYckVxX/34xgHDVdCGmLRmCAweSMRZH5Zf3LftdVLI QSEGsfXjj8uN7mOeF3kdSXtCP1jJHTb+ZVpKegz8dvYwS9Q8U4PnwnyRLDwlYewTe9JkKy yNchXVFEdHuVUnalqHH3B8Dj6m0B6+8tG4IkJEbqw19kJG4UDSjEAJHbqDK6mHRN8G9Dfg ULcS+pPA6hEVNbITIUyD+5clX40Z39VcSclrEWDARDiNLanfE8f8InlQjSKsPM+1FmLWYI ucP4BZVUPIGxrePI+b90iMyN5wWDTJuN2Q0YynTp0kBL64uR4vGU4uKmUxHgWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690924011; a=rsa-sha256; cv=none; b=FNmr2LhRRtnE+8iNZT98UdZwSIH1C/Q369lB6i3kX046hXmEBimREpx9l4zXmt+V5TgCBy yjv+ohGNoJ+FItUQEp2PKpC8omZVBG6yfaMF/xRw2jViPzE8Vn9vajqb53dMN+RANzjRfZ McGGOHzOZJh01hrS8rolUnRHpoLcDrW6m1Y13BJT8FLKEbBsAR4Ncv5gStRJJOzRakpkDS ONyShkw2uC0zrFk73g3jVGCRBhpMSNgt9X0SGnnm0dJsyfsP4lbqxpVwhC7rWdsV9mF0Gd L09g3GqYyS/cq4KwjtS4KAl03FNyY37lHBJrxfOPfRN96+MR3CKYEWcsT9wL4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690924011; 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=5nN7+gKR44KWa7zXZ6Mpm9RMgBUczQwIblAjrNkpyRQ=; b=BLLwOOo8eJ2HhTD6foPHS0JMYYpzvJhmFd3cnCXifQTr7Ef78xGd4JPg3T31S1RIiFoGgx 0J6JUJQqgJBZ6ogc5WrAaadGAsuCUaO5N3ZlvhLP+yQ8SRYkY+nwW80ruxzeTyzdx8XlRO oIhO8pPiVpE1cAl+HOePC/xKQlDOJb6gPPGJCsNUTCS0AKBcchcjXAVtT0c6Ob2zXNcWeA Sa2i3xkVtvKjtqGiL9enLqfKnE/ygpOC4cIOW5arFooIrr/mw7FzokkuD3o58pGFm3sMQR 7fVf9fRstvImGGEKYtvs63iKy8mXWeqQFZze45oNDa8h70MqAUC+9Ef8YHf1Rw== 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 4RFnjR2NZpzssg; Tue, 1 Aug 2023 21:06:51 +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 371L6pnX013908; Tue, 1 Aug 2023 21:06:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371L6pkm013907; Tue, 1 Aug 2023 21:06:51 GMT (envelope-from git) Date: Tue, 1 Aug 2023 21:06:51 GMT Message-Id: <202308012106.371L6pkm013907@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: e8a46057d1b9 - stable/13 - resizewin: Stop printing bogus NUL to TTY 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e8a46057d1b9a2e7e6f16f61b1fe80125788b6ad Auto-Submitted: auto-generated The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=e8a46057d1b9a2e7e6f16f61b1fe80125788b6ad commit e8a46057d1b9a2e7e6f16f61b1fe80125788b6ad Author: Jessica Clarke AuthorDate: 2023-06-14 22:58:36 +0000 Commit: Jessica Clarke CommitDate: 2023-08-01 20:42:53 +0000 resizewin: Stop printing bogus NUL to TTY A char array has an implicit NUL terminating it, which sizeof will include, so we need to subtract 1 here. Printing a NUL can cause issues for things like CI environments that aren't expecting it, especially with recent Jenkins being stricter about not putting NUL in XML files. Fixes: 3d222369acbe ("Add a small tool, resizewin(1), to query terminal for window size") MFC after: 1 week (cherry picked from commit 456c1199d3b3ee477463c6469940c0370de2b2ea) --- usr.bin/resizewin/resizewin.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/resizewin/resizewin.c b/usr.bin/resizewin/resizewin.c index b6df862b8a49..e53364cf1254 100644 --- a/usr.bin/resizewin/resizewin.c +++ b/usr.bin/resizewin/resizewin.c @@ -101,7 +101,7 @@ main(int argc, char **argv) if (tcsetattr(fd, TCSAFLUSH, &new) == -1) exit(1); - if (write(fd, query, sizeof(query)) != sizeof(query)) { + if (write(fd, query, sizeof(query) - 1) != sizeof(query) - 1) { error = 1; goto out; }