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

[jhagewood at FreeBSD.org]

Author: jhagewood
Date: Fri Jun 29 22:45:52 2012
New Revision: 238614
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=238614

Log:

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

Modified: soc2012/jhagewood/diff/TODO
==============================================================================
--- soc2012/jhagewood/diff/TODO	Fri Jun 29 21:33:36 2012	(r238613)
+++ soc2012/jhagewood/diff/TODO	Fri Jun 29 22:45:52 2012	(r238614)
@@ -26,8 +26,7 @@
 - When using text files with non-ascii characters, diff will interpret them as binary files and output "Files [file1] and [file2] differ."
   Very important compatibility problem with GNU diff, which will diff files that aren't strictly ascii.
 	- Error is associated with asciifile() in diffreg.c
-	- FIX: Changed name of asciifile() to istextfile() (more appropriate), and instead of checking if every character is ASCII, it checks the first 4 bytes 
-	  of the file to see if it is ELF format. If so, the file is considered a text file.
+	- FIX: Changed name of asciifile() to istextfile() (more appropriate), and instead of checking if every character is ASCII, it checks the first 32kb of data in the file for a null character. If a null character is found, diff assumes that the file is a text file.
 - With some files, modification times displayed in the timestamp for file1 are different than the time outputted by GNU diff. 
 - The -ignore-*-* options need some work.
 - BUG: BSD diff seg faults when another longopt is used with '--side-by-side'. FIX: When passing args to sdiff for side-by-side mode, only the 

Modified: soc2012/jhagewood/diff/diff/diffreg.c
==============================================================================
--- soc2012/jhagewood/diff/diff/diffreg.c	Fri Jun 29 21:33:36 2012	(r238613)
+++ soc2012/jhagewood/diff/diff/diffreg.c	Fri Jun 29 22:45:52 2012	(r238614)
@@ -94,7 +94,7 @@
 # define TIMESPEC_NS(timespec) 0
 #endif
 
-#define MAX_CHECK 768
+#define MAX_CHECK 8192
 /*
  * diff - compare two files.
  */

Modified: soc2012/jhagewood/diff/hagewood-diff.patch
==============================================================================
--- soc2012/jhagewood/diff/hagewood-diff.patch	Fri Jun 29 21:33:36 2012	(r238613)
+++ soc2012/jhagewood/diff/hagewood-diff.patch	Fri Jun 29 22:45:52 2012	(r238614)
@@ -674,7 +674,7 @@
  extern char	*start, *ifdefname, *diffargs, *label[2], *ignore_pats;
 diff -rupN jhagewood/diff/diff-orig/diffreg.c jhagewood/diff/diff/diffreg.c
 --- jhagewood/diff/diff-orig/diffreg.c	2012-06-28 18:13:23.286983517 -0400
-+++ jhagewood/diff/diff/diffreg.c	2012-06-29 15:23:03.842992142 -0400
++++ jhagewood/diff/diff/diffreg.c	2012-06-29 18:43:59.638892095 -0400
 @@ -62,15 +62,13 @@
   *	@(#)diffreg.c   8.1 (Berkeley) 6/6/93
   */
@@ -705,7 +705,7 @@
 +# define TIMESPEC_NS(timespec) 0
 +#endif
 +
-+#define MAX_CHECK 768
++#define MAX_CHECK 8192
  /*
   * diff - compare two files.
   */