From owner-svn-soc-all@FreeBSD.ORG  Sat Aug 18 19:25:03 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 1CCA8106567F
	for <svn-soc-all@FreeBSD.org>; Sat, 18 Aug 2012 19:25:01 +0000 (UTC)
	(envelope-from jhagewood@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Sat, 18 Aug 2012 19:25:01 +0000
Date: Sat, 18 Aug 2012 19:25:01 +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: <20120818192501.1CCA8106567F@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r240503 - 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 19:25:03 -0000

Author: jhagewood
Date: Sat Aug 18 19:25:00 2012
New Revision: 240503
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240503

Log:
  working decompression

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

Modified: soc2012/jhagewood/diff/decompress.c
==============================================================================
--- soc2012/jhagewood/diff/decompress.c	Sat Aug 18 18:26:25 2012	(r240502)
+++ soc2012/jhagewood/diff/decompress.c	Sat Aug 18 19:25:00 2012	(r240503)
@@ -66,23 +66,24 @@
 	char buf[MAXBUFSIZE];
 	char ch;
 	int i = 0;
-	int length;
-	gzFile comprfile; 
+	gzFile *comprfile; 
 	
-	file = tmpfile();
+	file = fopen("/tmp/zdiff.XXXXXXXX", "w+");
 	comprfile = gzopen(filename, mode);
 	
 	if (comprfile == Z_NULL)
 		err(1, "Could not open compressed file.");
-
-	for (ch = '\0'; ch != NULL; ch = gzgetc(comprfile)) {
+	
+	for (ch = '\0'; ch != EOF ; ch = gzgetc(comprfile)) {
 		buf[i] = ch;
 		i++;
 	}
+	
 	for (i = 0; buf[i] != EOF; i++) {
-		fputs(buf, file);
-	} 
-	 
+		fputc(buf[i], file);
+	}
+	rewind(file);
+	
 	return file;
 }
 

Modified: soc2012/jhagewood/sdiff/decompress.c
==============================================================================
--- soc2012/jhagewood/sdiff/decompress.c	Sat Aug 18 18:26:25 2012	(r240502)
+++ soc2012/jhagewood/sdiff/decompress.c	Sat Aug 18 19:25:00 2012	(r240503)
@@ -65,23 +65,24 @@
 	char buf[MAXBUFSIZE];
 	char ch;
 	int i = 0;
-	int length;
-	gzFile comprfile; 
+	gzFile *comprfile; 
 	
-	file = tmpfile();
+	file = fopen("/tmp/zdiff.XXXXXXXX", "w+");
 	comprfile = gzopen(filename, mode);
 	
 	if (comprfile == Z_NULL)
 		err(1, "Could not open compressed file.");
-
-	for (ch = '\0'; ch != NULL; ch = gzgetc(comprfile)) {
+	
+	for (ch = '\0'; ch != EOF ; ch = gzgetc(comprfile)) {
 		buf[i] = ch;
 		i++;
 	}
+	
 	for (i = 0; buf[i] != EOF; i++) {
-		fputs(buf, file);
-	} 
-	 
+		fputc(buf[i], file);
+	}
+	rewind(file);
+	
 	return file;
 }