From owner-svn-soc-all@FreeBSD.ORG  Mon Aug 13 23:19:53 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 B0BD3106566C
	for <svn-soc-all@FreeBSD.org>; Mon, 13 Aug 2012 23:19:52 +0000 (UTC)
	(envelope-from jhagewood@FreeBSD.org)
Received: by socsvn.FreeBSD.org (sSMTP sendmail emulation);
	Mon, 13 Aug 2012 23:19:52 +0000
Date: Mon, 13 Aug 2012 23:19: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: <20120813231952.B0BD3106566C@hub.freebsd.org>
Cc: 
Subject: socsvn commit: r240338 - 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: Mon, 13 Aug 2012 23:19:53 -0000

Author: jhagewood
Date: Mon Aug 13 23:19:52 2012
New Revision: 240338
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=240338

Log:
  File extension detection.

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

Modified: soc2012/jhagewood/diff/decompress.c
==============================================================================
--- soc2012/jhagewood/diff/decompress.c	Mon Aug 13 23:06:16 2012	(r240337)
+++ soc2012/jhagewood/diff/decompress.c	Mon Aug 13 23:19:52 2012	(r240338)
@@ -72,3 +72,16 @@
 	 
 	return file;
 }
+
+/* Checks for a gz file extension. */
+int
+isgzip(char *filename) {
+
+	int length = (sizeof filename)-1;
+	
+	if (filename[length-1] == 'g' && filename[length] == 'z')
+		return 1;
+
+	return 0;
+	
+}

Modified: soc2012/jhagewood/diff/diff.h
==============================================================================
--- soc2012/jhagewood/diff/diff.h	Mon Aug 13 23:06:16 2012	(r240337)
+++ soc2012/jhagewood/diff/diff.h	Mon Aug 13 23:19:52 2012	(r240338)
@@ -104,3 +104,4 @@
 void	print_status(int, char *, char *, char *);
 
 FILE *decompressfile(char *, char *);
+int isgzip(char *);

Modified: soc2012/jhagewood/diff/diffreg.c
==============================================================================
--- soc2012/jhagewood/diff/diffreg.c	Mon Aug 13 23:06:16 2012	(r240337)
+++ soc2012/jhagewood/diff/diffreg.c	Mon Aug 13 23:19:52 2012	(r240338)
@@ -192,6 +192,7 @@
 };
 
 extern FILE *decompressfile(char *, char *);
+extern int isgzip(char *);
 
 static FILE	*opentemp(const char *);
 static void output(char *, FILE *, char *, FILE *, int);
@@ -338,6 +339,10 @@
 		} else if (strcmp(file1, "-") == 0)
 			f1 = stdin;
 		else {
+			if (isgzip(file1))
+				filebehave = FILE_GZIP;
+			else
+				filebehave = FILE_NORMAL;
 			if (filebehave == FILE_NORMAL) 
 				f1 = fopen(file1, "r");
 			if (filebehave == FILE_GZIP) {
@@ -364,6 +369,10 @@
 		} else if (strcmp(file2, "-") == 0)
 			f2 = stdin;
 		else {
+			if (isgzip(file1))
+				filebehave = FILE_GZIP;
+			else
+				filebehave = FILE_NORMAL;
 			if (filebehave == FILE_NORMAL) 
 				f2 = fopen(file2, "r");
 			if (filebehave == FILE_GZIP)

Modified: soc2012/jhagewood/sdiff/sdiff.c
==============================================================================
--- soc2012/jhagewood/sdiff/sdiff.c	Mon Aug 13 23:06:16 2012	(r240337)
+++ soc2012/jhagewood/sdiff/sdiff.c	Mon Aug 13 23:19:52 2012	(r240338)
@@ -448,7 +448,7 @@
 	
 	/* Checks for file extension to determine behavior. */
 	if (isgzip(filename1) || isgzip(filename2))
-		filebehave = FILE_GZIP);
+		filebehave = FILE_GZIP;
 	else
 		filebehave = FILE_NORMAL;