From owner-svn-src-user@freebsd.org Thu Mar 9 12:13:57 2017 Return-Path: Delivered-To: svn-src-user@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 6A530D04D99 for ; Thu, 9 Mar 2017 12:13:57 +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 209371822; Thu, 9 Mar 2017 12:13:57 +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 v29CDu5t033816; Thu, 9 Mar 2017 12:13:56 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v29CDuSr033815; Thu, 9 Mar 2017 12:13:56 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201703091213.v29CDuSr033815@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Thu, 9 Mar 2017 12:13:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r314957 - user/bapt/diff X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Mar 2017 12:13:57 -0000 Author: bapt Date: Thu Mar 9 12:13:56 2017 New Revision: 314957 URL: https://svnweb.freebsd.org/changeset/base/314957 Log: Update the usage() to reflect current reality Modified: user/bapt/diff/diff.c Modified: user/bapt/diff/diff.c ============================================================================== --- user/bapt/diff/diff.c Thu Mar 9 12:09:07 2017 (r314956) +++ user/bapt/diff/diff.c Thu Mar 9 12:13:56 2017 (r314957) @@ -435,13 +435,20 @@ void usage(void) { (void)fprintf(stderr, - "usage: diff [-aBbdilpTtw] [-c | -e | -f | -n | -q | -u] [-I pattern] [-L label]\n" - " file1 file2\n" - " diff [-aBbdilpTtw] [-I pattern] [-L label] -C number file1 file2\n" - " diff [-aBbdiltw] [-I pattern] -D string file1 file2\n" - " diff [-aBbdilpTtw] [-I pattern] [-L label] -U number file1 file2\n" - " diff [-aBbdilNPprsTtw] [-c | -e | -f | -n | -q | -u] [-I pattern]\n" - " [-L label] [-S name] [-X file] [-x pattern] dir1 dir2\n"); + "usage: diff [-aBbdilpTtw] [-c | -e | -f | -n | -q | -u] [--ignore-case]\n" + " [--no-ignore-case] [--normal] [--strip-trailing-cr] [--tabsize]\n" + " [-I pattern] [-L label] file1 file2\n" + " diff [-aBbdilpTtw] [-I pattern] [-L label] [--ignore-case]\n" + " [--no-ignore-case] [--normal] [--strip-trailing-cr] [--tabsize]\n" + " -C number file1 file2\n" + " diff [-aBbdiltw] [-I pattern] [--ignore-case] [--no-ignore-case]\n" + " [--normal] [--strip-trailing-cr] [--tabsize] -D string file1 file2\n" + " diff [-aBbdilpTtw] [-I pattern] [-L label] [--ignore-case]\n" + " [--no-ignore-case] [--normal] [--tabsize] [--strip-trailing-cr]\n" + " -U number file1 file2\n" + " diff [-aBbdilNPprsTtw] [-c | -e | -f | -n | -q | -u] [--ignore-case]\n" + " [--no-ignore-case] [--normal] [--tabsize] [-I pattern] [-L label]\n" + " [-S name] [-X file] [-x pattern] dir1 dir2\n"); exit(2); } From owner-svn-src-user@freebsd.org Thu Mar 9 12:16:05 2017 Return-Path: Delivered-To: svn-src-user@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 1C317D04E67 for ; Thu, 9 Mar 2017 12:16:05 +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 DCE121971; Thu, 9 Mar 2017 12:16:04 +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 v29CG3JZ033982; Thu, 9 Mar 2017 12:16:03 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v29CG3IS033981; Thu, 9 Mar 2017 12:16:03 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201703091216.v29CG3IS033981@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Thu, 9 Mar 2017 12:16:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r314958 - user/bapt/diff X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Mar 2017 12:16:05 -0000 Author: bapt Date: Thu Mar 9 12:16:03 2017 New Revision: 314958 URL: https://svnweb.freebsd.org/changeset/base/314958 Log: Missed commit Modified: user/bapt/diff/diff.h Modified: user/bapt/diff/diff.h ============================================================================== --- user/bapt/diff/diff.h Thu Mar 9 12:13:56 2017 (r314957) +++ user/bapt/diff/diff.h Thu Mar 9 12:16:03 2017 (r314958) @@ -92,7 +92,7 @@ extern struct excludes *excludes_list; extern regex_t ignore_re; char *splice(char *, char *); -int diffreg(char *, char *, int); +int diffreg(char *, char *, int, int); int easprintf(char **, const char *, ...); void *emalloc(size_t); void *erealloc(void *, size_t); From owner-svn-src-user@freebsd.org Thu Mar 9 12:16:36 2017 Return-Path: Delivered-To: svn-src-user@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 0791CD04E8C for ; Thu, 9 Mar 2017 12:16:36 +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 C91151A69; Thu, 9 Mar 2017 12:16:35 +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 v29CGYDQ034058; Thu, 9 Mar 2017 12:16:34 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v29CGYYZ034057; Thu, 9 Mar 2017 12:16:34 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201703091216.v29CGYYZ034057@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Thu, 9 Mar 2017 12:16:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r314959 - user/bapt/diff X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Mar 2017 12:16:36 -0000 Author: bapt Date: Thu Mar 9 12:16:34 2017 New Revision: 314959 URL: https://svnweb.freebsd.org/changeset/base/314959 Log: Update the manpage to reflect reality Modified: user/bapt/diff/diff.1 Modified: user/bapt/diff/diff.1 ============================================================================== --- user/bapt/diff/diff.1 Thu Mar 9 12:16:03 2017 (r314958) +++ user/bapt/diff/diff.1 Thu Mar 9 12:16:34 2017 (r314959) @@ -28,8 +28,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)diff.1 8.1 (Berkeley) 6/30/93 +.\" $FreeBSD$ .\" -.Dd $Mdocdate: November 24 2015 $ +.Dd Septembr 03, 2017 .Dt DIFF 1 .Os .Sh NAME @@ -42,6 +43,11 @@ .Fl c | e | f | .Fl n | q | u .Oc +.Op Fl -ignore-case +.Op Fl -no-ignore-case +.Op Fl -normal +.Op Fl -strip-trailing-cr +.Op Fl -tabsize .Op Fl I Ar pattern .Op Fl L Ar label .Ar file1 file2 @@ -49,17 +55,32 @@ .Op Fl abdilpTtw .Op Fl I Ar pattern .Op Fl L Ar label +.Op Fl -ignore-case +.Op Fl -no-ignore-case +.Op Fl -normal +.Op Fl -strip-trailing-cr +.Op Fl -tabsize .Fl C Ar number .Ar file1 file2 .Nm diff .Op Fl abdiltw .Op Fl I Ar pattern +.Op Fl -ignore-case +.Op Fl -no-ignore-case +.Op Fl -normal +.Op Fl -strip-trailing-cr +.Op Fl -tabsize .Fl D Ar string .Ar file1 file2 .Nm diff .Op Fl abdilpTtw .Op Fl I Ar pattern .Op Fl L Ar label +.Op Fl -ignore-case +.Op Fl -no-ignore-case +.Op Fl -normal +.Op Fl -tabsize +.Op Fl -strip-trailing-cr .Fl U Ar number .Ar file1 file2 .Nm diff @@ -68,6 +89,10 @@ .Fl c | e | f | .Fl n | q | u .Oc +.Op Fl -ignore-case +.Op Fl -no-ignore-case +.Op Fl -normal +.Op Fl -tabsize .Op Fl I Ar pattern .Bk -words .Op Fl L Ar label