socsvn commit: r238288 - in soc2012/jhagewood/diff: . diff

[jhagewood at FreeBSD.org]

Author: jhagewood
Date: Mon Jun 25 21:52:47 2012
New Revision: 238288
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=238288

Log:

Modified:
  soc2012/jhagewood/diff/diff/diff.c
  soc2012/jhagewood/diff/hagewood-diff.patch

Modified: soc2012/jhagewood/diff/diff/diff.c
==============================================================================
--- soc2012/jhagewood/diff/diff/diff.c	Mon Jun 25 21:33:17 2012	(r238287)
+++ soc2012/jhagewood/diff/diff/diff.c	Mon Jun 25 21:52:47 2012	(r238288)
@@ -312,7 +312,7 @@
 			format = D_NORMAL;
 			break;
 		case OPT_SUPCL:
-			suppress_cl = 1;
+			/* Do nothing, passes option to sdiff. */
 			break;
 		case OPT_TSIZE:
 			if (optarg != NULL) {

Modified: soc2012/jhagewood/diff/hagewood-diff.patch
==============================================================================
--- soc2012/jhagewood/diff/hagewood-diff.patch	Mon Jun 25 21:33:17 2012	(r238287)
+++ soc2012/jhagewood/diff/hagewood-diff.patch	Mon Jun 25 21:52:47 2012	(r238288)
@@ -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-25 16:05:53.000000000 -0400
-+++ jhagewood/diff/diff/diff.c	2012-06-25 16:05:53.000000000 -0400
++++ jhagewood/diff/diff/diff.c	2012-06-25 21:52:27.000000000 -0400
 @@ -1,4 +1,4 @@
 -/*-
 +/*
@@ -229,7 +229,7 @@
 +			format = D_NORMAL;
 +			break;
 +		case OPT_SUPCL:
-+			suppress_cl = 1;
++			/* Do nothing, passes option to sdiff. */
 +			break;
  		case OPT_TSIZE:
 -                        if (optarg != NULL) {