Date: Mon, 20 Jan 2020 01:38:03 +0000 (UTC) From: Mark Johnston <markj@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r356903 - stable/12/usr.bin/diff Message-ID: <202001200138.00K1c330011542@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: markj Date: Mon Jan 20 01:38:03 2020 New Revision: 356903 URL: https://svnweb.freebsd.org/changeset/base/356903 Log: MFC r356695, r356731: Optimize diff -q. PR: 242828 Modified: stable/12/usr.bin/diff/diffreg.c Directory Properties: stable/12/ (props changed) Modified: stable/12/usr.bin/diff/diffreg.c ============================================================================== --- stable/12/usr.bin/diff/diffreg.c Sun Jan 19 23:47:32 2020 (r356902) +++ stable/12/usr.bin/diff/diffreg.c Mon Jan 20 01:38:03 2020 (r356903) @@ -349,6 +349,11 @@ diffreg(char *file1, char *file2, int flags, int capsi goto closem; } + if (diff_format == D_BRIEF && ignore_pats == NULL) { + rval = D_DIFFER; + status |= 1; + goto closem; + } if ((flags & D_FORCEASCII) == 0 && (!asciifile(f1) || !asciifile(f2))) { rval = D_BINARY;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001200138.00K1c330011542>