From nobody Fri Jan 27 19:31:30 2023 X-Original-To: dev-commits-src-branches@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 4P3SPH1nmVz3bsHN; Fri, 27 Jan 2023 19:31:31 +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 4P3SPH1BtZz478V; Fri, 27 Jan 2023 19:31:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674847891; 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=bJpwInTXYb6qdVHM+yBjzyr8Hp7W9yJhIqwGiKTlswc=; b=kcTfQZcZgVbkbjt3Y/Ul9vhO+8tM3chA9yImJ6d5s/PXf5YWTFhmzdMeCH67b8AsHtIhIW g2vqAMgvTG6hsE2HywnGhqsAQ3OMwnJG+NAnxLdxeq6wwPbpUWleRAQC/VSJAeIJVv9XCo SzSa3iy3/FU4vFrz8RJZ02MFvSgBEUxbbnYWP25L/ZXtyJRFTYVXDrAv4DLD5JqVzyvmGC yOym8ECWHqDLAekN9YqCYwF4iDOTwsGx/WzWcZILdy13+xXFZLDKUuDJE/1WNM2edJn104 jlVDUlOIzohL5+woUA+okFMTz9KX8AAGSavTYF7RcKwjXSXewy8gU6L57ECb9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674847891; 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=bJpwInTXYb6qdVHM+yBjzyr8Hp7W9yJhIqwGiKTlswc=; b=k98phBOVgPJdX81b3jEtChVIZ+ifCy/2CDREnHSkCpwXukqPYGDexpfCK9uwWlh1imaGR5 I2udxpK70v/iSLXyljV6zPQpjNNtX7jt5W4gGBXc3YbV2DSLVcwj9YFevlpySGiVRJelMD 0WPCZuujUBXAIhB3Ad6Qqhp7I28asGr31roymGNnJ0N71BLDdfNi+d/sOJ3uq7zb92vx/u Fv70ByQ5lZNbavRbR8pHssu2FPJrEWQfkNubt9MRB4JIFp52qYuFEkpu4iE+c7KFgyxHez 5qgObOX5BAEm4HG8t4wRFc2ZQCR/xSENzaeecU8xuwsr71TDgFkRd6Uw6csFgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674847891; a=rsa-sha256; cv=none; b=bxR2Vaf9gq4eHNClx+7omPEy/coJ50s2DKm79jbW+QxiQmB7MV1/T4k4ZbIf+Ja99HpMau J3EAz5/E6qWhcxYPjeMS/07mFKjRt4enGDf1yrmfIdanJBr4UWJQjGAAlbdFtAnkGXFRS4 ILJxaVUADUvGfFDWrwjIRTGEUlY4woUPqE58l9J58sAZdiROXGwZvG/DlhtP5/q3RwYE02 bw7dml/4WFIsGOO0rGTf4io6pVNhBYu6YQ4WY+XlAw+MhQ0K3GAg/VnB6ABu0dk7yeYUc9 3QGp3OJaEnxVXvTnKo25VgtQ//wRsiuWdP8XZPfnnDHW6inxn2iIeo9npvccZw== 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 4P3SPH0HzxzLh1; Fri, 27 Jan 2023 19:31:31 +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 30RJVUFl038215; Fri, 27 Jan 2023 19:31:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30RJVUYH038214; Fri, 27 Jan 2023 19:31:30 GMT (envelope-from git) Date: Fri, 27 Jan 2023 19:31:30 GMT Message-Id: <202301271931.30RJVUYH038214@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 0811d18fea91 - stable/13 - cal: don't print terminal control characters unless stdout is a TTY List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0811d18fea9177b8c378d9d28ea34d6d3c81a5f6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=0811d18fea9177b8c378d9d28ea34d6d3c81a5f6 commit 0811d18fea9177b8c378d9d28ea34d6d3c81a5f6 Author: Alan Somers AuthorDate: 2023-01-13 20:19:03 +0000 Commit: Alan Somers CommitDate: 2023-01-27 19:30:53 +0000 cal: don't print terminal control characters unless stdout is a TTY A similar change was made in svn r223931, but it was incomplete, working only when the utility was invoked as "ncal". Fix the same issue when invoking as "cal". PR: 268936 Reported by: Ray Bellis Sponsored by: Axcient Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D38045 (cherry picked from commit 92e978439f0c3139775ad96d412959f5a74b17b6) --- usr.bin/ncal/ncal.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.bin/ncal/ncal.c b/usr.bin/ncal/ncal.c index 3f0df22e37fc..641c59f71e10 100644 --- a/usr.bin/ncal/ncal.c +++ b/usr.bin/ncal/ncal.c @@ -930,7 +930,8 @@ mkmonthb(int y, int m, int jd_flag, struct monthlines *mlines) dt.d = j - jan1 + 1; else sdateb(j, &dt); - if (j == highlightdate && !flag_nohighlight) + if (j == highlightdate && !flag_nohighlight + && isatty(STDOUT_FILENO)) highlight(mlines->lines[i] + k, ds + dt.d * dw, dw, &l); else