summaryrefslogtreecommitdiff
path: root/usr.bin/diff
diff options
context:
space:
mode:
authorMark Johnston <markj@FreeBSD.org>2020-01-13 18:29:47 +0000
committerMark Johnston <markj@FreeBSD.org>2020-01-13 18:29:47 +0000
commit5248d3b1b2272f9ae392a4eda3cc6859a5d65cda (patch)
tree51fe3baaebc9b811497d10cfc7984da19fceed06 /usr.bin/diff
parent2a345f61dadb7861cee4939c5feac2b9f02d90ee (diff)
downloadsrc-test2-5248d3b1b2272f9ae392a4eda3cc6859a5d65cda.tar.gz
src-test2-5248d3b1b2272f9ae392a4eda3cc6859a5d65cda.zip
Optimize diff -q.
Once we know whether the files differ, we don't need to do any further work. PR: 242828 Submitted by: fehmi noyan isi <fnoyanisi@yahoo.com> (original version) Reviewed by: bapt, kevans MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D23152
Notes
Notes: svn path=/head/; revision=356695
Diffstat (limited to 'usr.bin/diff')
-rw-r--r--usr.bin/diff/diffreg.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/usr.bin/diff/diffreg.c b/usr.bin/diff/diffreg.c
index c2fa9fb40621..745e2cac3181 100644
--- a/usr.bin/diff/diffreg.c
+++ b/usr.bin/diff/diffreg.c
@@ -349,6 +349,11 @@ diffreg(char *file1, char *file2, int flags, int capsicum)
goto closem;
}
+ if (diff_format == D_BRIEF) {
+ rval = D_DIFFER;
+ status |= 1;
+ goto closem;
+ }
if ((flags & D_FORCEASCII) == 0 &&
(!asciifile(f1) || !asciifile(f2))) {
rval = D_BINARY;