From eb41635caa3911f42cd3be3ed014fc094e50b614 Mon Sep 17 00:00:00 2001
From: dkf <donal.k.fellows@manchester.ac.uk>
Date: Wed, 6 Jun 2012 10:34:12 +0000
Subject: making the -dictionary option work with streams

---
 generic/tclZlib.c | 48 ++++++++++++++++++++++++++++++++++++++----------
 tests/zlib.test   |  4 ++--
 2 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/generic/tclZlib.c b/generic/tclZlib.c
index 22ab061..63d2aca 100644
--- a/generic/tclZlib.c
+++ b/generic/tclZlib.c
@@ -2339,7 +2339,7 @@ ZlibStreamCmd(
 {
     Tcl_ZlibStream zstream = cd;
     int command, index, count, code, buffersize = -1, flush = -1, i;
-    Tcl_Obj *obj;
+    Tcl_Obj *obj, *compDictObj = NULL;
     static const char *const cmds[] = {
 	"add", "checksum", "close", "eof", "finalize", "flush",
 	"fullflush", "get", "header", "put", "reset",
@@ -2404,7 +2404,7 @@ ZlibStreamCmd(
 		    Tcl_SetErrorCode(interp, "TCL", "ZIP", "NOVAL", NULL);
 		    return TCL_ERROR;
 		}
-		if (Tcl_GetIntFromObj(interp, objv[i+1],
+		if (Tcl_GetIntFromObj(interp, objv[++i],
 			&buffersize) != TCL_OK) {
 		    return TCL_ERROR;
 		}
@@ -2417,10 +2417,15 @@ ZlibStreamCmd(
 		}
 		break;
 	    case ao_dictionary:
-		Tcl_AppendResult(interp,
-			"\"-dictionary\" option not implemented", NULL);
-		Tcl_SetErrorCode(interp, "TCL", "ZIP", "BADOPT", NULL);
-		return TCL_ERROR;
+		if (i == objc-2) {
+		    Tcl_AppendResult(interp, "\"-dictionary\" option must be "
+			    "followed by compression dictionary bytes",
+			    NULL);
+		    Tcl_SetErrorCode(interp, "TCL", "ZIP", "NOVAL", NULL);
+		    return TCL_ERROR;
+		}
+		compDictObj = objv[++i];
+		break;
 	    }
 
 	    if (flush == -2) {
@@ -2434,6 +2439,15 @@ ZlibStreamCmd(
 	    flush = 0;
 	}
 
+	if (compDictObj != NULL) {
+	    int len;
+
+	    (void) Tcl_GetByteArrayFromObj(compDictObj, &len);
+	    if (len == 0) {
+		compDictObj = NULL;
+	    }
+	    Tcl_ZlibStreamSetCompressionDictionary(zstream, compDictObj);
+	}
 	if (Tcl_ZlibStreamPut(zstream, objv[objc-1], flush) != TCL_OK) {
 	    return TCL_ERROR;
 	}
@@ -2481,10 +2495,15 @@ ZlibStreamCmd(
 		Tcl_SetErrorCode(interp, "TCL", "ZIP", "BADOPT", NULL);
 		return TCL_ERROR;
 	    case ao_dictionary:
-		Tcl_AppendResult(interp,
-			"\"-dictionary\" option not implemented", NULL);
-		Tcl_SetErrorCode(interp, "TCL", "ZIP", "BADOPT", NULL);
-		return TCL_ERROR;
+		if (i == objc-2) {
+		    Tcl_AppendResult(interp, "\"-dictionary\" option must be "
+			    "followed by compression dictionary bytes",
+			    NULL);
+		    Tcl_SetErrorCode(interp, "TCL", "ZIP", "NOVAL", NULL);
+		    return TCL_ERROR;
+		}
+		compDictObj = objv[++i];
+		break;
 	    }
 	    if (flush == -2) {
 		Tcl_AppendResult(interp, "\"-flush\", \"-fullflush\" and "
@@ -2496,6 +2515,15 @@ ZlibStreamCmd(
 	if (flush == -1) {
 	    flush = 0;
 	}
+	if (compDictObj != NULL) {
+	    int len;
+
+	    (void) Tcl_GetByteArrayFromObj(compDictObj, &len);
+	    if (len == 0) {
+		compDictObj = NULL;
+	    }
+	    Tcl_ZlibStreamSetCompressionDictionary(zstream, compDictObj);
+	}
 	return Tcl_ZlibStreamPut(zstream, objv[objc-1], flush);
 
     case zs_get:		/* $strm get ?count? */
diff --git a/tests/zlib.test b/tests/zlib.test
index cfde1be..18b6f55 100644
--- a/tests/zlib.test
+++ b/tests/zlib.test
@@ -259,7 +259,7 @@ test zlib-8.9 {transformtion and fconfigure} -setup {
     catch {close $outSide}
     catch {close $inSide}
     catch {$strm close}
-} -result {260 222}
+} -result {358 358}
 test zlib-8.10 {transformtion and fconfigure} -setup {
     lassign [chan pipe] inSide outSide
 } -constraints zlib -body {
@@ -292,7 +292,7 @@ test zlib-8.11 {transformtion and fconfigure} -setup {
     catch {close $outSide}
     catch {close $inSide}
     catch {$strm close}
-} -result {260 222}
+} -result {358 358}
 
 test zlib-9.1 "check fcopy with push" -constraints zlib -setup {
     set sfile [makeFile {} testsrc.gz]
-- 
cgit v0.12