From nobody Wed Mar 09 09:34:33 2022 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 1C3281A01E20; Wed, 9 Mar 2022 09:34:34 +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 4KD6V20Hzwz4llY; Wed, 9 Mar 2022 09:34:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646818474; 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=19h9m0m8cxhKURoHN/7aGGfkgQkFk+SECD8JSM8U8LQ=; b=IObeJeut0rBYifEkn3OR3SsC29emu2AozYk9/q/vRy7gZw0z7xwXjmUgJYxHosYVcQeCaZ 1b873WncDmXCq0rkFTaQxpurQsFrQ/kn5lVIMR6dRefjvyDoYvDHVjlWxeLW3KNKQ/Yjgk qxdllBN5GH6JVrL/t1vLQXL9j2Y8ToQ7vuxfL7jNnWHZpsXNHiAEw7LYLRfBVu4Byao/KN jmRJBnO8lnWBdvEt2POfEOE09aRda7N2IiqHjxLolCsLuxMvRAldHbrBsTSGtyb9LZhFdz 8Xemp5Axv4cn/nhzgkByoajQJlabRc19Rro7W7ixVE827eZttrM5feYnERhF9w== 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 DDD1766D0; Wed, 9 Mar 2022 09:34:33 +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 2299YXkj049108; Wed, 9 Mar 2022 09:34:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2299YXhU049107; Wed, 9 Mar 2022 09:34:33 GMT (envelope-from git) Date: Wed, 9 Mar 2022 09:34:33 GMT Message-Id: <202203090934.2299YXhU049107@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Tom Jones Subject: git: 7e64519a479a - main - diff: set cflag when passed to diff 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: thj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7e64519a479abe1ff92a0985790f5c2b8a9d95df Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646818474; 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=19h9m0m8cxhKURoHN/7aGGfkgQkFk+SECD8JSM8U8LQ=; b=Qv424NNjxblHLu/GifBg9N2HIkgL4Fva1zWnR3Tq6BEREbHMht17Z852TlaA642R02IhL5 r1Zqa890u3BwraJ5uHKeGKRsvq29eCAC9zW1sX1ZVHcqG4C7ABt7kLRjDrPj4/hs16pdhJ M43TsFicPVVjrv/z5aJDhBtGCPovMy3zGVLjjTjB1QxtiKNJ1mPcatMBPa9a1tN0LeDsu1 qBvb8mCCjJYxGN0W9LZs+uvY/gcb9rxTkmQN3ykR8+jiFZd+LQYprnDw85MabOH/eH2N8W wwi0TY4gKV6eIcmG5m2GzW/6hgej+RnAUflLvcNZ1DX6P9KAR46dX/Oa70pVmA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646818474; a=rsa-sha256; cv=none; b=jYchqsAOjQWp6U/+SuYzcr8QK320BHgnpBdMK3Mj23OAp2yrICr0aQTmIBZ2dkl0I998iF b3gMMkN874FcEIrEOtJf4Kg9e3xU1yoxpfDUz8nGCaFVQ5rQD29hr/G67JKEM+pWx2G8Vq y1Xl1Cq4hhXtn2G8ebhlCVaNAvzOs/L+SvIiuSr5/f+eCkWI0C0lRsLDSBTxlPewoAZI6F lfwXyZkZ3h8EvznMLRM/iUEXzo8BJfuB1i2TtHfe5NJdqS6Wmuvey25M7ZE7WUbKN72gFV UKMhnwl+JAUs5puTG7+0UJreYS2VPFfLQJhLEAjqm4a+y05+Tym3WZIWEQkP4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by thj: URL: https://cgit.FreeBSD.org/src/commit/?id=7e64519a479abe1ff92a0985790f5c2b8a9d95df commit 7e64519a479abe1ff92a0985790f5c2b8a9d95df Author: Tom Jones AuthorDate: 2022-03-08 16:58:25 +0000 Commit: Tom Jones CommitDate: 2022-03-09 09:32:14 +0000 diff: set cflag when passed to diff In b5541f456d641d23e0c46874daff0b62552bf3cb when flags were converted to be boolean, the setting of cflag as an integer was removed, but no boolean set was added. This effects the output format of dates, but the context type was set to D_CONTEXT so other functionality worked. Reviewed by: bapt Sponsored by: Klara Inc. Differential Revision: https://reviews.freebsd.org/D34481 --- usr.bin/diff/diff.c | 1 + 1 file changed, 1 insertion(+) diff --git a/usr.bin/diff/diff.c b/usr.bin/diff/diff.c index 224301d56d18..34cdd0d846d9 100644 --- a/usr.bin/diff/diff.c +++ b/usr.bin/diff/diff.c @@ -159,6 +159,7 @@ main(int argc, char **argv) case 'c': if (FORMAT_MISMATCHED(D_CONTEXT)) conflicting_format(); + cflag = true; diff_format = D_CONTEXT; if (optarg != NULL) { l = strtol(optarg, &ep, 10);