From owner-svn-src-head@freebsd.org Sat Apr 8 08:46:04 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 04A0AD34E82; Sat, 8 Apr 2017 08:46:04 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B11136C7; Sat, 8 Apr 2017 08:46:03 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v388k2jp049196; Sat, 8 Apr 2017 08:46:02 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v388k2ke049194; Sat, 8 Apr 2017 08:46:02 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201704080846.v388k2ke049194@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sat, 8 Apr 2017 08:46:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r316639 - head/usr.bin/diff X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 08 Apr 2017 08:46:04 -0000 Author: bapt Date: Sat Apr 8 08:46:02 2017 New Revision: 316639 URL: https://svnweb.freebsd.org/changeset/base/316639 Log: add a stub --speed-large-files for compatibility with GNU diff There is no intention to implement it, but lots of scripts/tools using diff(1) passes GNU diff option Modified: head/usr.bin/diff/diff.1 head/usr.bin/diff/diff.c Modified: head/usr.bin/diff/diff.1 ============================================================================== --- head/usr.bin/diff/diff.1 Sat Apr 8 08:42:25 2017 (r316638) +++ head/usr.bin/diff/diff.1 Sat Apr 8 08:46:02 2017 (r316639) @@ -30,7 +30,7 @@ .\" @(#)diff.1 8.1 (Berkeley) 6/30/93 .\" $FreeBSD$ .\" -.Dd March 22, 2017 +.Dd April 8, 2017 .Dt DIFF 1 .Os .Sh NAME @@ -57,6 +57,7 @@ .Op Fl -rcs .Op Fl -show-c-function .Op Fl -starting-file +.Op Fl -speed-large-files .Op Fl -strip-trailing-cr .Op Fl -tabsize .Op Fl -text @@ -82,6 +83,7 @@ .Op Fl -paginate .Op Fl -rcs .Op Fl -show-c-function +.Op Fl -speed-large-files .Op Fl -starting-file .Op Fl -strip-trailing-cr .Op Fl -tabsize @@ -105,6 +107,7 @@ .Op Fl -paginate .Op Fl -rcs .Op Fl -show-c-function +.Op Fl -speed-large-files .Op Fl -starting-file .Op Fl -strip-trailing-cr .Op Fl -tabsize @@ -129,6 +132,7 @@ .Op Fl -paginate .Op Fl -rcs .Op Fl -show-c-function +.Op Fl -speed-large-files .Op Fl -starting-file .Op Fl -strip-trailing-cr .Op Fl -tabsize @@ -159,6 +163,7 @@ .Op Fl -recursive .Op Fl -report-identical-files .Op Fl -show-c-function +.Op Fl -speed-large-files .Op Fl -strip-trailing-cr .Op Fl -tabsize .Op Fl -text Modified: head/usr.bin/diff/diff.c ============================================================================== --- head/usr.bin/diff/diff.c Sat Apr 8 08:42:25 2017 (r316638) +++ head/usr.bin/diff/diff.c Sat Apr 8 08:46:02 2017 (r316639) @@ -55,6 +55,7 @@ enum { OPT_NO_IGN_FN_CASE, OPT_NORMAL, OPT_HORIZON_LINES, + OPT_SPEED_LARGE_FILES, }; static struct option longopts[] = { @@ -87,6 +88,7 @@ static struct option longopts[] = { { "horizon-lines", required_argument, NULL, OPT_HORIZON_LINES }, { "no-ignore-file-name-case", no_argument, NULL, OPT_NO_IGN_FN_CASE }, { "normal", no_argument, NULL, OPT_NORMAL }, + { "speed-large-files", no_argument, NULL, OPT_SPEED_LARGE_FILES}, { "strip-trailing-cr", no_argument, NULL, OPT_STRIPCR }, { "tabsize", optional_argument, NULL, OPT_TSIZE }, { NULL, 0, 0, '\0'} @@ -245,6 +247,8 @@ main(int argc, char **argv) usage(); } break; + case OPT_SPEED_LARGE_FILES: + break; /* ignore but needed for compatibility with GNU diff */ case OPT_STRIPCR: dflags |= D_STRIPCR; break;