From 01a4dc691fcf8a5869d17de01b3c8a6bf259a474 Mon Sep 17 00:00:00 2001
From: hypnotoad <yoda@etoyoc.com>
Date: Sat, 15 Nov 2014 23:45:53 +0000
Subject: Tweaks to build

---
 generic/tclZipTools.c | 22 ++++++----------------
 unix/Makefile.in      |  4 ++++
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/generic/tclZipTools.c b/generic/tclZipTools.c
index 31e1c99..bb0db8e 100644
--- a/generic/tclZipTools.c
+++ b/generic/tclZipTools.c
@@ -300,17 +300,6 @@ int ZvfsReadTOCStart(
   return TCL_OK;
 }
 
-int ZvfsReadTOC(
-  Tcl_Interp *interp,    /* Leave error messages in this interpreter */
-  Tcl_Channel chan,
-  ZFile **pList
-) {
-    int iStart;
-    return ZvfsReadTOCStart( interp, chan, pList, &iStart);
-}
-
-
-
 /************************************************************************/
 /************************************************************************/
 /************************************************************************/
@@ -334,7 +323,7 @@ static int ZvfsDumpObjCmd(
   char *zFilename;
   Tcl_Channel chan;
   ZFile *pList;
-  int rc;
+  int rc,zipstart;
   Tcl_Obj *pResult;
 
   if( objc!=2 ){
@@ -344,7 +333,7 @@ static int ZvfsDumpObjCmd(
   zFilename = Tcl_GetString(objv[1]);
   chan = Tcl_OpenFileChannel(interp, zFilename, "r", 0);
   if( chan==0 ) return TCL_ERROR;
-  rc = ZvfsReadTOC(interp, chan, &pList);
+  rc = ZvfsReadTOCStart(interp, chan, &pList,&zipstart);
   if( rc==TCL_ERROR ){
     deleteZFileList(pList);
     return rc;
@@ -652,7 +641,7 @@ static int ZvfsAppendObjCmd(
   char *zArchive;
   Tcl_Channel chan;
   ZFile *pList = NULL, *pToc;
-  int rc = TCL_OK, i;
+  int rc = TCL_OK, i,zipstart;
 
   /* Open the archive and read the table of contents
   */
@@ -679,7 +668,7 @@ static int ZvfsAppendObjCmd(
       /* Null file is ok, we're creating new one. */
   } else {
     Tcl_Seek(chan, 0, SEEK_SET);
-    rc = ZvfsReadTOC(interp, chan, &pList);
+    rc = ZvfsReadTOCStart(interp, chan, &pList,&zipstart);
     if( rc==TCL_ERROR ){
       deleteZFileList(pList);
       Tcl_Close(interp, chan);
@@ -786,6 +775,7 @@ static int ZvfsAddObjCmd(
   int tobjc;
   Tcl_Obj **tobjv;
   Tcl_Obj *varObj = NULL;
+  int zipstart;
   
   /* Open the archive and read the table of contents
   */
@@ -826,7 +816,7 @@ static int ZvfsAddObjCmd(
       /* Null file is ok, we're creating new one. */
   } else {
     Tcl_Seek(chan, 0, SEEK_SET);
-    rc = ZvfsReadTOC(interp, chan, &pList);
+    rc = ZvfsReadTOCStart(interp, chan, &pList,&zipstart);
     if( rc==TCL_ERROR ){
       deleteZFileList(pList);
       Tcl_Close(interp, chan);
diff --git a/unix/Makefile.in b/unix/Makefile.in
index fd9b548..b705ce0 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -890,6 +890,10 @@ install-libraries: libraries
 	@echo "Installing package platform::shell 1.1.4 as a Tcl Module";
 	@$(INSTALL_DATA) $(TOP_DIR)/library/platform/shell.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.4/platform/shell-1.1.4.tm;
 
+
+	@echo "Installing package zvfstools 0.1 as a Tcl Module";
+	@$(INSTALL_DATA) $(TOP_DIR)/library/zvfstools/zvfstools.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/zvfstools-0.1.tm;
+
 	@echo "Installing encoding files to $(SCRIPT_INSTALL_DIR)/encoding/";
 	@for i in $(TOP_DIR)/library/encoding/*.enc ; do \
 		$(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/encoding; \
-- 
cgit v0.12