From owner-svn-soc-all@FreeBSD.ORG  Sat Aug 18 22:04:54 2012
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
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 D617D106566C
	for <svn-soc-all@FreeBSD.org>; Sat, 18 Aug 2012 22:04:52 +0000 (UTC)
	(envelope-from jhagewood@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Sat, 18 Aug 2012 22:04:52 +0000
Date: Sat, 18 Aug 2012 22:04:52 +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: <20120818220452.D617D106566C@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r240505 - in soc2012/jhagewood: diff 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
	<svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
	<mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 18 Aug 2012 22:04:54 -0000

Author: jhagewood
Date: Sat Aug 18 22:04:52 2012
New Revision: 240505
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240505

Log:

Modified:
  soc2012/jhagewood/diff/decompress.c
  soc2012/jhagewood/diff/diffreg.c
  soc2012/jhagewood/sdiff/decompress.c

Modified: soc2012/jhagewood/diff/decompress.c
==============================================================================
--- soc2012/jhagewood/diff/decompress.c	Sat Aug 18 20:26:49 2012	(r240504)
+++ soc2012/jhagewood/diff/decompress.c	Sat Aug 18 22:04:52 2012	(r240505)
@@ -74,10 +74,11 @@
 	if (comprfile == Z_NULL)
 		err(1, "Could not open compressed file.");
 	
-	for (ch = '\0'; ch != EOF ; ch = gzgetc(comprfile)) {
+	for (ch = '\1'; ch != EOF ; ch = gzgetc(comprfile)) {
 		buf[i] = ch;
 		i++;
 	}
+	buf[i] = '\0';
 	
 	for (i = 0; buf[i] != EOF; i++) {
 		fputc(buf[i], file);

Modified: soc2012/jhagewood/diff/diffreg.c
==============================================================================
--- soc2012/jhagewood/diff/diffreg.c	Sat Aug 18 20:26:49 2012	(r240504)
+++ soc2012/jhagewood/diff/diffreg.c	Sat Aug 18 22:04:52 2012	(r240505)
@@ -396,9 +396,11 @@
 	}
 
 	if (!istextfile(f1) || !istextfile(f2)) {
-		rval = D_BINARY;
-		status |= 1;
-		goto CLOSEM;
+		if (filebehave == FILE_NORMAL) {
+			rval = D_BINARY;
+			status |= 1;
+			goto CLOSEM;
+		}
 	}
 	if (lflag) {
 		/* redirect stdout to pr */

Modified: soc2012/jhagewood/sdiff/decompress.c
==============================================================================
--- soc2012/jhagewood/sdiff/decompress.c	Sat Aug 18 20:26:49 2012	(r240504)
+++ soc2012/jhagewood/sdiff/decompress.c	Sat Aug 18 22:04:52 2012	(r240505)
@@ -73,10 +73,11 @@
 	if (comprfile == Z_NULL)
 		err(1, "Could not open compressed file.");
 	
-	for (ch = '\0'; ch != EOF ; ch = gzgetc(comprfile)) {
+	for (ch = '\1'; ch != EOF ; ch = gzgetc(comprfile)) {
 		buf[i] = ch;
 		i++;
 	}
+	buf[i] = '\0';
 	
 	for (i = 0; buf[i] != EOF; i++) {
 		fputc(buf[i], file);