From owner-p4-projects@FreeBSD.ORG  Tue Jun 24 20:05:06 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2E1541065686; Tue, 24 Jun 2008 20:05:06 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E3CE31065680
	for <perforce@freebsd.org>; Tue, 24 Jun 2008 20:05:05 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id DEB968FC23
	for <perforce@freebsd.org>; Tue, 24 Jun 2008 20:05:05 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m5OK55wj029097
	for <perforce@freebsd.org>; Tue, 24 Jun 2008 20:05:05 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5OK55RF029095
	for perforce@freebsd.org; Tue, 24 Jun 2008 20:05:05 GMT
	(envelope-from gabor@freebsd.org)
Date: Tue, 24 Jun 2008 20:05:05 GMT
Message-Id: <200806242005.m5OK55RF029095@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gabor@freebsd.org using -f
From: Gabor Kovesdan <gabor@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 144045 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Jun 2008 20:05:06 -0000

http://perforce.freebsd.org/chv.cgi?CH=144045

Change 144045 by gabor@gabor_server on 2008/06/24 20:04:34

	- Implement pre-extract of gzip and bzip2 files

Affected files ...

.. //depot/projects/soc2008/gabor_textproc/grep/file.c#10 edit

Differences ...

==== //depot/projects/soc2008/gabor_textproc/grep/file.c#10 (text+ko) ====

@@ -40,6 +40,7 @@
 #include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 #include <zlib.h>
 
@@ -49,8 +50,6 @@
 
 #define FILE_STDIO	0
 #define FILE_MMAP	1
-#define FILE_GZIP	2
-#define FILE_BZIP	3
 
 struct file {
 	int		 type;
@@ -81,13 +80,61 @@
 grep_open(char *path)
 {
 	struct file	*f;
+	char		*templ;
+	int		 tempfd;
 
 	snprintf(fname, sizeof fname, "%s", path);
 
 	f = grep_malloc(sizeof *f);
 	f->noseek = 0;
 
-/* XXX: pre-extract gzip and bzip2 files */
+	if (Zflag || Jflag) {
+		templ = grep_malloc(sizeof(char) * 15);
+		strlcpy(templ, "/tmp/grep.XXXXXXXX", 14);
+		if ((tempfd = mkstemp(templ)) == -1)
+			err(2, NULL);
+		free(templ);
+		if (Zflag) {
+			gzFile	*gzf;
+			char	 buf[BUFSIZ];
+			int	 i;
+
+			if ((gzf = gzopen(fname, "r")) == NULL)
+				err(2, NULL);
+			while ((i = gzread(gzf, buf, BUFSIZ)) > 0) {
+				write(tempfd, buf, BUFSIZ);
+			}
+			gzclose(gzf);
+			lseek(tempfd, 0L, SEEK_SET);
+			f->type = FILE_STDIO;
+			if ((f->f = fdopen(tempfd, "r")) != NULL)
+				return (f);
+			else
+				return (NULL);
+		} else {
+			BZFILE	*bzf;
+			char	 buf[BUFSIZ];
+			int	 bzerror;
+			FILE	*file;
+
+			if ((file = fopen(fname, "r")) == NULL)
+				err(2, NULL);
+			if ((bzf = BZ2_bzReadOpen(&bzerror, file, 0, 0, NULL, 0)) == NULL)
+				err(2, NULL);
+			do {
+				BZ2_bzRead(&bzerror, bzf, buf, BUFSIZ);
+				write(tempfd, buf, BUFSIZ);
+			} while (bzerror == BZ_OK);
+			BZ2_bzReadClose(&bzerror, bzf);
+			fclose(file);
+			lseek(tempfd, 0L, SEEK_SET);
+			f->type = FILE_STDIO;
+			if ((f->f = fdopen(tempfd, "r")) != NULL)
+				return (f);
+			else
+				return (NULL);
+		}
+	}
 
 	/* try mmap first; if it fails, try stdio */
 	if ((f->mmf = mmopen(fname, "r")) != NULL) {