From owner-svn-soc-all@FreeBSD.ORG  Fri Aug 10 21:38:30 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 7440C106566C
	for <svn-soc-all@FreeBSD.org>; Fri, 10 Aug 2012 21:38:28 +0000 (UTC)
	(envelope-from jhagewood@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Fri, 10 Aug 2012 21:38:28 +0000
Date: Fri, 10 Aug 2012 21:38:28 +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: <20120810213828.7440C106566C@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r240258 - soc2012/jhagewood/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: Fri, 10 Aug 2012 21:38:30 -0000

Author: jhagewood
Date: Fri Aug 10 21:38:27 2012
New Revision: 240258
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240258

Log:

Modified:
  soc2012/jhagewood/sdiff/TODO
  soc2012/jhagewood/sdiff/common.h

Modified: soc2012/jhagewood/sdiff/TODO
==============================================================================
--- soc2012/jhagewood/sdiff/TODO	Fri Aug 10 19:02:49 2012	(r240257)
+++ soc2012/jhagewood/sdiff/TODO	Fri Aug 10 21:38:27 2012	(r240258)
@@ -6,7 +6,7 @@
 Add more information to man file.		COMPLETE
 Fix sdiff to work with binary data		COMPLETE	TODO: Add some error checking
 Replace goto statements				COMPLETE
-
+zsdiff integration				IN PROGRESS
 NOTES:
 
 - In diff, 'w' is used for --ignore-all-spaces instead of 'W'. When 'W' is passed to sdiff, it must be passed to diff as 'w'.

Modified: soc2012/jhagewood/sdiff/common.h
==============================================================================
--- soc2012/jhagewood/sdiff/common.h	Fri Aug 10 19:02:49 2012	(r240257)
+++ soc2012/jhagewood/sdiff/common.h	Fri Aug 10 21:38:27 2012	(r240258)
@@ -6,3 +6,4 @@
  */
 
 void cleanup(const char *) __dead2;
+FILE *decompressfile(char *, char *);