From owner-svn-soc-all@FreeBSD.ORG Mon Jun 18 23:49:44 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 9E0FD106564A for ; Mon, 18 Jun 2012 23:49:42 +0000 (UTC) (envelope-from jhagewood@FreeBSD.org) Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation); Mon, 18 Jun 2012 23:49:42 +0000 Date: Mon, 18 Jun 2012 23:49:42 +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: <20120618234942.9E0FD106564A@hub.freebsd.org> Cc: Subject: socsvn commit: r237914 - in soc2012/jhagewood/diff: . diff 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: Mon, 18 Jun 2012 23:49:44 -0000 Author: jhagewood Date: Mon Jun 18 23:49:41 2012 New Revision: 237914 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=237914 Log: Modified: soc2012/jhagewood/diff/TODO soc2012/jhagewood/diff/diff/diff.c soc2012/jhagewood/diff/hagewood-diff.patch Modified: soc2012/jhagewood/diff/TODO ============================================================================== --- soc2012/jhagewood/diff/TODO Mon Jun 18 22:17:28 2012 (r237913) +++ soc2012/jhagewood/diff/TODO Mon Jun 18 23:49:41 2012 (r237914) @@ -1,8 +1,7 @@ TASK STATUS NOTE --unified GNU compatibility COMPLETE Fixed timestamp. ---context GNU compatibility COMPLETE Fixed timestamp, will test more. ---ingnore-blank-lines INCOMPLETE +--context GNU compatibility COMPLETE Fixed timestamp, will test more. --left-column INCOMPLETE --show-function-line INCOMPLETE --unidirectional-new-file INCOMPLETE Modified: soc2012/jhagewood/diff/diff/diff.c ============================================================================== --- soc2012/jhagewood/diff/diff/diff.c Mon Jun 18 22:17:28 2012 (r237913) +++ soc2012/jhagewood/diff/diff/diff.c Mon Jun 18 23:49:41 2012 (r237914) @@ -90,7 +90,6 @@ { "left-column", no_argument, NULL, OPT_LEFTC }, { "suppress-common-lines", no_argument, NULL, OT_SUPCL }, { "GTYPE-group-format", required_argument, NULL, OPT_GTYPE }, - { "LTYPE-line-format", required_argument, NULL, OPT_LLF }, { "from-file", required_argument, NULL, OPT_FFILE }, { "to-file", required_argument, NULL, OPT_TOFILE }, Modified: soc2012/jhagewood/diff/hagewood-diff.patch ============================================================================== --- soc2012/jhagewood/diff/hagewood-diff.patch Mon Jun 18 22:17:28 2012 (r237913) +++ soc2012/jhagewood/diff/hagewood-diff.patch Mon Jun 18 23:49:41 2012 (r237914) @@ -1,6 +1,6 @@ diff -rupN jhagewood/diff/diff-orig/diff.c jhagewood/diff/diff/diff.c --- jhagewood/diff/diff-orig/diff.c 2012-06-18 03:07:38.000000000 -0400 -+++ jhagewood/diff/diff/diff.c 2012-06-18 03:07:38.000000000 -0400 ++++ jhagewood/diff/diff/diff.c 2012-06-18 23:44:16.000000000 -0400 @@ -45,10 +45,10 @@ __FBSDID("$FreeBSD$"); #include "diff.h" #include "pathnames.h" @@ -31,7 +31,7 @@ OPT_FFILE, OPT_TOFILE, OPT_HLINES, -@@ -84,14 +83,15 @@ enum +@@ -84,14 +83,14 @@ enum static struct option longopts[] = { @@ -45,13 +45,12 @@ { "suppress-common-lines", no_argument, NULL, OT_SUPCL }, { "GTYPE-group-format", required_argument, NULL, OPT_GTYPE }, - { "line-format", required_argument, NULL, OPT_LF }, -+ { "LTYPE-line-format", required_argument, NULL, OPT_LLF }, - { "unidirectional-new-file", no_argument, NULL, OPT_UNINF }, { "from-file", required_argument, NULL, OPT_FFILE }, { "to-file", required_argument, NULL, OPT_TOFILE }, { "horizon-lines", required_argument, NULL, OPT_HLINES }, -@@ -109,8 +109,7 @@ static struct option longopts[] = { +@@ -109,8 +108,7 @@ static struct option longopts[] = { { "context", optional_argument, NULL, 'C' }, { "ifdef", required_argument, NULL, 'D' }, { "minimal", no_argument, NULL, 'd' }, @@ -61,7 +60,7 @@ { "ed", no_argument, NULL, 'e' }, /* XXX: UNIMPLEMENTED { "show-function-line", required_argument, NULL, 'F' }, */ -@@ -129,7 +128,6 @@ static struct option longopts[] = { +@@ -129,7 +127,6 @@ static struct option longopts[] = { { "report-identical-files", no_argument, NULL, 's' }, { "initial-tab", no_argument, NULL, 'T' }, { "expand-tabs", no_argument, NULL, 't' }, @@ -69,7 +68,7 @@ { "unified", optional_argument, NULL, 'U' }, { "version", no_argument, NULL, 'v' }, /* XXX: UNIMPLEMENTED -@@ -197,6 +195,7 @@ main(int argc, char **argv) +@@ -197,6 +194,7 @@ main(int argc, char **argv) break; case 'C': case 'c': @@ -77,7 +76,7 @@ format = D_CONTEXT; if (optarg != NULL) { l = strtol(optarg, &ep, 10); -@@ -213,6 +212,9 @@ main(int argc, char **argv) +@@ -213,6 +211,9 @@ main(int argc, char **argv) case 'd': dflag = 1; break; @@ -87,7 +86,7 @@ case 'e': format = D_EDIT; break; -@@ -296,6 +298,13 @@ main(int argc, char **argv) +@@ -296,6 +297,13 @@ main(int argc, char **argv) case 'y': yflag = 1; break; @@ -101,7 +100,7 @@ case OPT_TSIZE: if (optarg != NULL) { l = strtol(optarg, &ep, 10); -@@ -548,7 +557,7 @@ print_status(int val, char *path1, char +@@ -548,7 +556,7 @@ print_status(int val, char *path1, char path1, entry ? entry : "", path2, entry ? entry : ""); break; case D_BINARY: