From owner-p4-projects@FreeBSD.ORG  Tue Sep  9 19:34:26 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CA4BB1065677; Tue,  9 Sep 2008 19:34:26 +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 8D1CD1065673
	for <perforce@FreeBSD.org>; Tue,  9 Sep 2008 19:34:26 +0000 (UTC)
	(envelope-from strauss@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 7F0228FC12
	for <perforce@FreeBSD.org>; Tue,  9 Sep 2008 19:34:26 +0000 (UTC)
	(envelope-from strauss@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m89JYQNx010731
	for <perforce@FreeBSD.org>; Tue, 9 Sep 2008 19:34:26 GMT
	(envelope-from strauss@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m89JYQBa010723
	for perforce@freebsd.org; Tue, 9 Sep 2008 19:34:26 GMT
	(envelope-from strauss@FreeBSD.org)
Date: Tue, 9 Sep 2008 19:34:26 GMT
Message-Id: <200809091934.m89JYQBa010723@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	strauss@FreeBSD.org using -f
From: Anselm Strauss <strauss@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 149489 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, 09 Sep 2008 19:34:27 -0000

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

Change 149489 by strauss@strauss_marvelman on 2008/09/09 19:33:37

	Small deflate example.

Affected files ...

.. //depot/projects/soc2008/strauss_libarchive/misc/deflate/Makefile#2 edit
.. //depot/projects/soc2008/strauss_libarchive/misc/deflate/common.c#1 add
.. //depot/projects/soc2008/strauss_libarchive/misc/deflate/common.h#1 add
.. //depot/projects/soc2008/strauss_libarchive/misc/deflate/deflate.c#2 edit

Differences ...

==== //depot/projects/soc2008/strauss_libarchive/misc/deflate/Makefile#2 (text+ko) ====

@@ -1,8 +1,17 @@
+PROGRAMS = deflate #inflate
+
+CC = gcc
+CFLAGS = -Wall -Werror -std=c99
+LDFLAGS = -lz
+
 .PHONY: clean
+all: $(PROGRAMS)
 
-all: deflate
+clean:
+	$(RM) $(PROGRAMS) *.o
 
-clean:
-	rm deflate
+$(PROGRAMS): %: %.o common.o
+	$(CC) $(LDFLAGS) -o $@ $^
 
-deflate: deflate.c
+%.o: %.c common.h
+	$(CC) -c $(CFLAGS) -o $@ $<

==== //depot/projects/soc2008/strauss_libarchive/misc/deflate/deflate.c#2 (text+ko) ====

@@ -1,30 +1,46 @@
-#include <stdio.h>
-#include <zlib.h>
-
-#define WINDOW 8
+#include "common.h"
 
 int main(int argc, char **argv) {
   z_stream stream;
-  char in[WINDOW], out[WINDOW];
+  Bytef in[CHUNK];
+  Bytef out[CHUNK];
+  int flush;
+  int ret;
+  int eof;
 
-  stream.next_in = &in;
-  stream.avail_in = 0;
-  stream.next_out = &out;
-  stream.avail_out = strlen(&out);
+  stream.zalloc = Z_NULL;
+  stream.zfree = Z_NULL;
+  stream.opaque = Z_NULL;
+  deflateInit(&stream, Z_DEFAULT_COMPRESSION);
 
-  deflateInit2(
-    stream,
-    Z_DEFAULT_COMPRESSION,
-    Z_DEFLATE,
-    -WINDOW,
-    WINDOW,
-    Z_DEFAULT_STRATEGY
-  );
-
-  while ((stream.avail_in = fread(&in, 1, WINDOW, stdin)) > 0) {
-    while (deflate(stream, Z_NO_FLUSH)) {
-      
+  do {
+    stream.next_in = in;
+    stream.avail_in = fread(in, 1, CHUNK, stdin);
+    if(ferror(stdin)) {
+      deflateEnd(&stream);
+      err_msg("while reading from standard input");
+      return 1;
     }
-    fwrite(&out, 1, 
-  }
+    debug("read from stdin");
+    eof = feof(stdin);
+    flush = eof ? Z_FINISH : Z_NO_FLUSH;
+    do {
+      stream.next_out = out;
+      stream.avail_out = CHUNK;
+      ret = deflate(&stream, flush);
+      if (ret == Z_STREAM_ERROR) {
+        deflateEnd(&stream);
+	err_msg("while deflating");
+	return 1;
+      }
+      debug("deflated data");
+      ret = fwrite(out, 1, stream.avail_out, stdout);
+      if ( ret != stream.avail_out || ferror(stdout)) {
+        deflateEnd(&stream);
+	err_msg("while writing to standard output");
+	return 1;
+      };
+      debug("wrote to stdout");
+    } while (stream.avail_out == 0);
+  } while (!eof);
 }