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

[jhagewood at FreeBSD.org]

Author: jhagewood
Date: Thu Jun 14 04:52:20 2012
New Revision: 237653
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=237653

Log:

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

Modified: soc2012/jhagewood/diff/diff/diffreg.c
==============================================================================
--- soc2012/jhagewood/diff/diff/diffreg.c	Thu Jun 14 04:25:25 2012	(r237652)
+++ soc2012/jhagewood/diff/diff/diffreg.c	Thu Jun 14 04:52:20 2012	(r237653)
@@ -805,7 +805,7 @@
 					}
 
 				} else if (Bflag) {
-					if(c == '\n' && d != '\n') {
+					if (c == '\n' && d != '\n') {
 						do {
 							if (c == '\n') {
 							      ixold[i] = ctold; 
@@ -837,13 +837,13 @@
 						}	
 					}
 					if (d == '\t' && c == ' ') {
-						fgetpos(f2, &position);
+						fgetpos(f1, &position);
 						for (j = 1; j <= 7; j++) {
-							d = getc(f2);
-							if (d != " ") 
+							c = getc(f2);
+							if (c != " ") 
 								spacetab = 0;
 						}
-						fsetpos(f2, &position);
+						fsetpos(f1, &position);
 						if (spacetab) {
 							/* Ignore tab expression? */
 						}	

Modified: soc2012/jhagewood/diff/hagewood-diff.patch
==============================================================================
--- soc2012/jhagewood/diff/hagewood-diff.patch	Thu Jun 14 04:25:25 2012	(r237652)
+++ soc2012/jhagewood/diff/hagewood-diff.patch	Thu Jun 14 04:52:20 2012	(r237653)
@@ -82,7 +82,7 @@
  extern int	 format, context, status;
 diff -rupN jhagewood/diff/diff-orig/diffreg.c jhagewood/diff/diff/diffreg.c
 --- jhagewood/diff/diff-orig/diffreg.c	2012-06-10 03:31:05.000000000 -0400
-+++ jhagewood/diff/diff/diffreg.c	2012-06-14 04:22:08.000000000 -0400
++++ jhagewood/diff/diff/diffreg.c	2012-06-14 04:51:04.000000000 -0400
 @@ -748,12 +748,14 @@ unravel(int p)
  static void
  check(char *file1, FILE *f1, char *file2, FILE *f2)
@@ -115,7 +115,7 @@
  				} else if (Bflag) {
 -					if( c == '\n' && d != '\n') {
 -
-+					if(c == '\n' && d != '\n') {
++					if (c == '\n' && d != '\n') {
  						do {
  							if (c == '\n') {
  							      ixold[i] = ctold; 
@@ -152,13 +152,13 @@
 +						}	
 +					}
 +					if (d == '\t' && c == ' ') {
-+						fgetpos(f2, &position);
++						fgetpos(f1, &position);
 +						for (j = 1; j <= 7; j++) {
-+							d = getc(f2);
-+							if (d != " ") 
++							c = getc(f2);
++							if (c != " ") 
 +								spacetab = 0;
 +						}
-+						fsetpos(f2, &position);
++						fsetpos(f1, &position);
 +						if (spacetab) {
 +							/* Ignore tab expression? */
 +						}