git: 7e64519a479a - main - diff: set cflag when passed to diff
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 09 Mar 2022 09:34:33 UTC
The branch main has been updated by thj:
URL: https://cgit.FreeBSD.org/src/commit/?id=7e64519a479abe1ff92a0985790f5c2b8a9d95df
commit 7e64519a479abe1ff92a0985790f5c2b8a9d95df
Author: Tom Jones <thj@FreeBSD.org>
AuthorDate: 2022-03-08 16:58:25 +0000
Commit: Tom Jones <thj@FreeBSD.org>
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);