From owner-svn-soc-all@FreeBSD.ORG Tue Jul 10 19:21:11 2012 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from socsvn.FreeBSD.org (unknown [IPv6:2001:4f8:fff6::2f]) by hub.freebsd.org (Postfix) with SMTP id 0A6331065673 for ; Tue, 10 Jul 2012 19:21:09 +0000 (UTC) (envelope-from jhagewood@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Tue, 10 Jul 2012 19:21:09 +0000 Date: Tue, 10 Jul 2012 19:21:09 +0000 From: jhagewood@FreeBSD.org To: svn-soc-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <20120710192109.0A6331065673@hub.freebsd.org> Cc: Subject: socsvn commit: r239249 - in soc2012/jhagewood/sdiff: . sdiff X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Jul 2012 19:21:11 -0000 Author: jhagewood Date: Tue Jul 10 19:21:07 2012 New Revision: 239249 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=239249 Log: Modified: soc2012/jhagewood/sdiff/hagewood-sdiff.patch soc2012/jhagewood/sdiff/sdiff/sdiff.c Modified: soc2012/jhagewood/sdiff/hagewood-sdiff.patch ============================================================================== --- soc2012/jhagewood/sdiff/hagewood-sdiff.patch Tue Jul 10 19:04:49 2012 (r239248) +++ soc2012/jhagewood/sdiff/hagewood-sdiff.patch Tue Jul 10 19:21:07 2012 (r239249) @@ -112,7 +112,7 @@ + diff -rupN jhagewood/sdiff/sdiff-orig/sdiff.c jhagewood/sdiff/sdiff/sdiff.c --- jhagewood/sdiff/sdiff-orig/sdiff.c 2012-07-07 19:37:22.000000000 -0400 -+++ jhagewood/sdiff/sdiff/sdiff.c 2012-07-09 20:09:56.000000000 -0400 ++++ jhagewood/sdiff/sdiff/sdiff.c 2012-07-10 19:20:43.000000000 -0400 @@ -5,6 +5,14 @@ * Public domain. */ @@ -166,7 +166,12 @@ /* pid from the diff parent (if applicable) */ DIFF_PID, -@@ -113,7 +121,7 @@ static struct option longopts[] = { +@@ -109,17 +117,17 @@ enum { + }; + + static struct option longopts[] = { +- /* options only processed in sdiff */ ++ /* options only processed in sdiff */ { "left-column", no_argument, NULL, LEFTC_OPT }, { "suppress-common-lines", no_argument, NULL, 's' }, { "width", required_argument, NULL, 'w' }, @@ -175,6 +180,13 @@ { "output", required_argument, NULL, 'o' }, { "diff-program", required_argument, NULL, DIFFPROG_OPT }, + { "pipe-fd", required_argument, NULL, PIPE_FD }, + { "diff-pid", required_argument, NULL, DIFF_PID }, +- ++ /* Options processed by diff. */ + { "ignore-file-name-case", no_argument, NULL, FCASE_IGNORE_OPT }, + { "no-ignore-file-name-case", no_argument, NULL, FCASE_SENSITIVE_OPT }, + { "strip-trailing-cr", no_argument, NULL, STRIPCR_OPT }, @@ -134,9 +142,35 @@ static struct option longopts[] = { { "ignore-case", no_argument, NULL, 'i' }, { "expand-tabs", no_argument, NULL, 't' }, Modified: soc2012/jhagewood/sdiff/sdiff/sdiff.c ============================================================================== --- soc2012/jhagewood/sdiff/sdiff/sdiff.c Tue Jul 10 19:04:49 2012 (r239248) +++ soc2012/jhagewood/sdiff/sdiff/sdiff.c Tue Jul 10 19:21:07 2012 (r239249) @@ -117,7 +117,7 @@ }; static struct option longopts[] = { - /* options only processed in sdiff */ + /* options only processed in sdiff */ { "left-column", no_argument, NULL, LEFTC_OPT }, { "suppress-common-lines", no_argument, NULL, 's' }, { "width", required_argument, NULL, 'w' }, @@ -127,7 +127,7 @@ { "pipe-fd", required_argument, NULL, PIPE_FD }, { "diff-pid", required_argument, NULL, DIFF_PID }, - + /* Options processed by diff. */ { "ignore-file-name-case", no_argument, NULL, FCASE_IGNORE_OPT }, { "no-ignore-file-name-case", no_argument, NULL, FCASE_SENSITIVE_OPT }, { "strip-trailing-cr", no_argument, NULL, STRIPCR_OPT },