1 files changed, 132 insertions, 38 deletions

diff --git a/example.c b/example.c
index fddb8f8..175fa81 100644
--- a/example.c
+++ b/example.c
@@ -1,9 +1,9 @@
 /* example.c -- usage example of the zlib compression library
- * Copyright (C) 1995 Jean-loup Gailly.
+ * Copyright (C) 1995-1996 Jean-loup Gailly.
  * For conditions of distribution and use, see copyright notice in zlib.h 
  */
 
-/* $Id: example.c,v 1.9 1995/05/03 17:27:09 jloup Exp $ */
+/* $Id: example.c,v 1.13 1996/01/30 21:59:13 me Exp $ */
 
 #include <stdio.h>
 #include "zlib.h"
@@ -22,38 +22,44 @@
     } \
 }
 
-char *hello = "hello, hello!";
+const char hello[] = "hello, hello!";
 /* "hello world" would be more standard, but the repeated "hello"
  * stresses the compression code better, sorry...
  */
 
-void test_compress      OF((Bytef *compr, uLong comprLen,
-                            Bytef *uncompr, uLong uncomprLen));
-void test_gzio          OF((char *out, char *in, 
-                            Bytef *uncompr, int uncomprLen));
-void test_deflate       OF((Bytef *compr, uLong comprLen));
-void test_inflate       OF((Bytef *compr, uLong comprLen,
-                            Bytef *uncompr, uLong uncomprLen));
-void test_large_deflate OF((Bytef *compr, uLong comprLen,
-                            Bytef *uncompr, uLong uncomprLen));
-void test_large_inflate OF((Bytef *compr, uLong comprLen,
-                            Bytef *uncompr, uLong uncomprLen));
-void test_flush         OF((Bytef *compr, uLong comprLen));
-void test_sync          OF((Bytef *compr, uLong comprLen,
-                            Bytef *uncompr, uLong uncomprLen));
+const char dictionary[] = "hello";
+uLong dictId; /* Adler32 value of the dictionary */
+
+void test_compress      OF((Byte *compr, uLong comprLen,
+                            Byte *uncompr, uLong uncomprLen));
+void test_gzio          OF((const char *out, const char *in, 
+                            Byte *uncompr, int uncomprLen));
+void test_deflate       OF((Byte *compr, uLong comprLen));
+void test_inflate       OF((Byte *compr, uLong comprLen,
+                            Byte *uncompr, uLong uncomprLen));
+void test_large_deflate OF((Byte *compr, uLong comprLen,
+                            Byte *uncompr, uLong uncomprLen));
+void test_large_inflate OF((Byte *compr, uLong comprLen,
+                            Byte *uncompr, uLong uncomprLen));
+void test_flush         OF((Byte *compr, uLong comprLen));
+void test_sync          OF((Byte *compr, uLong comprLen,
+                            Byte *uncompr, uLong uncomprLen));
+void test_dict_deflate  OF((Byte *compr, uLong comprLen));
+void test_dict_inflate  OF((Byte *compr, uLong comprLen,
+                            Byte *uncompr, uLong uncomprLen));
 int  main               OF((int argc, char *argv[]));
 
 /* ===========================================================================
  * Test compress() and uncompress()
  */
 void test_compress(compr, comprLen, uncompr, uncomprLen)
-    Bytef *compr, *uncompr;
+    Byte *compr, *uncompr;
     uLong comprLen, uncomprLen;
 {
     int err;
     uLong len = strlen(hello)+1;
 
-    err = compress(compr, &comprLen, (Byte*)hello, len);
+    err = compress(compr, &comprLen, (const Bytef*)hello, len);
     CHECK_ERR(err, "compress");
 
     strcpy((char*)uncompr, "garbage");
@@ -72,9 +78,9 @@ void test_compress(compr, comprLen, uncompr, uncomprLen)
  * Test read/write of .gz files
  */
 void test_gzio(out, in, uncompr, uncomprLen)
-    char *out; /* output file */
-    char *in;  /* input file */
-    Bytef *uncompr;
+    const char *out; /* output file */
+    const char *in;  /* input file */
+    Byte *uncompr;
     int  uncomprLen;
 {
     int err;
@@ -87,7 +93,7 @@ void test_gzio(out, in, uncompr, uncomprLen)
         exit(1);
     }
 
-    if (gzwrite(file, hello, len) != len) {
+    if (gzwrite(file, (const voidp)hello, (unsigned)len) != len) {
         fprintf(stderr, "gzwrite err: %s\n", gzerror(file, &err));
     }
     gzclose(file);
@@ -98,7 +104,7 @@ void test_gzio(out, in, uncompr, uncomprLen)
     }
     strcpy((char*)uncompr, "garbage");
 
-    uncomprLen = gzread(file, uncompr, uncomprLen);
+    uncomprLen = gzread(file, uncompr, (unsigned)uncomprLen);
     if (uncomprLen != len) {
         fprintf(stderr, "gzread err: %s\n", gzerror(file, &err));
     }
@@ -115,7 +121,7 @@ void test_gzio(out, in, uncompr, uncomprLen)
  * Test deflate() with small buffers
  */
 void test_deflate(compr, comprLen)
-    Bytef *compr;
+    Byte *compr;
     uLong comprLen;
 {
     z_stream c_stream; /* compression stream */
@@ -153,7 +159,7 @@ void test_deflate(compr, comprLen)
  * Test inflate() with small buffers
  */
 void test_inflate(compr, comprLen, uncompr, uncomprLen)
-    Bytef *compr, *uncompr;
+    Byte *compr, *uncompr;
     uLong comprLen, uncomprLen;
 {
     int err;
@@ -171,7 +177,7 @@ void test_inflate(compr, comprLen, uncompr, uncomprLen)
     d_stream.next_in  = compr;
     d_stream.next_out = uncompr;
 
-    while (d_stream.total_out < uncomprLen) {
+    while (d_stream.total_out < uncomprLen && d_stream.total_in < comprLen) {
         d_stream.avail_in = d_stream.avail_out = 1; /* force small buffers */
         err = inflate(&d_stream, Z_NO_FLUSH);
         if (err == Z_STREAM_END) break;
@@ -192,7 +198,7 @@ void test_inflate(compr, comprLen, uncompr, uncomprLen)
  * Test deflate() with large buffers and dynamic change of compression level
  */
 void test_large_deflate(compr, comprLen, uncompr, uncomprLen)
-    Bytef *compr, *uncompr;
+    Byte *compr, *uncompr;
     uLong comprLen, uncomprLen;
 {
     z_stream c_stream; /* compression stream */
@@ -206,7 +212,7 @@ void test_large_deflate(compr, comprLen, uncompr, uncomprLen)
     CHECK_ERR(err, "deflateInit");
 
     c_stream.next_out = compr;
-    c_stream.avail_out = comprLen;
+    c_stream.avail_out = (uInt)comprLen;
 
     /* At this point, uncompr is still mostly zeroes, so it should compress
      * very well:
@@ -245,7 +251,7 @@ void test_large_deflate(compr, comprLen, uncompr, uncomprLen)
  * Test inflate() with large buffers
  */
 void test_large_inflate(compr, comprLen, uncompr, uncomprLen)
-    Bytef *compr, *uncompr;
+    Byte *compr, *uncompr;
     uLong comprLen, uncomprLen;
 {
     int err;
@@ -265,7 +271,7 @@ void test_large_inflate(compr, comprLen, uncompr, uncomprLen)
 
     for (;;) {
         d_stream.next_out = uncompr;            /* discard the output */
-        d_stream.avail_out = uncomprLen;
+        d_stream.avail_out = (uInt)uncomprLen;
         err = inflate(&d_stream, Z_NO_FLUSH);
         if (err == Z_STREAM_END) break;
         CHECK_ERR(err, "large inflate");
@@ -285,7 +291,7 @@ void test_large_inflate(compr, comprLen, uncompr, uncomprLen)
  * Test deflate() with full flush
  */
 void test_flush(compr, comprLen)
-    Bytef *compr;
+    Byte *compr;
     uLong comprLen;
 {
     z_stream c_stream; /* compression stream */
@@ -321,7 +327,7 @@ void test_flush(compr, comprLen)
  * Test inflateSync()
  */
 void test_sync(compr, comprLen, uncompr, uncomprLen)
-    Bytef *compr, *uncompr;
+    Byte *compr, *uncompr;
     uLong comprLen, uncomprLen;
 {
     int err;
@@ -344,7 +350,7 @@ void test_sync(compr, comprLen, uncompr, uncomprLen)
     inflate(&d_stream, Z_NO_FLUSH);
     CHECK_ERR(err, "inflate");
 
-    d_stream.avail_in = (uInt)uncomprLen-2; /* read all compressed data */
+    d_stream.avail_in = (uInt)comprLen-2;   /* read all compressed data */
     err = inflateSync(&d_stream);           /* but skip the damaged part */
     CHECK_ERR(err, "inflateSync");
 
@@ -360,6 +366,91 @@ void test_sync(compr, comprLen, uncompr, uncomprLen)
 }
 
 /* ===========================================================================
+ * Test deflate() with preset dictionary
+ */
+void test_dict_deflate(compr, comprLen)
+    Byte *compr;
+    uLong comprLen;
+{
+    z_stream c_stream; /* compression stream */
+    int err;
+
+    c_stream.zalloc = (alloc_func)0;
+    c_stream.zfree = (free_func)0;
+    c_stream.opaque = (voidpf)0;
+
+    err = deflateInit(&c_stream, Z_BEST_COMPRESSION);
+    CHECK_ERR(err, "deflateInit");
+
+    err = deflateSetDictionary(&c_stream,
+                               (const Bytef*)dictionary, sizeof(dictionary));
+    CHECK_ERR(err, "deflateSetDictionary");
+
+    dictId = c_stream.adler;
+    c_stream.next_out = compr;
+    c_stream.avail_out = (uInt)comprLen;
+
+    c_stream.next_in = (Bytef*)hello;
+    c_stream.avail_in = (uInt)strlen(hello)+1;
+
+    err = deflate(&c_stream, Z_FINISH);
+    if (err != Z_STREAM_END) {
+        fprintf(stderr, "deflate should report Z_STREAM_END\n");
+    }
+    err = deflateEnd(&c_stream);
+    CHECK_ERR(err, "deflateEnd");
+}
+
+/* ===========================================================================
+ * Test inflate() with a preset dictionary
+ */
+void test_dict_inflate(compr, comprLen, uncompr, uncomprLen)
+    Byte *compr, *uncompr;
+    uLong comprLen, uncomprLen;
+{
+    int err;
+    z_stream d_stream; /* decompression stream */
+
+    strcpy((char*)uncompr, "garbage");
+
+    d_stream.zalloc = (alloc_func)0;
+    d_stream.zfree = (free_func)0;
+    d_stream.opaque = (voidpf)0;
+
+    err = inflateInit(&d_stream);
+    CHECK_ERR(err, "inflateInit");
+
+    d_stream.next_in  = compr;
+    d_stream.avail_in = (uInt)comprLen;
+
+    d_stream.next_out = uncompr;
+    d_stream.avail_out = (uInt)uncomprLen;
+
+    for (;;) {
+        err = inflate(&d_stream, Z_NO_FLUSH);
+        if (err == Z_STREAM_END) break;
+        if (err == Z_NEED_DICT) {
+            if (d_stream.adler != dictId) {
+                fprintf(stderr, "unexpected dictionary");
+                exit(1);
+            }
+            err = inflateSetDictionary(&d_stream, (const Bytef*)dictionary,
+                                       sizeof(dictionary));
+        }
+        CHECK_ERR(err, "inflate with dict");
+    }
+
+    err = inflateEnd(&d_stream);
+    CHECK_ERR(err, "inflateEnd");
+
+    if (strcmp((char*)uncompr, hello)) {
+        fprintf(stderr, "bad inflate with dict\n");
+    } else {
+        printf("inflate with dictionary: %s\n", uncompr);
+    }
+}
+
+/* ===========================================================================
  * Usage:  example [output.gz  [input.gz]]
  */
 
@@ -367,8 +458,8 @@ int main(argc, argv)
     int argc;
     char *argv[];
 {
-    Bytef *compr, *uncompr;
-    uLong comprLen = 32750*sizeof(int); /* don't overflow on MSDOS */
+    Byte *compr, *uncompr;
+    uLong comprLen = 10000*sizeof(int); /* don't overflow on MSDOS */
     uLong uncomprLen = comprLen;
 
     if (zlib_version[0] != ZLIB_VERSION[0]) {
@@ -379,8 +470,8 @@ int main(argc, argv)
         fprintf(stderr, "warning: different zlib version\n");
     }
 
-    compr    = (Bytef*)malloc(comprLen);
-    uncompr  = (Bytef*)calloc(uncomprLen, 1); /* must be cleared initially */
+    compr    = (Byte*)malloc((uInt)comprLen);
+    uncompr  = (Byte*)calloc((uInt)uncomprLen, 1); /* must be cleared */
     if (compr == Z_NULL || uncompr == Z_NULL) {
         printf("out of memory\n");
         exit(1);
@@ -401,6 +492,9 @@ int main(argc, argv)
     test_flush(compr, comprLen);
     test_sync(compr, comprLen, uncompr, uncomprLen);
 
+    test_dict_deflate(compr, comprLen);
+    test_dict_inflate(compr, comprLen, uncompr, uncomprLen);
+
     exit(0);
     return 0; /* to avoid warning */
 }