remove zlib dependancy

11 files changed, 4 insertions, 3899 deletions

diff --git a/src/ioapi.c b/src/ioapi.c
deleted file mode 100644
index 7f20c18..0000000
--- a/src/ioapi.c
+++ /dev/null
@@ -1,177 +0,0 @@
-/* ioapi.c -- IO base function header for compress/uncompress .zip

-   files using zlib + zip or unzip API

-

-   Version 1.01e, February 12th, 2005

-

-   Copyright (C) 1998-2005 Gilles Vollant

-*/

-

-#include <stdio.h>

-#include <stdlib.h>

-#include <string.h>

-

-#include "zlib.h"

-#include "ioapi.h"

-

-

-

-/* I've found an old Unix (a SunOS 4.1.3_U1) without all SEEK_* defined.... */

-

-#ifndef SEEK_CUR

-#define SEEK_CUR    1

-#endif

-

-#ifndef SEEK_END

-#define SEEK_END    2

-#endif

-

-#ifndef SEEK_SET

-#define SEEK_SET    0

-#endif

-

-voidpf ZCALLBACK fopen_file_func OF((

-   voidpf opaque,

-   const char* filename,

-   int mode));

-

-uLong ZCALLBACK fread_file_func OF((

-   voidpf opaque,

-   voidpf stream,

-   void* buf,

-   uLong size));

-

-uLong ZCALLBACK fwrite_file_func OF((

-   voidpf opaque,

-   voidpf stream,

-   const void* buf,

-   uLong size));

-

-long ZCALLBACK ftell_file_func OF((

-   voidpf opaque,

-   voidpf stream));

-

-long ZCALLBACK fseek_file_func OF((

-   voidpf opaque,

-   voidpf stream,

-   uLong offset,

-   int origin));

-

-int ZCALLBACK fclose_file_func OF((

-   voidpf opaque,

-   voidpf stream));

-

-int ZCALLBACK ferror_file_func OF((

-   voidpf opaque,

-   voidpf stream));

-

-

-voidpf ZCALLBACK fopen_file_func (opaque, filename, mode)

-   voidpf opaque;

-   const char* filename;

-   int mode;

-{

-    FILE* file = NULL;

-    const char* mode_fopen = NULL;

-    if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)

-        mode_fopen = "rb";

-    else

-    if (mode & ZLIB_FILEFUNC_MODE_EXISTING)

-        mode_fopen = "r+b";

-    else

-    if (mode & ZLIB_FILEFUNC_MODE_CREATE)

-        mode_fopen = "wb";

-

-    if ((filename!=NULL) && (mode_fopen != NULL))

-        file = fopen(filename, mode_fopen);

-    return file;

-}

-

-

-uLong ZCALLBACK fread_file_func (opaque, stream, buf, size)

-   voidpf opaque;

-   voidpf stream;

-   void* buf;

-   uLong size;

-{

-    uLong ret;

-    ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream);

-    return ret;

-}

-

-

-uLong ZCALLBACK fwrite_file_func (opaque, stream, buf, size)

-   voidpf opaque;

-   voidpf stream;

-   const void* buf;

-   uLong size;

-{

-    uLong ret;

-    ret = (uLong)fwrite(buf, 1, (size_t)size, (FILE *)stream);

-    return ret;

-}

-

-long ZCALLBACK ftell_file_func (opaque, stream)

-   voidpf opaque;

-   voidpf stream;

-{

-    long ret;

-    ret = ftell((FILE *)stream);

-    return ret;

-}

-

-long ZCALLBACK fseek_file_func (opaque, stream, offset, origin)

-   voidpf opaque;

-   voidpf stream;

-   uLong offset;

-   int origin;

-{

-    int fseek_origin=0;

-    long ret;

-    switch (origin)

-    {

-    case ZLIB_FILEFUNC_SEEK_CUR :

-        fseek_origin = SEEK_CUR;

-        break;

-    case ZLIB_FILEFUNC_SEEK_END :

-        fseek_origin = SEEK_END;

-        break;

-    case ZLIB_FILEFUNC_SEEK_SET :

-        fseek_origin = SEEK_SET;

-        break;

-    default: return -1;

-    }

-    ret = 0;

-    fseek((FILE *)stream, offset, fseek_origin);

-    return ret;

-}

-

-int ZCALLBACK fclose_file_func (opaque, stream)

-   voidpf opaque;

-   voidpf stream;

-{

-    int ret;

-    ret = fclose((FILE *)stream);

-    return ret;

-}

-

-int ZCALLBACK ferror_file_func (opaque, stream)

-   voidpf opaque;

-   voidpf stream;

-{

-    int ret;

-    ret = ferror((FILE *)stream);

-    return ret;

-}

-

-void fill_fopen_filefunc (pzlib_filefunc_def)

-  zlib_filefunc_def* pzlib_filefunc_def;

-{

-    pzlib_filefunc_def->zopen_file = fopen_file_func;

-    pzlib_filefunc_def->zread_file = fread_file_func;

-    pzlib_filefunc_def->zwrite_file = fwrite_file_func;

-    pzlib_filefunc_def->ztell_file = ftell_file_func;

-    pzlib_filefunc_def->zseek_file = fseek_file_func;

-    pzlib_filefunc_def->zclose_file = fclose_file_func;

-    pzlib_filefunc_def->zerror_file = ferror_file_func;

-    pzlib_filefunc_def->opaque = NULL;

-}

diff --git a/src/ioapi.h b/src/ioapi.h
deleted file mode 100644
index e73a3b2..0000000
--- a/src/ioapi.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* ioapi.h -- IO base function header for compress/uncompress .zip

-   files using zlib + zip or unzip API

-

-   Version 1.01e, February 12th, 2005

-

-   Copyright (C) 1998-2005 Gilles Vollant

-*/

-

-#ifndef _ZLIBIOAPI_H

-#define _ZLIBIOAPI_H

-

-

-#define ZLIB_FILEFUNC_SEEK_CUR (1)

-#define ZLIB_FILEFUNC_SEEK_END (2)

-#define ZLIB_FILEFUNC_SEEK_SET (0)

-

-#define ZLIB_FILEFUNC_MODE_READ      (1)

-#define ZLIB_FILEFUNC_MODE_WRITE     (2)

-#define ZLIB_FILEFUNC_MODE_READWRITEFILTER (3)

-

-#define ZLIB_FILEFUNC_MODE_EXISTING (4)

-#define ZLIB_FILEFUNC_MODE_CREATE   (8)

-

-

-#ifndef ZCALLBACK

-

-#if (defined(WIN32) || defined (WINDOWS) || defined (_WINDOWS)) && defined(CALLBACK) && defined (USEWINDOWS_CALLBACK)

-#define ZCALLBACK CALLBACK

-#else

-#define ZCALLBACK

-#endif

-#endif

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-

-typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const char* filename, int mode));

-typedef uLong  (ZCALLBACK *read_file_func) OF((voidpf opaque, voidpf stream, void* buf, uLong size));

-typedef uLong  (ZCALLBACK *write_file_func) OF((voidpf opaque, voidpf stream, const void* buf, uLong size));

-typedef long   (ZCALLBACK *tell_file_func) OF((voidpf opaque, voidpf stream));

-typedef long   (ZCALLBACK *seek_file_func) OF((voidpf opaque, voidpf stream, uLong offset, int origin));

-typedef int    (ZCALLBACK *close_file_func) OF((voidpf opaque, voidpf stream));

-typedef int    (ZCALLBACK *testerror_file_func) OF((voidpf opaque, voidpf stream));

-

-typedef struct zlib_filefunc_def_s

-{

-    open_file_func      zopen_file;

-    read_file_func      zread_file;

-    write_file_func     zwrite_file;

-    tell_file_func      ztell_file;

-    seek_file_func      zseek_file;

-    close_file_func     zclose_file;

-    testerror_file_func zerror_file;

-    voidpf              opaque;

-} zlib_filefunc_def;

-

-

-

-void fill_fopen_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def));

-

-#define ZREAD(filefunc,filestream,buf,size) ((*((filefunc).zread_file))((filefunc).opaque,filestream,buf,size))

-#define ZWRITE(filefunc,filestream,buf,size) ((*((filefunc).zwrite_file))((filefunc).opaque,filestream,buf,size))

-#define ZTELL(filefunc,filestream) ((*((filefunc).ztell_file))((filefunc).opaque,filestream))

-#define ZSEEK(filefunc,filestream,pos,mode) ((*((filefunc).zseek_file))((filefunc).opaque,filestream,pos,mode))

-#define ZCLOSE(filefunc,filestream) ((*((filefunc).zclose_file))((filefunc).opaque,filestream))

-#define ZERROR(filefunc,filestream) ((*((filefunc).zerror_file))((filefunc).opaque,filestream))

-

-

-#ifdef __cplusplus

-}

-#endif

-

-#endif

-

diff --git a/src/loadzip.cpp b/src/loadzip.cpp
deleted file mode 100644
index 6e082d7..0000000
--- a/src/loadzip.cpp
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
- * Snes9x - Portable Super Nintendo Entertainment System (TM) emulator.
- *
- * (c) Copyright 1996 - 2001 Gary Henderson (gary.henderson@ntlworld.com) and
- *                           Jerremy Koot (jkoot@snes9x.com)
- *
- * Super FX C emulator code 
- * (c) Copyright 1997 - 1999 Ivar (ivar@snes9x.com) and
- *                           Gary Henderson.
- * Super FX assembler emulator code (c) Copyright 1998 zsKnight and _Demo_.
- *
- * DSP1 emulator code (c) Copyright 1998 Ivar, _Demo_ and Gary Henderson.
- * C4 asm and some C emulation code (c) Copyright 2000 zsKnight and _Demo_.
- * C4 C code (c) Copyright 2001 Gary Henderson (gary.henderson@ntlworld.com).
- *
- * DOS port code contains the works of other authors. See headers in
- * individual files.
- *
- * Snes9x homepage: http://www.snes9x.com
- *
- * Permission to use, copy, modify and distribute Snes9x in both binary and
- * source form, for non-commercial purposes, is hereby granted without fee,
- * providing that this license information and copyright notice appear with
- * all copies and any derived work.
- *
- * This software is provided 'as-is', without any express or implied
- * warranty. In no event shall the authors be held liable for any damages
- * arising from the use of this software.
- *
- * Snes9x is freeware for PERSONAL USE only. Commercial users should
- * seek permission of the copyright holders first. Commercial use includes
- * charging money for Snes9x or software derived from Snes9x.
- *
- * The copyright holders request that bug fixes and improvements to the code
- * should be forwarded to them so everyone can benefit from the modifications
- * in future versions.
- *
- * Super NES and Super Nintendo Entertainment System are trademarks of
- * Nintendo Co., Limited and its subsidiary companies.
- */
- 
-#include "port.h"
-
-#ifdef UNZIP_SUPPORT
-/**********************************************************************************************/
-/* Loadzip.CPP                                                                                */
-/* This file contains a function for loading a SNES ROM image from a zip file		      */
-/**********************************************************************************************/
-
-#include <string.h>
-#include <ctype.h>
-
-#ifndef NO_INLINE_SET_GET
-#define NO_INLINE_SET_GET
-#endif
-
-#include "snes9x.h"
-#include "memmap.h"
-
-#include "unzip.h"
-//#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-bool8 LoadZip(const char* zipname,
-	      int32 *TotalFileSize,
-	      int32 *headers)
-{/*
-    *TotalFileSize = 0;
-    *headers = 0;
-    
-    unzFile file = unzOpen(zipname);
-    if(file == NULL)
-	return (FALSE);
-
-    // find largest file in zip file (under MAX_ROM_SIZE)
-    // or a file with extension .1
-    char filename[132];
-    int filesize = 0;
-    int port = unzGoToFirstFile(file);
-    unz_file_info info;
-    while(port == UNZ_OK)
-    {
-	char name[132];
-	unzGetCurrentFileInfo(file, &info, name,128, NULL,0, NULL,0);
-
-#if 0
-	int calc_size = info.uncompressed_size / 0x2000;
-	calc_size *= 0x2000;
-	if(!(info.uncompressed_size - calc_size == 512 || info.uncompressed_size == calc_size))
-	{
-	    port = unzGoToNextFile(file);
-	    continue;
-	}
-#endif
-
-	if(info.uncompressed_size > (CMemory::MAX_ROM_SIZE + 512))
-	{
-	    port = unzGoToNextFile(file);
-	    continue;
-	}
-	
-	if ((int) info.uncompressed_size > filesize)
-	{
-	    strcpy(filename,name);
-	    filesize = info.uncompressed_size;
-	}
-	int len = strlen(name);
-	if(name[len-2] == '.' && name[len-1] == '1')
-	{
-	    strcpy(filename,name);
-	    filesize = info.uncompressed_size;
-	    break;
-	}
-	port = unzGoToNextFile(file);
-    }
-    if( !(port == UNZ_END_OF_LIST_OF_FILE || port == UNZ_OK) || filesize == 0)
-    {
-	unzClose(file);
-	return (FALSE);
-    }
-
-    // Find extension
-    char tmp[2];
-    tmp[0] = tmp[1] = 0;
-    char *ext = strrchr(filename,'.');
-    if(ext) ext++;
-    else ext = tmp;
-    
-    uint8 *ptr = Memory.ROM;
-    bool8 more = FALSE;
-
-    unzLocateFile(file,filename,1);
-    unzGetCurrentFileInfo(file, &info, filename,128, NULL,0, NULL,0);
-    
-    if( unzOpenCurrentFile(file) != UNZ_OK )
-    {
-	unzClose(file);
-	return (FALSE);
-    }
-
-    do
-    {
-//	assert(info.uncompressed_size <= CMemory::MAX_ROM_SIZE + 512);
-	int FileSize = info.uncompressed_size;
-	
-	int calc_size = FileSize / 0x2000;
-	calc_size *= 0x2000;
-	
-	int l = unzReadCurrentFile(file,ptr,FileSize);
-	if(unzCloseCurrentFile(file) == UNZ_CRCERROR)
-	{
-	    unzClose(file);
-	    return (FALSE);
-	}
-	
-	if(l <= 0 || l != FileSize)
-	{
-	    unzClose(file);
-	    switch(l)
-	    {
-		case UNZ_ERRNO:
-		    break;
-		case UNZ_EOF:
-		    break;
-		case UNZ_PARAMERROR:
-		    break;
-		case UNZ_BADZIPFILE:
-		    break;
-		case UNZ_INTERNALERROR:
-		    break;
-		case UNZ_CRCERROR:
-		    break;
-	    }
-	    return (FALSE);
-	}
-
-	if ((FileSize - calc_size == 512 && !Settings.ForceNoHeader) ||
-	    Settings.ForceHeader)
-	{
-	    memmove (ptr, ptr + 512, calc_size);
-	    (*headers)++;
-	    FileSize -= 512;
-	}
-	ptr += FileSize;
-	(*TotalFileSize) += FileSize;
-
-	int len;
-	if (ptr - Memory.ROM < CMemory::MAX_ROM_SIZE + 0x200 &&
-	    (isdigit (ext [0]) && ext [1] == 0 && ext [0] < '9'))
-	{
-	    more = TRUE;
-	    ext [0]++;
-	}
-	else if (ptr - Memory.ROM < CMemory::MAX_ROM_SIZE + 0x200 &&
-		 (((len = strlen (filename)) == 7 || len == 8) &&
-		  strncasecmp (filename, "sf", 2) == 0 &&
-		  isdigit (filename [2]) && isdigit (filename [3]) && isdigit (filename [4]) &&
-		  isdigit (filename [5]) && isalpha (filename [len - 1])))
-	{
-	    more = TRUE;
-	    filename [len - 1]++;
-	}
-	else
-	    more = FALSE;
-	
-	if(more)
-	{
-	    if( unzLocateFile(file,filename,1) != UNZ_OK ||
-		unzGetCurrentFileInfo(file, &info, filename,128, NULL,0, NULL,0) != UNZ_OK ||
-		unzOpenCurrentFile(file) != UNZ_OK)
-		break;
-	}
-	
-    } while(more);
-    
-    unzClose(file);
-    return (TRUE);
-    */
-    return (FALSE);
-}
-#endif
diff --git a/src/memmap.cpp b/src/memmap.cpp
index 8da6c34..e93beaa 100644
--- a/src/memmap.cpp
+++ b/src/memmap.cpp
@@ -355,17 +355,6 @@ again:
 

     int32 TotalFileSize = 0;

 

-#ifdef UNZIP_SUPPORT

-

-    if( checkzip( fname ) )

-    {

-    	if (!LoadZip (fname, &TotalFileSize, &HeaderCount))

-    	    return (FALSE);

-

-    	strcpy (ROMFilename, fname);

-    }

-    else

-#endif

     {

 	if ((ROMFile = OPEN_STREAM (fname, "rb")) == NULL)

 	    return (FALSE);

diff --git a/src/port.h b/src/port.h
index a6641bb..5c6bdca 100644
--- a/src/port.h
+++ b/src/port.h
@@ -64,7 +64,6 @@ I can't take it anymore, it's too convoluted.  So I've commented out the entire
 
 //Required Includes
 #include "pixform.h"
-#include <zlib.h> //RC
 //#include <windows.h>
 #include <limits.h>
 #include <string.h>
@@ -127,7 +126,7 @@ typedef short			int16_32;
 #define CHECK_SOUND()
 #define VOID void
 #define CPU_SHUTDOWN
-#define UNZIP_SUPPORT
+//#define UNZIP_SUPPORT
 #define ZeroMemory(a,b) memset((a),0,(b))
 #define PACKING __attribute__ ((packed))
 #define ALIGN_BY_ONE  __attribute__ ((aligned (1), packed))
@@ -230,7 +229,7 @@ typedef short			int16_32;
 #define CHECK_SOUND()
 #define VOID void
 #define CPU_SHUTDOWN
-#define UNZIP_SUPPORT
+//#define UNZIP_SUPPORT
 #define ZeroMemory(a,b) memset((a),0,(b))
 #define PACKING __attribute__ ((packed))
 #define ALIGN_BY_ONE  __attribute__ ((aligned (1), packed))
diff --git a/src/snes9x.h b/src/snes9x.h
index 0076b79..787b60d 100644
--- a/src/snes9x.h
+++ b/src/snes9x.h
@@ -67,7 +67,7 @@
 #define SEEK_STREAM(p,r,s)   memstream_seek(p,r,s)

 #elif defined(ZLIB)

 //#ifndef __WIN32__

-#include "zlib.h"

+//#include "zlib.h"

 //#endif

 #define STREAM gzFile

 #define READ_STREAM(p,l,s) gzread (s,p,l)

diff --git a/src/spc700/debug/port.h b/src/spc700/debug/port.h
index 1e18886..dfc3030 100644
--- a/src/spc700/debug/port.h
+++ b/src/spc700/debug/port.h
@@ -168,7 +168,7 @@ void gp32_fseek (long position,int ref,long *s);
 

 //#undef ZLIB

 //#define ZLIB

-#define UNZIP_SUPPORT

+//#define UNZIP_SUPPORT

 

 

 #define SPC700_SHUTDOWN

diff --git a/src/unzip.c b/src/unzip.c
deleted file mode 100644
index 3a70629..0000000
--- a/src/unzip.c
+++ /dev/null
@@ -1,1598 +0,0 @@
-/* unzip.c -- IO for uncompress .zip files using zlib

-   Version 1.01e, February 12th, 2005

-

-   Copyright (C) 1998-2005 Gilles Vollant

-

-   Read unzip.h for more info

-*/

-

-/* Decryption code comes from crypt.c by Info-ZIP but has been greatly reduced in terms of

-compatibility with older software. The following is from the original crypt.c. Code

-woven in by Terry Thorsen 1/2003.

-*/

-/*

-  Copyright (c) 1990-2000 Info-ZIP.  All rights reserved.

-

-  See the accompanying file LICENSE, version 2000-Apr-09 or later

-  (the contents of which are also included in zip.h) for terms of use.

-  If, for some reason, all these files are missing, the Info-ZIP license

-  also may be found at:  ftp://ftp.info-zip.org/pub/infozip/license.html

-*/

-/*

-  crypt.c (full version) by Info-ZIP.      Last revised:  [see crypt.h]

-

-  The encryption/decryption parts of this source code (as opposed to the

-  non-echoing password parts) were originally written in Europe.  The

-  whole source package can be freely distributed, including from the USA.

-  (Prior to January 2000, re-export from the US was a violation of US law.)

- */

-

-/*

-  This encryption code is a direct transcription of the algorithm from

-  Roger Schlafly, described by Phil Katz in the file appnote.txt.  This

-  file (appnote.txt) is distributed with the PKZIP program (even in the

-  version without encryption capabilities).

- */

-

-

-#include <stdio.h>

-#include <stdlib.h>

-#include <string.h>

-#include "zlib.h"

-#include "unzip.h"

-

-#ifdef STDC

-#  include <stddef.h>

-#  include <string.h>

-#  include <stdlib.h>

-#endif

-#ifdef NO_ERRNO_H

-    extern int errno;

-#else

-#   include <errno.h>

-#endif

-

-

-#ifndef local

-#  define local static

-#endif

-/* compile with -Dlocal if your debugger can't find static symbols */

-

-

-#ifndef CASESENSITIVITYDEFAULT_NO

-#  if !defined(unix) && !defined(CASESENSITIVITYDEFAULT_YES)

-#    define CASESENSITIVITYDEFAULT_NO

-#  endif

-#endif

-

-

-#ifndef UNZ_BUFSIZE

-#define UNZ_BUFSIZE (16384)

-#endif

-

-#ifndef UNZ_MAXFILENAMEINZIP

-#define UNZ_MAXFILENAMEINZIP (256)

-#endif

-

-#ifndef ALLOC

-# define ALLOC(size) (malloc(size))

-#endif

-#ifndef TRYFREE

-# define TRYFREE(p) {if (p) free(p);}

-#endif

-

-#define SIZECENTRALDIRITEM (0x2e)

-#define SIZEZIPLOCALHEADER (0x1e)

-

-

-

-

-const char unz_copyright[] =

-   " unzip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";

-

-/* unz_file_info_interntal contain internal info about a file in zipfile*/

-typedef struct unz_file_info_internal_s

-{

-    uLong offset_curfile;/* relative offset of local header 4 bytes */

-} unz_file_info_internal;

-

-

-/* file_in_zip_read_info_s contain internal information about a file in zipfile,

-    when reading and decompress it */

-typedef struct

-{

-    char  *read_buffer;         /* internal buffer for compressed data */

-    z_stream stream;            /* zLib stream structure for inflate */

-

-    uLong pos_in_zipfile;       /* position in byte on the zipfile, for fseek*/

-    uLong stream_initialised;   /* flag set if stream structure is initialised*/

-

-    uLong offset_local_extrafield;/* offset of the local extra field */

-    uInt  size_local_extrafield;/* size of the local extra field */

-    uLong pos_local_extrafield;   /* position in the local extra field in read*/

-

-    uLong crc32;                /* crc32 of all data uncompressed */

-    uLong crc32_wait;           /* crc32 we must obtain after decompress all */

-    uLong rest_read_compressed; /* number of byte to be decompressed */

-    uLong rest_read_uncompressed;/*number of byte to be obtained after decomp*/

-    zlib_filefunc_def z_filefunc;

-    voidpf filestream;        /* io structore of the zipfile */

-    uLong compression_method;   /* compression method (0==store) */

-    uLong byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/

-    int   raw;

-} file_in_zip_read_info_s;

-

-

-/* unz_s contain internal information about the zipfile

-*/

-typedef struct

-{

-    zlib_filefunc_def z_filefunc;

-    voidpf filestream;        /* io structore of the zipfile */

-    unz_global_info gi;       /* public global information */

-    uLong byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/

-    uLong num_file;             /* number of the current file in the zipfile*/

-    uLong pos_in_central_dir;   /* pos of the current file in the central dir*/

-    uLong current_file_ok;      /* flag about the usability of the current file*/

-    uLong central_pos;          /* position of the beginning of the central dir*/

-

-    uLong size_central_dir;     /* size of the central directory  */

-    uLong offset_central_dir;   /* offset of start of central directory with

-                                   respect to the starting disk number */

-

-    unz_file_info cur_file_info; /* public info about the current file in zip*/

-    unz_file_info_internal cur_file_info_internal; /* private info about it*/

-    file_in_zip_read_info_s* pfile_in_zip_read; /* structure about the current

-                                        file if we are decompressing it */

-    int encrypted;

-#    ifndef NOUNCRYPT

-    unsigned long keys[3];     /* keys defining the pseudo-random sequence */

-    const unsigned long* pcrc_32_tab;

-#    endif

-} unz_s;

-

-

-#ifndef NOUNCRYPT

-#include "crypt.h"

-#endif

-

-/* ===========================================================================

-     Read a byte from a gz_stream; update next_in and avail_in. Return EOF

-   for end of file.

-   IN assertion: the stream s has been sucessfully opened for reading.

-*/

-

-

-local int unzlocal_getByte OF((

-    const zlib_filefunc_def* pzlib_filefunc_def,

-    voidpf filestream,

-    int *pi));

-

-local int unzlocal_getByte(pzlib_filefunc_def,filestream,pi)

-    const zlib_filefunc_def* pzlib_filefunc_def;

-    voidpf filestream;

-    int *pi;

-{

-    unsigned char c;

-    int err = (int)ZREAD(*pzlib_filefunc_def,filestream,&c,1);

-    if (err==1)

-    {

-        *pi = (int)c;

-        return UNZ_OK;

-    }

-    else

-    {

-        if (ZERROR(*pzlib_filefunc_def,filestream))

-            return UNZ_ERRNO;

-        else

-            return UNZ_EOF;

-    }

-}

-

-

-/* ===========================================================================

-   Reads a long in LSB order from the given gz_stream. Sets

-*/

-local int unzlocal_getShort OF((

-    const zlib_filefunc_def* pzlib_filefunc_def,

-    voidpf filestream,

-    uLong *pX));

-

-local int unzlocal_getShort (pzlib_filefunc_def,filestream,pX)

-    const zlib_filefunc_def* pzlib_filefunc_def;

-    voidpf filestream;

-    uLong *pX;

-{

-    uLong x ;

-    int i;

-    int err;

-

-    err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);

-    x = (uLong)i;

-

-    if (err==UNZ_OK)

-        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);

-    x += ((uLong)i)<<8;

-

-    if (err==UNZ_OK)

-        *pX = x;

-    else

-        *pX = 0;

-    return err;

-}

-

-local int unzlocal_getLong OF((

-    const zlib_filefunc_def* pzlib_filefunc_def,

-    voidpf filestream,

-    uLong *pX));

-

-local int unzlocal_getLong (pzlib_filefunc_def,filestream,pX)

-    const zlib_filefunc_def* pzlib_filefunc_def;

-    voidpf filestream;

-    uLong *pX;

-{

-    uLong x ;

-    int i;

-    int err;

-

-    err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);

-    x = (uLong)i;

-

-    if (err==UNZ_OK)

-        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);

-    x += ((uLong)i)<<8;

-

-    if (err==UNZ_OK)

-        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);

-    x += ((uLong)i)<<16;

-

-    if (err==UNZ_OK)

-        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);

-    x += ((uLong)i)<<24;

-

-    if (err==UNZ_OK)

-        *pX = x;

-    else

-        *pX = 0;

-    return err;

-}

-

-

-/* My own strcmpi / strcasecmp */

-local int strcmpcasenosensitive_internal (fileName1,fileName2)

-    const char* fileName1;

-    const char* fileName2;

-{

-    for (;;)

-    {

-        char c1=*(fileName1++);

-        char c2=*(fileName2++);

-        if ((c1>='a') && (c1<='z'))

-            c1 -= 0x20;

-        if ((c2>='a') && (c2<='z'))

-            c2 -= 0x20;

-        if (c1=='\0')

-            return ((c2=='\0') ? 0 : -1);

-        if (c2=='\0')

-            return 1;

-        if (c1<c2)

-            return -1;

-        if (c1>c2)

-            return 1;

-    }

-}

-

-

-#ifdef  CASESENSITIVITYDEFAULT_NO

-#define CASESENSITIVITYDEFAULTVALUE 2

-#else

-#define CASESENSITIVITYDEFAULTVALUE 1

-#endif

-

-#ifndef STRCMPCASENOSENTIVEFUNCTION

-#define STRCMPCASENOSENTIVEFUNCTION strcmpcasenosensitive_internal

-#endif

-

-/*

-   Compare two filename (fileName1,fileName2).

-   If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)

-   If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi

-                                                                or strcasecmp)

-   If iCaseSenisivity = 0, case sensitivity is defaut of your operating system

-        (like 1 on Unix, 2 on Windows)

-

-*/

-extern int ZEXPORT unzStringFileNameCompare (fileName1,fileName2,iCaseSensitivity)

-    const char* fileName1;

-    const char* fileName2;

-    int iCaseSensitivity;

-{

-    if (iCaseSensitivity==0)

-        iCaseSensitivity=CASESENSITIVITYDEFAULTVALUE;

-

-    if (iCaseSensitivity==1)

-        return strcmp(fileName1,fileName2);

-

-    return STRCMPCASENOSENTIVEFUNCTION(fileName1,fileName2);

-}

-

-#ifndef BUFREADCOMMENT

-#define BUFREADCOMMENT (0x400)

-#endif

-

-/*

-  Locate the Central directory of a zipfile (at the end, just before

-    the global comment)

-*/

-local uLong unzlocal_SearchCentralDir OF((

-    const zlib_filefunc_def* pzlib_filefunc_def,

-    voidpf filestream));

-

-local uLong unzlocal_SearchCentralDir(pzlib_filefunc_def,filestream)

-    const zlib_filefunc_def* pzlib_filefunc_def;

-    voidpf filestream;

-{

-    unsigned char* buf;

-    uLong uSizeFile;

-    uLong uBackRead;

-    uLong uMaxBack=0xffff; /* maximum size of global comment */

-    uLong uPosFound=0;

-

-    if (ZSEEK(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)

-        return 0;

-

-

-    uSizeFile = ZTELL(*pzlib_filefunc_def,filestream);

-

-    if (uMaxBack>uSizeFile)

-        uMaxBack = uSizeFile;

-

-    buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);

-    if (buf==NULL)

-        return 0;

-

-    uBackRead = 4;

-    while (uBackRead<uMaxBack)

-    {

-        uLong uReadSize,uReadPos ;

-        int i;

-        if (uBackRead+BUFREADCOMMENT>uMaxBack)

-            uBackRead = uMaxBack;

-        else

-            uBackRead+=BUFREADCOMMENT;

-        uReadPos = uSizeFile-uBackRead ;

-

-        uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?

-                     (BUFREADCOMMENT+4) : (uSizeFile-uReadPos);

-        if (ZSEEK(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)

-            break;

-

-        if (ZREAD(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)

-            break;

-

-        for (i=(int)uReadSize-3; (i--)>0;)

-            if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&

-                ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))

-            {

-                uPosFound = uReadPos+i;

-                break;

-            }

-

-        if (uPosFound!=0)

-            break;

-    }

-    TRYFREE(buf);

-    return uPosFound;

-}

-

-/*

-  Open a Zip file. path contain the full pathname (by example,

-     on a Windows NT computer "c:\\test\\zlib114.zip" or on an Unix computer

-     "zlib/zlib114.zip".

-     If the zipfile cannot be opened (file doesn't exist or in not valid), the

-       return value is NULL.

-     Else, the return value is a unzFile Handle, usable with other function

-       of this unzip package.

-*/

-extern unzFile ZEXPORT unzOpen2 (path, pzlib_filefunc_def)

-    const char *path;

-    zlib_filefunc_def* pzlib_filefunc_def;

-{

-    unz_s us;

-    unz_s *s;

-    uLong central_pos,uL;

-

-    uLong number_disk;          /* number of the current dist, used for

-                                   spaning ZIP, unsupported, always 0*/

-    uLong number_disk_with_CD;  /* number the the disk with central dir, used

-                                   for spaning ZIP, unsupported, always 0*/

-    uLong number_entry_CD;      /* total number of entries in

-                                   the central dir

-                                   (same than number_entry on nospan) */

-

-    int err=UNZ_OK;

-

-    if (unz_copyright[0]!=' ')

-        return NULL;

-

-    if (pzlib_filefunc_def==NULL)

-        fill_fopen_filefunc(&us.z_filefunc);

-    else

-        us.z_filefunc = *pzlib_filefunc_def;

-

-    us.filestream= (*(us.z_filefunc.zopen_file))(us.z_filefunc.opaque,

-                                                 path,

-                                                 ZLIB_FILEFUNC_MODE_READ |

-                                                 ZLIB_FILEFUNC_MODE_EXISTING);

-    if (us.filestream==NULL)

-        return NULL;

-

-    central_pos = unzlocal_SearchCentralDir(&us.z_filefunc,us.filestream);

-    if (central_pos==0)

-        err=UNZ_ERRNO;

-

-    if (ZSEEK(us.z_filefunc, us.filestream,

-                                      central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)

-        err=UNZ_ERRNO;

-

-    /* the signature, already checked */

-    if (unzlocal_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)

-        err=UNZ_ERRNO;

-

-    /* number of this disk */

-    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_disk)!=UNZ_OK)

-        err=UNZ_ERRNO;

-

-    /* number of the disk with the start of the central directory */

-    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_disk_with_CD)!=UNZ_OK)

-        err=UNZ_ERRNO;

-

-    /* total number of entries in the central dir on this disk */

-    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&us.gi.number_entry)!=UNZ_OK)

-        err=UNZ_ERRNO;

-

-    /* total number of entries in the central dir */

-    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_entry_CD)!=UNZ_OK)

-        err=UNZ_ERRNO;

-

-    if ((number_entry_CD!=us.gi.number_entry) ||

-        (number_disk_with_CD!=0) ||

-        (number_disk!=0))

-        err=UNZ_BADZIPFILE;

-

-    /* size of the central directory */

-    if (unzlocal_getLong(&us.z_filefunc, us.filestream,&us.size_central_dir)!=UNZ_OK)

-        err=UNZ_ERRNO;

-

-    /* offset of start of central directory with respect to the

-          starting disk number */

-    if (unzlocal_getLong(&us.z_filefunc, us.filestream,&us.offset_central_dir)!=UNZ_OK)

-        err=UNZ_ERRNO;

-

-    /* zipfile comment length */

-    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&us.gi.size_comment)!=UNZ_OK)

-        err=UNZ_ERRNO;

-

-    if ((central_pos<us.offset_central_dir+us.size_central_dir) &&

-        (err==UNZ_OK))

-        err=UNZ_BADZIPFILE;

-

-    if (err!=UNZ_OK)

-    {

-        ZCLOSE(us.z_filefunc, us.filestream);

-        return NULL;

-    }

-

-    us.byte_before_the_zipfile = central_pos -

-                            (us.offset_central_dir+us.size_central_dir);

-    us.central_pos = central_pos;

-    us.pfile_in_zip_read = NULL;

-    us.encrypted = 0;

-

-

-    s=(unz_s*)ALLOC(sizeof(unz_s));

-    *s=us;

-    unzGoToFirstFile((unzFile)s);

-    return (unzFile)s;

-}

-

-

-extern unzFile ZEXPORT unzOpen (path)

-    const char *path;

-{

-    return unzOpen2(path, NULL);

-}

-

-/*

-  Close a ZipFile opened with unzipOpen.

-  If there is files inside the .Zip opened with unzipOpenCurrentFile (see later),

-    these files MUST be closed with unzipCloseCurrentFile before call unzipClose.

-  return UNZ_OK if there is no problem. */

-extern int ZEXPORT unzClose (file)

-    unzFile file;

-{

-    unz_s* s;

-    if (file==NULL)

-        return UNZ_PARAMERROR;

-    s=(unz_s*)file;

-

-    if (s->pfile_in_zip_read!=NULL)

-        unzCloseCurrentFile(file);

-

-    ZCLOSE(s->z_filefunc, s->filestream);

-    TRYFREE(s);

-    return UNZ_OK;

-}

-

-

-/*

-  Write info about the ZipFile in the *pglobal_info structure.

-  No preparation of the structure is needed

-  return UNZ_OK if there is no problem. */

-extern int ZEXPORT unzGetGlobalInfo (file,pglobal_info)

-    unzFile file;

-    unz_global_info *pglobal_info;

-{

-    unz_s* s;

-    if (file==NULL)

-        return UNZ_PARAMERROR;

-    s=(unz_s*)file;

-    *pglobal_info=s->gi;

-    return UNZ_OK;

-}

-

-

-/*

-   Translate date/time from Dos format to tm_unz (readable more easilty)

-*/

-local void unzlocal_DosDateToTmuDate (ulDosDate, ptm)

-    uLong ulDosDate;

-    tm_unz* ptm;

-{

-    uLong uDate;

-    uDate = (uLong)(ulDosDate>>16);

-    ptm->tm_mday = (uInt)(uDate&0x1f) ;

-    ptm->tm_mon =  (uInt)((((uDate)&0x1E0)/0x20)-1) ;

-    ptm->tm_year = (uInt)(((uDate&0x0FE00)/0x0200)+1980) ;

-

-    ptm->tm_hour = (uInt) ((ulDosDate &0xF800)/0x800);

-    ptm->tm_min =  (uInt) ((ulDosDate&0x7E0)/0x20) ;

-    ptm->tm_sec =  (uInt) (2*(ulDosDate&0x1f)) ;

-}

-

-/*

-  Get Info about the current file in the zipfile, with internal only info

-*/

-local int unzlocal_GetCurrentFileInfoInternal OF((unzFile file,

-                                                  unz_file_info *pfile_info,

-                                                  unz_file_info_internal

-                                                  *pfile_info_internal,

-                                                  char *szFileName,

-                                                  uLong fileNameBufferSize,

-                                                  void *extraField,

-                                                  uLong extraFieldBufferSize,

-                                                  char *szComment,

-                                                  uLong commentBufferSize));

-

-local int unzlocal_GetCurrentFileInfoInternal (file,

-                                              pfile_info,

-                                              pfile_info_internal,

-                                              szFileName, fileNameBufferSize,

-                                              extraField, extraFieldBufferSize,

-                                              szComment,  commentBufferSize)

-    unzFile file;

-    unz_file_info *pfile_info;

-    unz_file_info_internal *pfile_info_internal;

-    char *szFileName;

-    uLong fileNameBufferSize;

-    void *extraField;

-    uLong extraFieldBufferSize;

-    char *szComment;

-    uLong commentBufferSize;

-{

-    unz_s* s;

-    unz_file_info file_info;

-    unz_file_info_internal file_info_internal;

-    int err=UNZ_OK;

-    uLong uMagic;

-    long lSeek=0;

-

-    if (file==NULL)

-        return UNZ_PARAMERROR;

-    s=(unz_s*)file;

-    if (ZSEEK(s->z_filefunc, s->filestream,

-              s->pos_in_central_dir+s->byte_before_the_zipfile,

-              ZLIB_FILEFUNC_SEEK_SET)!=0)

-        err=UNZ_ERRNO;

-

-

-    /* we check the magic */

-    if (err==UNZ_OK)

-        if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)

-            err=UNZ_ERRNO;

-        else if (uMagic!=0x02014b50)

-            err=UNZ_BADZIPFILE;

-

-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.version) != UNZ_OK)

-        err=UNZ_ERRNO;

-

-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.version_needed) != UNZ_OK)

-        err=UNZ_ERRNO;

-

-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.flag) != UNZ_OK)

-        err=UNZ_ERRNO;

-

-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.compression_method) != UNZ_OK)

-        err=UNZ_ERRNO;

-

-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.dosDate) != UNZ_OK)

-        err=UNZ_ERRNO;

-

-    unzlocal_DosDateToTmuDate(file_info.dosDate,&file_info.tmu_date);

-

-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.crc) != UNZ_OK)

-        err=UNZ_ERRNO;

-

-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.compressed_size) != UNZ_OK)

-        err=UNZ_ERRNO;

-

-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.uncompressed_size) != UNZ_OK)

-        err=UNZ_ERRNO;

-

-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_filename) != UNZ_OK)

-        err=UNZ_ERRNO;

-

-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_extra) != UNZ_OK)

-        err=UNZ_ERRNO;

-

-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_comment) != UNZ_OK)

-        err=UNZ_ERRNO;

-

-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.disk_num_start) != UNZ_OK)

-        err=UNZ_ERRNO;

-

-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.internal_fa) != UNZ_OK)

-        err=UNZ_ERRNO;

-

-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.external_fa) != UNZ_OK)

-        err=UNZ_ERRNO;

-

-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info_internal.offset_curfile) != UNZ_OK)

-        err=UNZ_ERRNO;

-

-    lSeek+=file_info.size_filename;

-    if ((err==UNZ_OK) && (szFileName!=NULL))

-    {

-        uLong uSizeRead ;

-        if (file_info.size_filename<fileNameBufferSize)

-        {

-            *(szFileName+file_info.size_filename)='\0';

-            uSizeRead = file_info.size_filename;

-        }

-        else

-            uSizeRead = fileNameBufferSize;

-

-        if ((file_info.size_filename>0) && (fileNameBufferSize>0))

-            if (ZREAD(s->z_filefunc, s->filestream,szFileName,uSizeRead)!=uSizeRead)

-                err=UNZ_ERRNO;

-        lSeek -= uSizeRead;

-    }

-

-

-    if ((err==UNZ_OK) && (extraField!=NULL))

-    {

-        uLong uSizeRead ;

-        if (file_info.size_file_extra<extraFieldBufferSize)

-            uSizeRead = file_info.size_file_extra;

-        else

-            uSizeRead = extraFieldBufferSize;

-

-        if (lSeek!=0)

-            if (ZSEEK(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)

-                lSeek=0;

-            else

-                err=UNZ_ERRNO;

-        if ((file_info.size_file_extra>0) && (extraFieldBufferSize>0))

-            if (ZREAD(s->z_filefunc, s->filestream,extraField,uSizeRead)!=uSizeRead)

-                err=UNZ_ERRNO;

-        lSeek += file_info.size_file_extra - uSizeRead;

-    }

-    else

-        lSeek+=file_info.size_file_extra;

-

-

-    if ((err==UNZ_OK) && (szComment!=NULL))

-    {

-        uLong uSizeRead ;

-        if (file_info.size_file_comment<commentBufferSize)

-        {

-            *(szComment+file_info.size_file_comment)='\0';

-            uSizeRead = file_info.size_file_comment;

-        }

-        else

-            uSizeRead = commentBufferSize;

-

-        if (lSeek!=0)

-            if (ZSEEK(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)

-                lSeek=0;

-            else

-                err=UNZ_ERRNO;

-        if ((file_info.size_file_comment>0) && (commentBufferSize>0))

-            if (ZREAD(s->z_filefunc, s->filestream,szComment,uSizeRead)!=uSizeRead)

-                err=UNZ_ERRNO;

-        lSeek+=file_info.size_file_comment - uSizeRead;

-    }

-    else

-        lSeek+=file_info.size_file_comment;

-

-    if ((err==UNZ_OK) && (pfile_info!=NULL))

-        *pfile_info=file_info;

-

-    if ((err==UNZ_OK) && (pfile_info_internal!=NULL))

-        *pfile_info_internal=file_info_internal;

-

-    return err;

-}

-

-

-

-/*

-  Write info about the ZipFile in the *pglobal_info structure.

-  No preparation of the structure is needed

-  return UNZ_OK if there is no problem.

-*/

-extern int ZEXPORT unzGetCurrentFileInfo (file,

-                                          pfile_info,

-                                          szFileName, fileNameBufferSize,

-                                          extraField, extraFieldBufferSize,

-                                          szComment,  commentBufferSize)

-    unzFile file;

-    unz_file_info *pfile_info;

-    char *szFileName;

-    uLong fileNameBufferSize;

-    void *extraField;

-    uLong extraFieldBufferSize;

-    char *szComment;

-    uLong commentBufferSize;

-{

-    return unzlocal_GetCurrentFileInfoInternal(file,pfile_info,NULL,

-                                                szFileName,fileNameBufferSize,

-                                                extraField,extraFieldBufferSize,

-                                                szComment,commentBufferSize);

-}

-

-/*

-  Set the current file of the zipfile to the first file.

-  return UNZ_OK if there is no problem

-*/

-extern int ZEXPORT unzGoToFirstFile (file)

-    unzFile file;

-{

-    int err=UNZ_OK;

-    unz_s* s;

-    if (file==NULL)

-        return UNZ_PARAMERROR;

-    s=(unz_s*)file;

-    s->pos_in_central_dir=s->offset_central_dir;

-    s->num_file=0;

-    err=unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,

-                                             &s->cur_file_info_internal,

-                                             NULL,0,NULL,0,NULL,0);

-    s->current_file_ok = (err == UNZ_OK);

-    return err;

-}

-

-/*

-  Set the current file of the zipfile to the next file.

-  return UNZ_OK if there is no problem

-  return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.

-*/

-extern int ZEXPORT unzGoToNextFile (file)

-    unzFile file;

-{

-    unz_s* s;

-    int err;

-

-    if (file==NULL)

-        return UNZ_PARAMERROR;

-    s=(unz_s*)file;

-    if (!s->current_file_ok)

-        return UNZ_END_OF_LIST_OF_FILE;

-    if (s->gi.number_entry != 0xffff)    /* 2^16 files overflow hack */

-      if (s->num_file+1==s->gi.number_entry)

-        return UNZ_END_OF_LIST_OF_FILE;

-

-    s->pos_in_central_dir += SIZECENTRALDIRITEM + s->cur_file_info.size_filename +

-            s->cur_file_info.size_file_extra + s->cur_file_info.size_file_comment ;

-    s->num_file++;

-    err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,

-                                               &s->cur_file_info_internal,

-                                               NULL,0,NULL,0,NULL,0);

-    s->current_file_ok = (err == UNZ_OK);

-    return err;

-}

-

-

-/*

-  Try locate the file szFileName in the zipfile.

-  For the iCaseSensitivity signification, see unzipStringFileNameCompare

-

-  return value :

-  UNZ_OK if the file is found. It becomes the current file.

-  UNZ_END_OF_LIST_OF_FILE if the file is not found

-*/

-extern int ZEXPORT unzLocateFile (file, szFileName, iCaseSensitivity)

-    unzFile file;

-    const char *szFileName;

-    int iCaseSensitivity;

-{

-    unz_s* s;

-    int err;

-

-    /* We remember the 'current' position in the file so that we can jump

-     * back there if we fail.

-     */

-    unz_file_info cur_file_infoSaved;

-    unz_file_info_internal cur_file_info_internalSaved;

-    uLong num_fileSaved;

-    uLong pos_in_central_dirSaved;

-

-

-    if (file==NULL)

-        return UNZ_PARAMERROR;

-

-    if (strlen(szFileName)>=UNZ_MAXFILENAMEINZIP)

-        return UNZ_PARAMERROR;

-

-    s=(unz_s*)file;

-    if (!s->current_file_ok)

-        return UNZ_END_OF_LIST_OF_FILE;

-

-    /* Save the current state */

-    num_fileSaved = s->num_file;

-    pos_in_central_dirSaved = s->pos_in_central_dir;

-    cur_file_infoSaved = s->cur_file_info;

-    cur_file_info_internalSaved = s->cur_file_info_internal;

-

-    err = unzGoToFirstFile(file);

-

-    while (err == UNZ_OK)

-    {

-        char szCurrentFileName[UNZ_MAXFILENAMEINZIP+1];

-        err = unzGetCurrentFileInfo(file,NULL,

-                                    szCurrentFileName,sizeof(szCurrentFileName)-1,

-                                    NULL,0,NULL,0);

-        if (err == UNZ_OK)

-        {

-            if (unzStringFileNameCompare(szCurrentFileName,

-                                            szFileName,iCaseSensitivity)==0)

-                return UNZ_OK;

-            err = unzGoToNextFile(file);

-        }

-    }

-

-    /* We failed, so restore the state of the 'current file' to where we

-     * were.

-     */

-    s->num_file = num_fileSaved ;

-    s->pos_in_central_dir = pos_in_central_dirSaved ;

-    s->cur_file_info = cur_file_infoSaved;

-    s->cur_file_info_internal = cur_file_info_internalSaved;

-    return err;

-}

-

-

-/*

-///////////////////////////////////////////

-// Contributed by Ryan Haksi (mailto://cryogen@infoserve.net)

-// I need random access

-//

-// Further optimization could be realized by adding an ability

-// to cache the directory in memory. The goal being a single

-// comprehensive file read to put the file I need in a memory.

-*/

-

-/*

-typedef struct unz_file_pos_s

-{

-    uLong pos_in_zip_directory;   // offset in file

-    uLong num_of_file;            // # of file

-} unz_file_pos;

-*/

-

-extern int ZEXPORT unzGetFilePos(file, file_pos)

-    unzFile file;

-    unz_file_pos* file_pos;

-{

-    unz_s* s;

-

-    if (file==NULL || file_pos==NULL)

-        return UNZ_PARAMERROR;

-    s=(unz_s*)file;

-    if (!s->current_file_ok)

-        return UNZ_END_OF_LIST_OF_FILE;

-

-    file_pos->pos_in_zip_directory  = s->pos_in_central_dir;

-    file_pos->num_of_file           = s->num_file;

-

-    return UNZ_OK;

-}

-

-extern int ZEXPORT unzGoToFilePos(file, file_pos)

-    unzFile file;

-    unz_file_pos* file_pos;

-{

-    unz_s* s;

-    int err;

-

-    if (file==NULL || file_pos==NULL)

-        return UNZ_PARAMERROR;

-    s=(unz_s*)file;

-

-    /* jump to the right spot */

-    s->pos_in_central_dir = file_pos->pos_in_zip_directory;

-    s->num_file           = file_pos->num_of_file;

-

-    /* set the current file */

-    err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,

-                                               &s->cur_file_info_internal,

-                                               NULL,0,NULL,0,NULL,0);

-    /* return results */

-    s->current_file_ok = (err == UNZ_OK);

-    return err;

-}

-

-/*

-// Unzip Helper Functions - should be here?

-///////////////////////////////////////////

-*/

-

-/*

-  Read the local header of the current zipfile

-  Check the coherency of the local header and info in the end of central

-        directory about this file

-  store in *piSizeVar the size of extra info in local header

-        (filename and size of extra field data)

-*/

-local int unzlocal_CheckCurrentFileCoherencyHeader (s,piSizeVar,

-                                                    poffset_local_extrafield,

-                                                    psize_local_extrafield)

-    unz_s* s;

-    uInt* piSizeVar;

-    uLong *poffset_local_extrafield;

-    uInt  *psize_local_extrafield;

-{

-    uLong uMagic,uData,uFlags;

-    uLong size_filename;

-    uLong size_extra_field;

-    int err=UNZ_OK;

-

-    *piSizeVar = 0;

-    *poffset_local_extrafield = 0;

-    *psize_local_extrafield = 0;

-

-    if (ZSEEK(s->z_filefunc, s->filestream,s->cur_file_info_internal.offset_curfile +

-                                s->byte_before_the_zipfile,ZLIB_FILEFUNC_SEEK_SET)!=0)

-        return UNZ_ERRNO;

-

-

-    if (err==UNZ_OK)

-        if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)

-            err=UNZ_ERRNO;

-        else if (uMagic!=0x04034b50)

-            err=UNZ_BADZIPFILE;

-

-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)

-        err=UNZ_ERRNO;

-/*

-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.wVersion))

-        err=UNZ_BADZIPFILE;

-*/

-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uFlags) != UNZ_OK)

-        err=UNZ_ERRNO;

-

-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)

-        err=UNZ_ERRNO;

-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compression_method))

-        err=UNZ_BADZIPFILE;

-

-    if ((err==UNZ_OK) && (s->cur_file_info.compression_method!=0) &&

-                         (s->cur_file_info.compression_method!=Z_DEFLATED))

-        err=UNZ_BADZIPFILE;

-

-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* date/time */

-        err=UNZ_ERRNO;

-

-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* crc */

-        err=UNZ_ERRNO;

-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.crc) &&

-                              ((uFlags & 8)==0))

-        err=UNZ_BADZIPFILE;

-

-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size compr */

-        err=UNZ_ERRNO;

-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compressed_size) &&

-                              ((uFlags & 8)==0))

-        err=UNZ_BADZIPFILE;

-

-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size uncompr */

-        err=UNZ_ERRNO;

-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.uncompressed_size) &&

-                              ((uFlags & 8)==0))

-        err=UNZ_BADZIPFILE;

-

-

-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&size_filename) != UNZ_OK)

-        err=UNZ_ERRNO;

-    else if ((err==UNZ_OK) && (size_filename!=s->cur_file_info.size_filename))

-        err=UNZ_BADZIPFILE;

-

-    *piSizeVar += (uInt)size_filename;

-

-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&size_extra_field) != UNZ_OK)

-        err=UNZ_ERRNO;

-    *poffset_local_extrafield= s->cur_file_info_internal.offset_curfile +

-                                    SIZEZIPLOCALHEADER + size_filename;

-    *psize_local_extrafield = (uInt)size_extra_field;

-

-    *piSizeVar += (uInt)size_extra_field;

-

-    return err;

-}

-

-/*

-  Open for reading data the current file in the zipfile.

-  If there is no error and the file is opened, the return value is UNZ_OK.

-*/

-extern int ZEXPORT unzOpenCurrentFile3 (file, method, level, raw, password)

-    unzFile file;

-    int* method;

-    int* level;

-    int raw;

-    const char* password;

-{

-    int err=UNZ_OK;

-    uInt iSizeVar;

-    unz_s* s;

-    file_in_zip_read_info_s* pfile_in_zip_read_info;

-    uLong offset_local_extrafield;  /* offset of the local extra field */

-    uInt  size_local_extrafield;    /* size of the local extra field */

-#    ifndef NOUNCRYPT

-    char source[12];

-#    else

-    if (password != NULL)

-        return UNZ_PARAMERROR;

-#    endif

-

-    if (file==NULL)

-        return UNZ_PARAMERROR;

-    s=(unz_s*)file;

-    if (!s->current_file_ok)

-        return UNZ_PARAMERROR;

-

-    if (s->pfile_in_zip_read != NULL)

-        unzCloseCurrentFile(file);

-

-    if (unzlocal_CheckCurrentFileCoherencyHeader(s,&iSizeVar,

-                &offset_local_extrafield,&size_local_extrafield)!=UNZ_OK)

-        return UNZ_BADZIPFILE;

-

-    pfile_in_zip_read_info = (file_in_zip_read_info_s*)

-                                        ALLOC(sizeof(file_in_zip_read_info_s));

-    if (pfile_in_zip_read_info==NULL)

-        return UNZ_INTERNALERROR;

-

-    pfile_in_zip_read_info->read_buffer=(char*)ALLOC(UNZ_BUFSIZE);

-    pfile_in_zip_read_info->offset_local_extrafield = offset_local_extrafield;

-    pfile_in_zip_read_info->size_local_extrafield = size_local_extrafield;

-    pfile_in_zip_read_info->pos_local_extrafield=0;

-    pfile_in_zip_read_info->raw=raw;

-

-    if (pfile_in_zip_read_info->read_buffer==NULL)

-    {

-        TRYFREE(pfile_in_zip_read_info);

-        return UNZ_INTERNALERROR;

-    }

-

-    pfile_in_zip_read_info->stream_initialised=0;

-

-    if (method!=NULL)

-        *method = (int)s->cur_file_info.compression_method;

-

-    if (level!=NULL)

-    {

-        *level = 6;

-        switch (s->cur_file_info.flag & 0x06)

-        {

-          case 6 : *level = 1; break;

-          case 4 : *level = 2; break;

-          case 2 : *level = 9; break;

-        }

-    }

-

-    if ((s->cur_file_info.compression_method!=0) &&

-        (s->cur_file_info.compression_method!=Z_DEFLATED))

-        err=UNZ_BADZIPFILE;

-

-    pfile_in_zip_read_info->crc32_wait=s->cur_file_info.crc;

-    pfile_in_zip_read_info->crc32=0;

-    pfile_in_zip_read_info->compression_method =

-            s->cur_file_info.compression_method;

-    pfile_in_zip_read_info->filestream=s->filestream;

-    pfile_in_zip_read_info->z_filefunc=s->z_filefunc;

-    pfile_in_zip_read_info->byte_before_the_zipfile=s->byte_before_the_zipfile;

-

-    pfile_in_zip_read_info->stream.total_out = 0;

-

-    if ((s->cur_file_info.compression_method==Z_DEFLATED) &&

-        (!raw))

-    {

-      pfile_in_zip_read_info->stream.zalloc = (alloc_func)0;

-      pfile_in_zip_read_info->stream.zfree = (free_func)0;

-      pfile_in_zip_read_info->stream.opaque = (voidpf)0;

-      pfile_in_zip_read_info->stream.next_in = (voidpf)0;

-      pfile_in_zip_read_info->stream.avail_in = 0;

-

-      err=inflateInit2(&pfile_in_zip_read_info->stream, -MAX_WBITS);

-      if (err == Z_OK)

-        pfile_in_zip_read_info->stream_initialised=1;

-      else

-      {

-        TRYFREE(pfile_in_zip_read_info);

-        return err;

-      }

-        /* windowBits is passed < 0 to tell that there is no zlib header.

-         * Note that in this case inflate *requires* an extra "dummy" byte

-         * after the compressed stream in order to complete decompression and

-         * return Z_STREAM_END.

-         * In unzip, i don't wait absolutely Z_STREAM_END because I known the

-         * size of both compressed and uncompressed data

-         */

-    }

-    pfile_in_zip_read_info->rest_read_compressed =

-            s->cur_file_info.compressed_size ;

-    pfile_in_zip_read_info->rest_read_uncompressed =

-            s->cur_file_info.uncompressed_size ;

-

-

-    pfile_in_zip_read_info->pos_in_zipfile =

-            s->cur_file_info_internal.offset_curfile + SIZEZIPLOCALHEADER +

-              iSizeVar;

-

-    pfile_in_zip_read_info->stream.avail_in = (uInt)0;

-

-    s->pfile_in_zip_read = pfile_in_zip_read_info;

-

-#    ifndef NOUNCRYPT

-    if (password != NULL)

-    {

-        int i;

-        s->pcrc_32_tab = get_crc_table();

-        init_keys(password,s->keys,s->pcrc_32_tab);

-        if (ZSEEK(s->z_filefunc, s->filestream,

-                  s->pfile_in_zip_read->pos_in_zipfile +

-                     s->pfile_in_zip_read->byte_before_the_zipfile,

-                  SEEK_SET)!=0)

-            return UNZ_INTERNALERROR;

-        if(ZREAD(s->z_filefunc, s->filestream,source, 12)<12)

-            return UNZ_INTERNALERROR;

-

-        for (i = 0; i<12; i++)

-            zdecode(s->keys,s->pcrc_32_tab,source[i]);

-

-        s->pfile_in_zip_read->pos_in_zipfile+=12;

-        s->encrypted=1;

-    }

-#    endif

-

-

-    return UNZ_OK;

-}

-

-extern int ZEXPORT unzOpenCurrentFile (file)

-    unzFile file;

-{

-    return unzOpenCurrentFile3(file, NULL, NULL, 0, NULL);

-}

-

-extern int ZEXPORT unzOpenCurrentFilePassword (file, password)

-    unzFile file;

-    const char* password;

-{

-    return unzOpenCurrentFile3(file, NULL, NULL, 0, password);

-}

-

-extern int ZEXPORT unzOpenCurrentFile2 (file,method,level,raw)

-    unzFile file;

-    int* method;

-    int* level;

-    int raw;

-{

-    return unzOpenCurrentFile3(file, method, level, raw, NULL);

-}

-

-/*

-  Read bytes from the current file.

-  buf contain buffer where data must be copied

-  len the size of buf.

-

-  return the number of byte copied if somes bytes are copied

-  return 0 if the end of file was reached

-  return <0 with error code if there is an error

-    (UNZ_ERRNO for IO error, or zLib error for uncompress error)

-*/

-extern int ZEXPORT unzReadCurrentFile  (file, buf, len)

-    unzFile file;

-    voidp buf;

-    unsigned len;

-{

-    int err=UNZ_OK;

-    uInt iRead = 0;

-    unz_s* s;

-    file_in_zip_read_info_s* pfile_in_zip_read_info;

-    if (file==NULL)

-        return UNZ_PARAMERROR;

-    s=(unz_s*)file;

-    pfile_in_zip_read_info=s->pfile_in_zip_read;

-

-    if (pfile_in_zip_read_info==NULL)

-        return UNZ_PARAMERROR;

-

-

-    if ((pfile_in_zip_read_info->read_buffer == NULL))

-        return UNZ_END_OF_LIST_OF_FILE;

-    if (len==0)

-        return 0;

-

-    pfile_in_zip_read_info->stream.next_out = (Bytef*)buf;

-

-    pfile_in_zip_read_info->stream.avail_out = (uInt)len;

-

-    if ((len>pfile_in_zip_read_info->rest_read_uncompressed) &&

-        (!(pfile_in_zip_read_info->raw)))

-        pfile_in_zip_read_info->stream.avail_out =

-            (uInt)pfile_in_zip_read_info->rest_read_uncompressed;

-

-    if ((len>pfile_in_zip_read_info->rest_read_compressed+

-           pfile_in_zip_read_info->stream.avail_in) &&

-         (pfile_in_zip_read_info->raw))

-        pfile_in_zip_read_info->stream.avail_out =

-            (uInt)pfile_in_zip_read_info->rest_read_compressed+

-            pfile_in_zip_read_info->stream.avail_in;

-

-    while (pfile_in_zip_read_info->stream.avail_out>0)

-    {

-        if ((pfile_in_zip_read_info->stream.avail_in==0) &&

-            (pfile_in_zip_read_info->rest_read_compressed>0))

-        {

-            uInt uReadThis = UNZ_BUFSIZE;

-            if (pfile_in_zip_read_info->rest_read_compressed<uReadThis)

-                uReadThis = (uInt)pfile_in_zip_read_info->rest_read_compressed;

-            if (uReadThis == 0)

-                return UNZ_EOF;

-            if (ZSEEK(pfile_in_zip_read_info->z_filefunc,

-                      pfile_in_zip_read_info->filestream,

-                      pfile_in_zip_read_info->pos_in_zipfile +

-                         pfile_in_zip_read_info->byte_before_the_zipfile,

-                         ZLIB_FILEFUNC_SEEK_SET)!=0)

-                return UNZ_ERRNO;

-            if (ZREAD(pfile_in_zip_read_info->z_filefunc,

-                      pfile_in_zip_read_info->filestream,

-                      pfile_in_zip_read_info->read_buffer,

-                      uReadThis)!=uReadThis)

-                return UNZ_ERRNO;

-

-

-#            ifndef NOUNCRYPT

-            if(s->encrypted)

-            {

-                uInt i;

-                for(i=0;i<uReadThis;i++)

-                  pfile_in_zip_read_info->read_buffer[i] =

-                      zdecode(s->keys,s->pcrc_32_tab,

-                              pfile_in_zip_read_info->read_buffer[i]);

-            }

-#            endif

-

-

-            pfile_in_zip_read_info->pos_in_zipfile += uReadThis;

-

-            pfile_in_zip_read_info->rest_read_compressed-=uReadThis;

-

-            pfile_in_zip_read_info->stream.next_in =

-                (Bytef*)pfile_in_zip_read_info->read_buffer;

-            pfile_in_zip_read_info->stream.avail_in = (uInt)uReadThis;

-        }

-

-        if ((pfile_in_zip_read_info->compression_method==0) || (pfile_in_zip_read_info->raw))

-        {

-            uInt uDoCopy,i ;

-

-            if ((pfile_in_zip_read_info->stream.avail_in == 0) &&

-                (pfile_in_zip_read_info->rest_read_compressed == 0))

-                return (iRead==0) ? UNZ_EOF : iRead;

-

-            if (pfile_in_zip_read_info->stream.avail_out <

-                            pfile_in_zip_read_info->stream.avail_in)

-                uDoCopy = pfile_in_zip_read_info->stream.avail_out ;

-            else

-                uDoCopy = pfile_in_zip_read_info->stream.avail_in ;

-

-            for (i=0;i<uDoCopy;i++)

-                *(pfile_in_zip_read_info->stream.next_out+i) =

-                        *(pfile_in_zip_read_info->stream.next_in+i);

-

-            pfile_in_zip_read_info->crc32 = crc32(pfile_in_zip_read_info->crc32,

-                                pfile_in_zip_read_info->stream.next_out,

-                                uDoCopy);

-            pfile_in_zip_read_info->rest_read_uncompressed-=uDoCopy;

-            pfile_in_zip_read_info->stream.avail_in -= uDoCopy;

-            pfile_in_zip_read_info->stream.avail_out -= uDoCopy;

-            pfile_in_zip_read_info->stream.next_out += uDoCopy;

-            pfile_in_zip_read_info->stream.next_in += uDoCopy;

-            pfile_in_zip_read_info->stream.total_out += uDoCopy;

-            iRead += uDoCopy;

-        }

-        else

-        {

-            uLong uTotalOutBefore,uTotalOutAfter;

-            const Bytef *bufBefore;

-            uLong uOutThis;

-            int flush=Z_SYNC_FLUSH;

-

-            uTotalOutBefore = pfile_in_zip_read_info->stream.total_out;

-            bufBefore = pfile_in_zip_read_info->stream.next_out;

-

-            /*

-            if ((pfile_in_zip_read_info->rest_read_uncompressed ==

-                     pfile_in_zip_read_info->stream.avail_out) &&

-                (pfile_in_zip_read_info->rest_read_compressed == 0))

-                flush = Z_FINISH;

-            */

-            err=inflate(&pfile_in_zip_read_info->stream,flush);

-

-            if ((err>=0) && (pfile_in_zip_read_info->stream.msg!=NULL))

-              err = Z_DATA_ERROR;

-

-            uTotalOutAfter = pfile_in_zip_read_info->stream.total_out;

-            uOutThis = uTotalOutAfter-uTotalOutBefore;

-

-            pfile_in_zip_read_info->crc32 =

-                crc32(pfile_in_zip_read_info->crc32,bufBefore,

-                        (uInt)(uOutThis));

-

-            pfile_in_zip_read_info->rest_read_uncompressed -=

-                uOutThis;

-

-            iRead += (uInt)(uTotalOutAfter - uTotalOutBefore);

-

-            if (err==Z_STREAM_END)

-                return (iRead==0) ? UNZ_EOF : iRead;

-            if (err!=Z_OK)

-                break;

-        }

-    }

-

-    if (err==Z_OK)

-        return iRead;

-    return err;

-}

-

-

-/*

-  Give the current position in uncompressed data

-*/

-extern z_off_t ZEXPORT unztell (file)

-    unzFile file;

-{

-    unz_s* s;

-    file_in_zip_read_info_s* pfile_in_zip_read_info;

-    if (file==NULL)

-        return UNZ_PARAMERROR;

-    s=(unz_s*)file;

-    pfile_in_zip_read_info=s->pfile_in_zip_read;

-

-    if (pfile_in_zip_read_info==NULL)

-        return UNZ_PARAMERROR;

-

-    return (z_off_t)pfile_in_zip_read_info->stream.total_out;

-}

-

-

-/*

-  return 1 if the end of file was reached, 0 elsewhere

-*/

-extern int ZEXPORT unzeof (file)

-    unzFile file;

-{

-    unz_s* s;

-    file_in_zip_read_info_s* pfile_in_zip_read_info;

-    if (file==NULL)

-        return UNZ_PARAMERROR;

-    s=(unz_s*)file;

-    pfile_in_zip_read_info=s->pfile_in_zip_read;

-

-    if (pfile_in_zip_read_info==NULL)

-        return UNZ_PARAMERROR;

-

-    if (pfile_in_zip_read_info->rest_read_uncompressed == 0)

-        return 1;

-    else

-        return 0;

-}

-

-

-

-/*

-  Read extra field from the current file (opened by unzOpenCurrentFile)

-  This is the local-header version of the extra field (sometimes, there is

-    more info in the local-header version than in the central-header)

-

-  if buf==NULL, it return the size of the local extra field that can be read

-

-  if buf!=NULL, len is the size of the buffer, the extra header is copied in

-    buf.

-  the return value is the number of bytes copied in buf, or (if <0)

-    the error code

-*/

-extern int ZEXPORT unzGetLocalExtrafield (file,buf,len)

-    unzFile file;

-    voidp buf;

-    unsigned len;

-{

-    unz_s* s;

-    file_in_zip_read_info_s* pfile_in_zip_read_info;

-    uInt read_now;

-    uLong size_to_read;

-

-    if (file==NULL)

-        return UNZ_PARAMERROR;

-    s=(unz_s*)file;

-    pfile_in_zip_read_info=s->pfile_in_zip_read;

-

-    if (pfile_in_zip_read_info==NULL)

-        return UNZ_PARAMERROR;

-

-    size_to_read = (pfile_in_zip_read_info->size_local_extrafield -

-                pfile_in_zip_read_info->pos_local_extrafield);

-

-    if (buf==NULL)

-        return (int)size_to_read;

-

-    if (len>size_to_read)

-        read_now = (uInt)size_to_read;

-    else

-        read_now = (uInt)len ;

-

-    if (read_now==0)

-        return 0;

-

-    if (ZSEEK(pfile_in_zip_read_info->z_filefunc,

-              pfile_in_zip_read_info->filestream,

-              pfile_in_zip_read_info->offset_local_extrafield +

-              pfile_in_zip_read_info->pos_local_extrafield,

-              ZLIB_FILEFUNC_SEEK_SET)!=0)

-        return UNZ_ERRNO;

-

-    if (ZREAD(pfile_in_zip_read_info->z_filefunc,

-              pfile_in_zip_read_info->filestream,

-              buf,read_now)!=read_now)

-        return UNZ_ERRNO;

-

-    return (int)read_now;

-}

-

-/*

-  Close the file in zip opened with unzipOpenCurrentFile

-  Return UNZ_CRCERROR if all the file was read but the CRC is not good

-*/

-extern int ZEXPORT unzCloseCurrentFile (file)

-    unzFile file;

-{

-    int err=UNZ_OK;

-

-    unz_s* s;

-    file_in_zip_read_info_s* pfile_in_zip_read_info;

-    if (file==NULL)

-        return UNZ_PARAMERROR;

-    s=(unz_s*)file;

-    pfile_in_zip_read_info=s->pfile_in_zip_read;

-

-    if (pfile_in_zip_read_info==NULL)

-        return UNZ_PARAMERROR;

-

-

-    if ((pfile_in_zip_read_info->rest_read_uncompressed == 0) &&

-        (!pfile_in_zip_read_info->raw))

-    {

-        if (pfile_in_zip_read_info->crc32 != pfile_in_zip_read_info->crc32_wait)

-            err=UNZ_CRCERROR;

-    }

-

-

-    TRYFREE(pfile_in_zip_read_info->read_buffer);

-    pfile_in_zip_read_info->read_buffer = NULL;

-    if (pfile_in_zip_read_info->stream_initialised)

-        inflateEnd(&pfile_in_zip_read_info->stream);

-

-    pfile_in_zip_read_info->stream_initialised = 0;

-    TRYFREE(pfile_in_zip_read_info);

-

-    s->pfile_in_zip_read=NULL;

-

-    return err;

-}

-

-

-/*

-  Get the global comment string of the ZipFile, in the szComment buffer.

-  uSizeBuf is the size of the szComment buffer.

-  return the number of byte copied or an error code <0

-*/

-extern int ZEXPORT unzGetGlobalComment (file, szComment, uSizeBuf)

-    unzFile file;

-    char *szComment;

-    uLong uSizeBuf;

-{

-    int err=UNZ_OK;

-    unz_s* s;

-    uLong uReadThis ;

-    if (file==NULL)

-        return UNZ_PARAMERROR;

-    s=(unz_s*)file;

-

-    uReadThis = uSizeBuf;

-    if (uReadThis>s->gi.size_comment)

-        uReadThis = s->gi.size_comment;

-

-    if (ZSEEK(s->z_filefunc,s->filestream,s->central_pos+22,ZLIB_FILEFUNC_SEEK_SET)!=0)

-        return UNZ_ERRNO;

-

-    if (uReadThis>0)

-    {

-      *szComment='\0';

-      if (ZREAD(s->z_filefunc,s->filestream,szComment,uReadThis)!=uReadThis)

-        return UNZ_ERRNO;

-    }

-

-    if ((szComment != NULL) && (uSizeBuf > s->gi.size_comment))

-        *(szComment+s->gi.size_comment)='\0';

-    return (int)uReadThis;

-}

-

-/* Additions by RX '2004 */

-extern uLong ZEXPORT unzGetOffset (file)

-    unzFile file;

-{

-    unz_s* s;

-

-    if (file==NULL)

-          return UNZ_PARAMERROR;

-    s=(unz_s*)file;

-    if (!s->current_file_ok)

-      return 0;

-    if (s->gi.number_entry != 0 && s->gi.number_entry != 0xffff)

-      if (s->num_file==s->gi.number_entry)

-         return 0;

-    return s->pos_in_central_dir;

-}

-

-extern int ZEXPORT unzSetOffset (file, pos)

-        unzFile file;

-        uLong pos;

-{

-    unz_s* s;

-    int err;

-

-    if (file==NULL)

-        return UNZ_PARAMERROR;

-    s=(unz_s*)file;

-

-    s->pos_in_central_dir = pos;

-    s->num_file = s->gi.number_entry;      /* hack */

-    err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,

-                                              &s->cur_file_info_internal,

-                                              NULL,0,NULL,0,NULL,0);

-    s->current_file_ok = (err == UNZ_OK);

-    return err;

-}

diff --git a/src/unzip.h b/src/unzip.h
deleted file mode 100644
index 14d7a6f..0000000
--- a/src/unzip.h
+++ /dev/null
@@ -1,356 +0,0 @@
-/* unzip.h -- IO for uncompress .zip files using zlib

-   Version 1.01e, February 12th, 2005

-

-   Copyright (C) 1998-2005 Gilles Vollant

-

-   This unzip package allow extract file from .ZIP file, compatible with PKZip 2.04g

-     WinZip, InfoZip tools and compatible.

-

-   Multi volume ZipFile (span) are not supported.

-   Encryption compatible with pkzip 2.04g only supported

-   Old compressions used by old PKZip 1.x are not supported

-

-

-   I WAIT FEEDBACK at mail info@winimage.com

-   Visit also http://www.winimage.com/zLibDll/unzip.htm for evolution

-

-   Condition of use and distribution are the same than zlib :

-

-  This software is provided 'as-is', without any express or implied

-  warranty.  In no event will the authors be held liable for any damages

-  arising from the use of this software.

-

-  Permission is granted to anyone to use this software for any purpose,

-  including commercial applications, and to alter it and redistribute it

-  freely, subject to the following restrictions:

-

-  1. The origin of this software must not be misrepresented; you must not

-     claim that you wrote the original software. If you use this software

-     in a product, an acknowledgment in the product documentation would be

-     appreciated but is not required.

-  2. Altered source versions must be plainly marked as such, and must not be

-     misrepresented as being the original software.

-  3. This notice may not be removed or altered from any source distribution.

-

-

-*/

-

-/* for more info about .ZIP format, see

-      http://www.info-zip.org/pub/infozip/doc/appnote-981119-iz.zip

-      http://www.info-zip.org/pub/infozip/doc/

-   PkWare has also a specification at :

-      ftp://ftp.pkware.com/probdesc.zip

-*/

-

-#ifndef _unz_H

-#define _unz_H

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-

-#define NOUNCRYPT

-

-#ifndef _ZLIB_H

-#include "zlib.h"

-#endif

-

-#ifndef _ZLIBIOAPI_H

-#include "ioapi.h"

-#endif

-

-#if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)

-/* like the STRICT of WIN32, we define a pointer that cannot be converted

-    from (void*) without cast */

-typedef struct TagunzFile__ { int unused; } unzFile__;

-typedef unzFile__ *unzFile;

-#else

-typedef voidp unzFile;

-#endif

-

-

-#define UNZ_OK                          (0)

-#define UNZ_END_OF_LIST_OF_FILE         (-100)

-#define UNZ_ERRNO                       (Z_ERRNO)

-#define UNZ_EOF                         (0)

-#define UNZ_PARAMERROR                  (-102)

-#define UNZ_BADZIPFILE                  (-103)

-#define UNZ_INTERNALERROR               (-104)

-#define UNZ_CRCERROR                    (-105)

-

-/* tm_unz contain date/time info */

-typedef struct tm_unz_s

-{

-    uInt tm_sec;            /* seconds after the minute - [0,59] */

-    uInt tm_min;            /* minutes after the hour - [0,59] */

-    uInt tm_hour;           /* hours since midnight - [0,23] */

-    uInt tm_mday;           /* day of the month - [1,31] */

-    uInt tm_mon;            /* months since January - [0,11] */

-    uInt tm_year;           /* years - [1980..2044] */

-} tm_unz;

-

-/* unz_global_info structure contain global data about the ZIPfile

-   These data comes from the end of central dir */

-typedef struct unz_global_info_s

-{

-    uLong number_entry;         /* total number of entries in

-                       the central dir on this disk */

-    uLong size_comment;         /* size of the global comment of the zipfile */

-} unz_global_info;

-

-

-/* unz_file_info contain information about a file in the zipfile */

-typedef struct unz_file_info_s

-{

-    uLong version;              /* version made by                 2 bytes */

-    uLong version_needed;       /* version needed to extract       2 bytes */

-    uLong flag;                 /* general purpose bit flag        2 bytes */

-    uLong compression_method;   /* compression method              2 bytes */

-    uLong dosDate;              /* last mod file date in Dos fmt   4 bytes */

-    uLong crc;                  /* crc-32                          4 bytes */

-    uLong compressed_size;      /* compressed size                 4 bytes */

-    uLong uncompressed_size;    /* uncompressed size               4 bytes */

-    uLong size_filename;        /* filename length                 2 bytes */

-    uLong size_file_extra;      /* extra field length              2 bytes */

-    uLong size_file_comment;    /* file comment length             2 bytes */

-

-    uLong disk_num_start;       /* disk number start               2 bytes */

-    uLong internal_fa;          /* internal file attributes        2 bytes */

-    uLong external_fa;          /* external file attributes        4 bytes */

-

-    tm_unz tmu_date;

-} unz_file_info;

-

-extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1,

-                                                 const char* fileName2,

-                                                 int iCaseSensitivity));

-/*

-   Compare two filename (fileName1,fileName2).

-   If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)

-   If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi

-                                or strcasecmp)

-   If iCaseSenisivity = 0, case sensitivity is defaut of your operating system

-    (like 1 on Unix, 2 on Windows)

-*/

-

-

-extern unzFile ZEXPORT unzOpen OF((const char *path));

-/*

-  Open a Zip file. path contain the full pathname (by example,

-     on a Windows XP computer "c:\\zlib\\zlib113.zip" or on an Unix computer

-     "zlib/zlib113.zip".

-     If the zipfile cannot be opened (file don't exist or in not valid), the

-       return value is NULL.

-     Else, the return value is a unzFile Handle, usable with other function

-       of this unzip package.

-*/

-

-extern unzFile ZEXPORT unzOpen2 OF((const char *path,

-                                    zlib_filefunc_def* pzlib_filefunc_def));

-/*

-   Open a Zip file, like unzOpen, but provide a set of file low level API

-      for read/write the zip file (see ioapi.h)

-*/

-

-extern int ZEXPORT unzClose OF((unzFile file));

-/*

-  Close a ZipFile opened with unzipOpen.

-  If there is files inside the .Zip opened with unzOpenCurrentFile (see later),

-    these files MUST be closed with unzipCloseCurrentFile before call unzipClose.

-  return UNZ_OK if there is no problem. */

-

-extern int ZEXPORT unzGetGlobalInfo OF((unzFile file,

-                                        unz_global_info *pglobal_info));

-/*

-  Write info about the ZipFile in the *pglobal_info structure.

-  No preparation of the structure is needed

-  return UNZ_OK if there is no problem. */

-

-

-extern int ZEXPORT unzGetGlobalComment OF((unzFile file,

-                                           char *szComment,

-                                           uLong uSizeBuf));

-/*

-  Get the global comment string of the ZipFile, in the szComment buffer.

-  uSizeBuf is the size of the szComment buffer.

-  return the number of byte copied or an error code <0

-*/

-

-

-/***************************************************************************/

-/* Unzip package allow you browse the directory of the zipfile */

-

-extern int ZEXPORT unzGoToFirstFile OF((unzFile file));

-/*

-  Set the current file of the zipfile to the first file.

-  return UNZ_OK if there is no problem

-*/

-

-extern int ZEXPORT unzGoToNextFile OF((unzFile file));

-/*

-  Set the current file of the zipfile to the next file.

-  return UNZ_OK if there is no problem

-  return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.

-*/

-

-extern int ZEXPORT unzLocateFile OF((unzFile file,

-                     const char *szFileName,

-                     int iCaseSensitivity));

-/*

-  Try locate the file szFileName in the zipfile.

-  For the iCaseSensitivity signification, see unzStringFileNameCompare

-

-  return value :

-  UNZ_OK if the file is found. It becomes the current file.

-  UNZ_END_OF_LIST_OF_FILE if the file is not found

-*/

-

-

-/* ****************************************** */

-/* Ryan supplied functions */

-/* unz_file_info contain information about a file in the zipfile */

-typedef struct unz_file_pos_s

-{

-    uLong pos_in_zip_directory;   /* offset in zip file directory */

-    uLong num_of_file;            /* # of file */

-} unz_file_pos;

-

-extern int ZEXPORT unzGetFilePos(

-    unzFile file,

-    unz_file_pos* file_pos);

-

-extern int ZEXPORT unzGoToFilePos(

-    unzFile file,

-    unz_file_pos* file_pos);

-

-/* ****************************************** */

-

-extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file,

-                         unz_file_info *pfile_info,

-                         char *szFileName,

-                         uLong fileNameBufferSize,

-                         void *extraField,

-                         uLong extraFieldBufferSize,

-                         char *szComment,

-                         uLong commentBufferSize));

-/*

-  Get Info about the current file

-  if pfile_info!=NULL, the *pfile_info structure will contain somes info about

-        the current file

-  if szFileName!=NULL, the filemane string will be copied in szFileName

-            (fileNameBufferSize is the size of the buffer)

-  if extraField!=NULL, the extra field information will be copied in extraField

-            (extraFieldBufferSize is the size of the buffer).

-            This is the Central-header version of the extra field

-  if szComment!=NULL, the comment string of the file will be copied in szComment

-            (commentBufferSize is the size of the buffer)

-*/

-

-/***************************************************************************/

-/* for reading the content of the current zipfile, you can open it, read data

-   from it, and close it (you can close it before reading all the file)

-   */

-

-extern int ZEXPORT unzOpenCurrentFile OF((unzFile file));

-/*

-  Open for reading data the current file in the zipfile.

-  If there is no error, the return value is UNZ_OK.

-*/

-

-extern int ZEXPORT unzOpenCurrentFilePassword OF((unzFile file,

-                                                  const char* password));

-/*

-  Open for reading data the current file in the zipfile.

-  password is a crypting password

-  If there is no error, the return value is UNZ_OK.

-*/

-

-extern int ZEXPORT unzOpenCurrentFile2 OF((unzFile file,

-                                           int* method,

-                                           int* level,

-                                           int raw));

-/*

-  Same than unzOpenCurrentFile, but open for read raw the file (not uncompress)

-    if raw==1

-  *method will receive method of compression, *level will receive level of

-     compression

-  note : you can set level parameter as NULL (if you did not want known level,

-         but you CANNOT set method parameter as NULL

-*/

-

-extern int ZEXPORT unzOpenCurrentFile3 OF((unzFile file,

-                                           int* method,

-                                           int* level,

-                                           int raw,

-                                           const char* password));

-/*

-  Same than unzOpenCurrentFile, but open for read raw the file (not uncompress)

-    if raw==1

-  *method will receive method of compression, *level will receive level of

-     compression

-  note : you can set level parameter as NULL (if you did not want known level,

-         but you CANNOT set method parameter as NULL

-*/

-

-

-extern int ZEXPORT unzCloseCurrentFile OF((unzFile file));

-/*

-  Close the file in zip opened with unzOpenCurrentFile

-  Return UNZ_CRCERROR if all the file was read but the CRC is not good

-*/

-

-extern int ZEXPORT unzReadCurrentFile OF((unzFile file,

-                      voidp buf,

-                      unsigned len));

-/*

-  Read bytes from the current file (opened by unzOpenCurrentFile)

-  buf contain buffer where data must be copied

-  len the size of buf.

-

-  return the number of byte copied if somes bytes are copied

-  return 0 if the end of file was reached

-  return <0 with error code if there is an error

-    (UNZ_ERRNO for IO error, or zLib error for uncompress error)

-*/

-

-extern z_off_t ZEXPORT unztell OF((unzFile file));

-/*

-  Give the current position in uncompressed data

-*/

-

-extern int ZEXPORT unzeof OF((unzFile file));

-/*

-  return 1 if the end of file was reached, 0 elsewhere

-*/

-

-extern int ZEXPORT unzGetLocalExtrafield OF((unzFile file,

-                                             voidp buf,

-                                             unsigned len));

-/*

-  Read extra field from the current file (opened by unzOpenCurrentFile)

-  This is the local-header version of the extra field (sometimes, there is

-    more info in the local-header version than in the central-header)

-

-  if buf==NULL, it return the size of the local extra field

-

-  if buf!=NULL, len is the size of the buffer, the extra header is copied in

-    buf.

-  the return value is the number of bytes copied in buf, or (if <0)

-    the error code

-*/

-

-/***************************************************************************/

-

-/* Get the current file offset */

-extern uLong ZEXPORT unzGetOffset (unzFile file);

-

-/* Set the current file offset */

-extern int ZEXPORT unzSetOffset (unzFile file, uLong pos);

-

-

-

-#ifdef __cplusplus

-}

-#endif

-

-#endif /* _unz_H */

diff --git a/src/zip.c b/src/zip.c
deleted file mode 100644
index 762fcef..0000000
--- a/src/zip.c
+++ /dev/null
@@ -1,1218 +0,0 @@
-/* zip.c -- IO on .zip files using zlib

-   Version 1.01e, February 12th, 2005

-

-   27 Dec 2004 Rolf Kalbermatter

-   Modification to zipOpen2 to support globalComment retrieval.

-

-   Copyright (C) 1998-2005 Gilles Vollant

-

-   Read zip.h for more info

-*/

-

-

-#include <stdio.h>

-#include <stdlib.h>

-#include <string.h>

-#include <time.h>

-#include "zlib.h"

-#include "zip.h"

-

-#ifdef STDC

-#  include <stddef.h>

-#  include <string.h>

-#  include <stdlib.h>

-#endif

-#ifdef NO_ERRNO_H

-    extern int errno;

-#else

-#   include <errno.h>

-#endif

-

-

-#ifndef local

-#  define local static

-#endif

-/* compile with -Dlocal if your debugger can't find static symbols */

-

-#ifndef VERSIONMADEBY

-# define VERSIONMADEBY   (0x0) /* platform depedent */

-#endif

-

-#ifndef Z_BUFSIZE

-#define Z_BUFSIZE (16384)

-#endif

-

-#ifndef Z_MAXFILENAMEINZIP

-#define Z_MAXFILENAMEINZIP (256)

-#endif

-

-#ifndef ALLOC

-# define ALLOC(size) (malloc(size))

-#endif

-#ifndef TRYFREE

-# define TRYFREE(p) {if (p) free(p);}

-#endif

-

-/*

-#define SIZECENTRALDIRITEM (0x2e)

-#define SIZEZIPLOCALHEADER (0x1e)

-*/

-

-/* I've found an old Unix (a SunOS 4.1.3_U1) without all SEEK_* defined.... */

-

-#ifndef SEEK_CUR

-#define SEEK_CUR    1

-#endif

-

-#ifndef SEEK_END

-#define SEEK_END    2

-#endif

-

-#ifndef SEEK_SET

-#define SEEK_SET    0

-#endif

-

-#ifndef DEF_MEM_LEVEL

-#if MAX_MEM_LEVEL >= 8

-#  define DEF_MEM_LEVEL 8

-#else

-#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL

-#endif

-#endif

-const char zip_copyright[] =

-   " zip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";

-

-

-#define SIZEDATA_INDATABLOCK (4096-(4*4))

-

-#define LOCALHEADERMAGIC    (0x04034b50)

-#define CENTRALHEADERMAGIC  (0x02014b50)

-#define ENDHEADERMAGIC      (0x06054b50)

-

-#define FLAG_LOCALHEADER_OFFSET (0x06)

-#define CRC_LOCALHEADER_OFFSET  (0x0e)

-

-#define SIZECENTRALHEADER (0x2e) /* 46 */

-

-typedef struct linkedlist_datablock_internal_s

-{

-  struct linkedlist_datablock_internal_s* next_datablock;

-  uLong  avail_in_this_block;

-  uLong  filled_in_this_block;

-  uLong  unused; /* for future use and alignement */

-  unsigned char data[SIZEDATA_INDATABLOCK];

-} linkedlist_datablock_internal;

-

-typedef struct linkedlist_data_s

-{

-    linkedlist_datablock_internal* first_block;

-    linkedlist_datablock_internal* last_block;

-} linkedlist_data;

-

-

-typedef struct

-{

-    z_stream stream;            /* zLib stream structure for inflate */

-    int  stream_initialised;    /* 1 is stream is initialised */

-    uInt pos_in_buffered_data;  /* last written byte in buffered_data */

-

-    uLong pos_local_header;     /* offset of the local header of the file

-                                     currenty writing */

-    char* central_header;       /* central header data for the current file */

-    uLong size_centralheader;   /* size of the central header for cur file */

-    uLong flag;                 /* flag of the file currently writing */

-

-    int  method;                /* compression method of file currenty wr.*/

-    int  raw;                   /* 1 for directly writing raw data */

-    Byte buffered_data[Z_BUFSIZE];/* buffer contain compressed data to be writ*/

-    uLong dosDate;

-    uLong crc32;

-    int  encrypt;

-#ifndef NOCRYPT

-    unsigned long keys[3];     /* keys defining the pseudo-random sequence */

-    const unsigned long* pcrc_32_tab;

-    int crypt_header_size;

-#endif

-} curfile_info;

-

-typedef struct

-{

-    zlib_filefunc_def z_filefunc;

-    voidpf filestream;        /* io structore of the zipfile */

-    linkedlist_data central_dir;/* datablock with central dir in construction*/

-    int  in_opened_file_inzip;  /* 1 if a file in the zip is currently writ.*/

-    curfile_info ci;            /* info on the file curretly writing */

-

-    uLong begin_pos;            /* position of the beginning of the zipfile */

-    uLong add_position_when_writting_offset;

-    uLong number_entry;

-#ifndef NO_ADDFILEINEXISTINGZIP

-    char *globalcomment;

-#endif

-} zip_internal;

-

-

-

-#ifndef NOCRYPT

-#define INCLUDECRYPTINGCODE_IFCRYPTALLOWED

-#include "crypt.h"

-#endif

-

-local linkedlist_datablock_internal* allocate_new_datablock()

-{

-    linkedlist_datablock_internal* ldi;

-    ldi = (linkedlist_datablock_internal*)

-                 ALLOC(sizeof(linkedlist_datablock_internal));

-    if (ldi!=NULL)

-    {

-        ldi->next_datablock = NULL ;

-        ldi->filled_in_this_block = 0 ;

-        ldi->avail_in_this_block = SIZEDATA_INDATABLOCK ;

-    }

-    return ldi;

-}

-

-local void free_datablock(ldi)

-    linkedlist_datablock_internal* ldi;

-{

-    while (ldi!=NULL)

-    {

-        linkedlist_datablock_internal* ldinext = ldi->next_datablock;

-        TRYFREE(ldi);

-        ldi = ldinext;

-    }

-}

-

-local void init_linkedlist(ll)

-    linkedlist_data* ll;

-{

-    ll->first_block = ll->last_block = NULL;

-}

-

-local void free_linkedlist(ll)

-    linkedlist_data* ll;

-{

-    free_datablock(ll->first_block);

-    ll->first_block = ll->last_block = NULL;

-}

-

-

-local int add_data_in_datablock(ll,buf,len)

-    linkedlist_data* ll;

-    const void* buf;

-    uLong len;

-{

-    linkedlist_datablock_internal* ldi;

-    const unsigned char* from_copy;

-

-    if (ll==NULL)

-        return ZIP_INTERNALERROR;

-

-    if (ll->last_block == NULL)

-    {

-        ll->first_block = ll->last_block = allocate_new_datablock();

-        if (ll->first_block == NULL)

-            return ZIP_INTERNALERROR;

-    }

-

-    ldi = ll->last_block;

-    from_copy = (unsigned char*)buf;

-

-    while (len>0)

-    {

-        uInt copy_this;

-        uInt i;

-        unsigned char* to_copy;

-

-        if (ldi->avail_in_this_block==0)

-        {

-            ldi->next_datablock = allocate_new_datablock();

-            if (ldi->next_datablock == NULL)

-                return ZIP_INTERNALERROR;

-            ldi = ldi->next_datablock ;

-            ll->last_block = ldi;

-        }

-

-        if (ldi->avail_in_this_block < len)

-            copy_this = (uInt)ldi->avail_in_this_block;

-        else

-            copy_this = (uInt)len;

-

-        to_copy = &(ldi->data[ldi->filled_in_this_block]);

-

-        for (i=0;i<copy_this;i++)

-            *(to_copy+i)=*(from_copy+i);

-

-        ldi->filled_in_this_block += copy_this;

-        ldi->avail_in_this_block -= copy_this;

-        from_copy += copy_this ;

-        len -= copy_this;

-    }

-    return ZIP_OK;

-}

-

-

-

-/****************************************************************************/

-

-#ifndef NO_ADDFILEINEXISTINGZIP

-/* ===========================================================================

-   Inputs a long in LSB order to the given file

-   nbByte == 1, 2 or 4 (byte, short or long)

-*/

-

-local int ziplocal_putValue OF((const zlib_filefunc_def* pzlib_filefunc_def,

-                                voidpf filestream, uLong x, int nbByte));

-local int ziplocal_putValue (pzlib_filefunc_def, filestream, x, nbByte)

-    const zlib_filefunc_def* pzlib_filefunc_def;

-    voidpf filestream;

-    uLong x;

-    int nbByte;

-{

-    unsigned char buf[4];

-    int n;

-    for (n = 0; n < nbByte; n++)

-    {

-        buf[n] = (unsigned char)(x & 0xff);

-        x >>= 8;

-    }

-    if (x != 0)

-      {     /* data overflow - hack for ZIP64 (X Roche) */

-      for (n = 0; n < nbByte; n++)

-        {

-          buf[n] = 0xff;

-        }

-      }

-

-    if (ZWRITE(*pzlib_filefunc_def,filestream,buf,nbByte)!=(uLong)nbByte)

-        return ZIP_ERRNO;

-    else

-        return ZIP_OK;

-}

-

-local void ziplocal_putValue_inmemory OF((void* dest, uLong x, int nbByte));

-local void ziplocal_putValue_inmemory (dest, x, nbByte)

-    void* dest;

-    uLong x;

-    int nbByte;

-{

-    unsigned char* buf=(unsigned char*)dest;

-    int n;

-    for (n = 0; n < nbByte; n++) {

-        buf[n] = (unsigned char)(x & 0xff);

-        x >>= 8;

-    }

-

-    if (x != 0)

-    {     /* data overflow - hack for ZIP64 */

-       for (n = 0; n < nbByte; n++)

-       {

-          buf[n] = 0xff;

-       }

-    }

-}

-

-/****************************************************************************/

-

-

-local uLong ziplocal_TmzDateToDosDate(ptm,dosDate)

-    const tm_zip* ptm;

-    uLong dosDate;

-{

-    uLong year = (uLong)ptm->tm_year;

-    if (year>1980)

-        year-=1980;

-    else if (year>80)

-        year-=80;

-    return

-      (uLong) (((ptm->tm_mday) + (32 * (ptm->tm_mon+1)) + (512 * year)) << 16) |

-        ((ptm->tm_sec/2) + (32* ptm->tm_min) + (2048 * (uLong)ptm->tm_hour));

-}

-

-

-/****************************************************************************/

-

-local int ziplocal_getByte OF((

-    const zlib_filefunc_def* pzlib_filefunc_def,

-    voidpf filestream,

-    int *pi));

-

-local int ziplocal_getByte(pzlib_filefunc_def,filestream,pi)

-    const zlib_filefunc_def* pzlib_filefunc_def;

-    voidpf filestream;

-    int *pi;

-{

-    unsigned char c;

-    int err = (int)ZREAD(*pzlib_filefunc_def,filestream,&c,1);

-    if (err==1)

-    {

-        *pi = (int)c;

-        return ZIP_OK;

-    }

-    else

-    {

-        if (ZERROR(*pzlib_filefunc_def,filestream))

-            return ZIP_ERRNO;

-        else

-            return ZIP_EOF;

-    }

-}

-

-

-/* ===========================================================================

-   Reads a long in LSB order from the given gz_stream. Sets

-*/

-local int ziplocal_getShort OF((

-    const zlib_filefunc_def* pzlib_filefunc_def,

-    voidpf filestream,

-    uLong *pX));

-

-local int ziplocal_getShort (pzlib_filefunc_def,filestream,pX)

-    const zlib_filefunc_def* pzlib_filefunc_def;

-    voidpf filestream;

-    uLong *pX;

-{

-    uLong x ;

-    int i;

-    int err;

-

-    err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i);

-    x = (uLong)i;

-

-    if (err==ZIP_OK)

-        err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i);

-    x += ((uLong)i)<<8;

-

-    if (err==ZIP_OK)

-        *pX = x;

-    else

-        *pX = 0;

-    return err;

-}

-

-local int ziplocal_getLong OF((

-    const zlib_filefunc_def* pzlib_filefunc_def,

-    voidpf filestream,

-    uLong *pX));

-

-local int ziplocal_getLong (pzlib_filefunc_def,filestream,pX)

-    const zlib_filefunc_def* pzlib_filefunc_def;

-    voidpf filestream;

-    uLong *pX;

-{

-    uLong x ;

-    int i;

-    int err;

-

-    err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i);

-    x = (uLong)i;

-

-    if (err==ZIP_OK)

-        err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i);

-    x += ((uLong)i)<<8;

-

-    if (err==ZIP_OK)

-        err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i);

-    x += ((uLong)i)<<16;

-

-    if (err==ZIP_OK)

-        err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i);

-    x += ((uLong)i)<<24;

-

-    if (err==ZIP_OK)

-        *pX = x;

-    else

-        *pX = 0;

-    return err;

-}

-

-#ifndef BUFREADCOMMENT

-#define BUFREADCOMMENT (0x400)

-#endif

-/*

-  Locate the Central directory of a zipfile (at the end, just before

-    the global comment)

-*/

-local uLong ziplocal_SearchCentralDir OF((

-    const zlib_filefunc_def* pzlib_filefunc_def,

-    voidpf filestream));

-

-local uLong ziplocal_SearchCentralDir(pzlib_filefunc_def,filestream)

-    const zlib_filefunc_def* pzlib_filefunc_def;

-    voidpf filestream;

-{

-    unsigned char* buf;

-    uLong uSizeFile;

-    uLong uBackRead;

-    uLong uMaxBack=0xffff; /* maximum size of global comment */

-    uLong uPosFound=0;

-

-    if (ZSEEK(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)

-        return 0;

-

-

-    uSizeFile = ZTELL(*pzlib_filefunc_def,filestream);

-

-    if (uMaxBack>uSizeFile)

-        uMaxBack = uSizeFile;

-

-    buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);

-    if (buf==NULL)

-        return 0;

-

-    uBackRead = 4;

-    while (uBackRead<uMaxBack)

-    {

-        uLong uReadSize,uReadPos ;

-        int i;

-        if (uBackRead+BUFREADCOMMENT>uMaxBack)

-            uBackRead = uMaxBack;

-        else

-            uBackRead+=BUFREADCOMMENT;

-        uReadPos = uSizeFile-uBackRead ;

-

-        uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?

-                     (BUFREADCOMMENT+4) : (uSizeFile-uReadPos);

-        if (ZSEEK(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)

-            break;

-

-        if (ZREAD(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)

-            break;

-

-        for (i=(int)uReadSize-3; (i--)>0;)

-            if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&

-                ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))

-            {

-                uPosFound = uReadPos+i;

-                break;

-            }

-

-        if (uPosFound!=0)

-            break;

-    }

-    TRYFREE(buf);

-    return uPosFound;

-}

-#endif /* !NO_ADDFILEINEXISTINGZIP*/

-

-/************************************************************/

-extern zipFile ZEXPORT zipOpen2 (pathname, append, globalcomment, pzlib_filefunc_def)

-    const char *pathname;

-    int append;

-    zipcharpc* globalcomment;

-    zlib_filefunc_def* pzlib_filefunc_def;

-{

-    zip_internal ziinit;

-    zip_internal* zi;

-    int err=ZIP_OK;

-

-

-    if (pzlib_filefunc_def==NULL)

-        fill_fopen_filefunc(&ziinit.z_filefunc);

-    else

-        ziinit.z_filefunc = *pzlib_filefunc_def;

-

-    ziinit.filestream = (*(ziinit.z_filefunc.zopen_file))

-                 (ziinit.z_filefunc.opaque,

-                  pathname,

-                  (append == APPEND_STATUS_CREATE) ?

-                  (ZLIB_FILEFUNC_MODE_READ | ZLIB_FILEFUNC_MODE_WRITE | ZLIB_FILEFUNC_MODE_CREATE) :

-                    (ZLIB_FILEFUNC_MODE_READ | ZLIB_FILEFUNC_MODE_WRITE | ZLIB_FILEFUNC_MODE_EXISTING));

-

-    if (ziinit.filestream == NULL)

-        return NULL;

-    ziinit.begin_pos = ZTELL(ziinit.z_filefunc,ziinit.filestream);

-    ziinit.in_opened_file_inzip = 0;

-    ziinit.ci.stream_initialised = 0;

-    ziinit.number_entry = 0;

-    ziinit.add_position_when_writting_offset = 0;

-    init_linkedlist(&(ziinit.central_dir));

-

-

-    zi = (zip_internal*)ALLOC(sizeof(zip_internal));

-    if (zi==NULL)

-    {

-        ZCLOSE(ziinit.z_filefunc,ziinit.filestream);

-        return NULL;

-    }

-

-    /* now we add file in a zipfile */

-#    ifndef NO_ADDFILEINEXISTINGZIP

-    ziinit.globalcomment = NULL;

-    if (append == APPEND_STATUS_ADDINZIP)

-    {

-        uLong byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/

-

-        uLong size_central_dir;     /* size of the central directory  */

-        uLong offset_central_dir;   /* offset of start of central directory */

-        uLong central_pos,uL;

-

-        uLong number_disk;          /* number of the current dist, used for

-                                    spaning ZIP, unsupported, always 0*/

-        uLong number_disk_with_CD;  /* number the the disk with central dir, used

-                                    for spaning ZIP, unsupported, always 0*/

-        uLong number_entry;

-        uLong number_entry_CD;      /* total number of entries in

-                                    the central dir

-                                    (same than number_entry on nospan) */

-        uLong size_comment;

-

-        central_pos = ziplocal_SearchCentralDir(&ziinit.z_filefunc,ziinit.filestream);

-        if (central_pos==0)

-            err=ZIP_ERRNO;

-

-        if (ZSEEK(ziinit.z_filefunc, ziinit.filestream,

-                                        central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)

-            err=ZIP_ERRNO;

-

-        /* the signature, already checked */

-        if (ziplocal_getLong(&ziinit.z_filefunc, ziinit.filestream,&uL)!=ZIP_OK)

-            err=ZIP_ERRNO;

-

-        /* number of this disk */

-        if (ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&number_disk)!=ZIP_OK)

-            err=ZIP_ERRNO;

-

-        /* number of the disk with the start of the central directory */

-        if (ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&number_disk_with_CD)!=ZIP_OK)

-            err=ZIP_ERRNO;

-

-        /* total number of entries in the central dir on this disk */

-        if (ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&number_entry)!=ZIP_OK)

-            err=ZIP_ERRNO;

-

-        /* total number of entries in the central dir */

-        if (ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&number_entry_CD)!=ZIP_OK)

-            err=ZIP_ERRNO;

-

-        if ((number_entry_CD!=number_entry) ||

-            (number_disk_with_CD!=0) ||

-            (number_disk!=0))

-            err=ZIP_BADZIPFILE;

-

-        /* size of the central directory */

-        if (ziplocal_getLong(&ziinit.z_filefunc, ziinit.filestream,&size_central_dir)!=ZIP_OK)

-            err=ZIP_ERRNO;

-

-        /* offset of start of central directory with respect to the

-            starting disk number */

-        if (ziplocal_getLong(&ziinit.z_filefunc, ziinit.filestream,&offset_central_dir)!=ZIP_OK)

-            err=ZIP_ERRNO;

-

-        /* zipfile global comment length */

-        if (ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&size_comment)!=ZIP_OK)

-            err=ZIP_ERRNO;

-

-        if ((central_pos<offset_central_dir+size_central_dir) &&

-            (err==ZIP_OK))

-            err=ZIP_BADZIPFILE;

-

-        if (err!=ZIP_OK)

-        {

-            ZCLOSE(ziinit.z_filefunc, ziinit.filestream);

-            return NULL;

-        }

-

-        if (size_comment>0)

-        {

-            ziinit.globalcomment = ALLOC(size_comment+1);

-            if (ziinit.globalcomment)

-            {

-               size_comment = ZREAD(ziinit.z_filefunc, ziinit.filestream,ziinit.globalcomment,size_comment);

-               ziinit.globalcomment[size_comment]=0;

-            }

-        }

-

-        byte_before_the_zipfile = central_pos -

-                                (offset_central_dir+size_central_dir);

-        ziinit.add_position_when_writting_offset = byte_before_the_zipfile ;

-

-        {

-            uLong size_central_dir_to_read = size_central_dir;

-            size_t buf_size = SIZEDATA_INDATABLOCK;

-            void* buf_read = (void*)ALLOC(buf_size);

-            if (ZSEEK(ziinit.z_filefunc, ziinit.filestream,

-                  offset_central_dir + byte_before_the_zipfile,

-                  ZLIB_FILEFUNC_SEEK_SET) != 0)

-                  err=ZIP_ERRNO;

-

-            while ((size_central_dir_to_read>0) && (err==ZIP_OK))

-            {

-                uLong read_this = SIZEDATA_INDATABLOCK;

-                if (read_this > size_central_dir_to_read)

-                    read_this = size_central_dir_to_read;

-                if (ZREAD(ziinit.z_filefunc, ziinit.filestream,buf_read,read_this) != read_this)

-                    err=ZIP_ERRNO;

-

-                if (err==ZIP_OK)

-                    err = add_data_in_datablock(&ziinit.central_dir,buf_read,

-                                                (uLong)read_this);

-                size_central_dir_to_read-=read_this;

-            }

-            TRYFREE(buf_read);

-        }

-        ziinit.begin_pos = byte_before_the_zipfile;

-        ziinit.number_entry = number_entry_CD;

-

-        if (ZSEEK(ziinit.z_filefunc, ziinit.filestream,

-                  offset_central_dir+byte_before_the_zipfile,ZLIB_FILEFUNC_SEEK_SET)!=0)

-            err=ZIP_ERRNO;

-    }

-

-    if (globalcomment)

-    {

-      *globalcomment = ziinit.globalcomment;

-    }

-#    endif /* !NO_ADDFILEINEXISTINGZIP*/

-

-    if (err != ZIP_OK)

-    {

-#    ifndef NO_ADDFILEINEXISTINGZIP

-        TRYFREE(ziinit.globalcomment);

-#    endif /* !NO_ADDFILEINEXISTINGZIP*/

-        TRYFREE(zi);

-        return NULL;

-    }

-    else

-    {

-        *zi = ziinit;

-        return (zipFile)zi;

-    }

-}

-

-extern zipFile ZEXPORT zipOpen (pathname, append)

-    const char *pathname;

-    int append;

-{

-    return zipOpen2(pathname,append,NULL,NULL);

-}

-

-extern int ZEXPORT zipOpenNewFileInZip3 (file, filename, zipfi,

-                                         extrafield_local, size_extrafield_local,

-                                         extrafield_global, size_extrafield_global,

-                                         comment, method, level, raw,

-                                         windowBits, memLevel, strategy,

-                                         password, crcForCrypting)

-    zipFile file;

-    const char* filename;

-    const zip_fileinfo* zipfi;

-    const void* extrafield_local;

-    uInt size_extrafield_local;

-    const void* extrafield_global;

-    uInt size_extrafield_global;

-    const char* comment;

-    int method;

-    int level;

-    int raw;

-    int windowBits;

-    int memLevel;

-    int strategy;

-    const char* password;

-    uLong crcForCrypting;

-{

-    zip_internal* zi;

-    uInt size_filename;

-    uInt size_comment;

-    uInt i;

-    int err = ZIP_OK;

-

-#    ifdef NOCRYPT

-    if (password != NULL)

-        return ZIP_PARAMERROR;

-#    endif

-

-    if (file == NULL)

-        return ZIP_PARAMERROR;

-    if ((method!=0) && (method!=Z_DEFLATED))

-        return ZIP_PARAMERROR;

-

-    zi = (zip_internal*)file;

-

-    if (zi->in_opened_file_inzip == 1)

-    {

-        err = zipCloseFileInZip (file);

-        if (err != ZIP_OK)

-            return err;

-    }

-

-

-    if (filename==NULL)

-        filename="-";

-

-    if (comment==NULL)

-        size_comment = 0;

-    else

-        size_comment = (uInt)strlen(comment);

-

-    size_filename = (uInt)strlen(filename);

-

-    if (zipfi == NULL)

-        zi->ci.dosDate = 0;

-    else

-    {

-        if (zipfi->dosDate != 0)

-            zi->ci.dosDate = zipfi->dosDate;

-        else zi->ci.dosDate = ziplocal_TmzDateToDosDate(&zipfi->tmz_date,zipfi->dosDate);

-    }

-

-    zi->ci.flag = 0;

-    if ((level==8) || (level==9))

-      zi->ci.flag |= 2;

-    if ((level==2))

-      zi->ci.flag |= 4;

-    if ((level==1))

-      zi->ci.flag |= 6;

-    if (password != NULL)

-      zi->ci.flag |= 1;

-

-    zi->ci.crc32 = 0;

-    zi->ci.method = method;

-    zi->ci.encrypt = 0;

-    zi->ci.stream_initialised = 0;

-    zi->ci.pos_in_buffered_data = 0;

-    zi->ci.raw = raw;

-    zi->ci.pos_local_header = ZTELL(zi->z_filefunc,zi->filestream) ;

-    zi->ci.size_centralheader = SIZECENTRALHEADER + size_filename +

-                                      size_extrafield_global + size_comment;

-    zi->ci.central_header = (char*)ALLOC((uInt)zi->ci.size_centralheader);

-

-    ziplocal_putValue_inmemory(zi->ci.central_header,(uLong)CENTRALHEADERMAGIC,4);

-    /* version info */

-    ziplocal_putValue_inmemory(zi->ci.central_header+4,(uLong)VERSIONMADEBY,2);

-    ziplocal_putValue_inmemory(zi->ci.central_header+6,(uLong)20,2);

-    ziplocal_putValue_inmemory(zi->ci.central_header+8,(uLong)zi->ci.flag,2);

-    ziplocal_putValue_inmemory(zi->ci.central_header+10,(uLong)zi->ci.method,2);

-    ziplocal_putValue_inmemory(zi->ci.central_header+12,(uLong)zi->ci.dosDate,4);

-    ziplocal_putValue_inmemory(zi->ci.central_header+16,(uLong)0,4); /*crc*/

-    ziplocal_putValue_inmemory(zi->ci.central_header+20,(uLong)0,4); /*compr size*/

-    ziplocal_putValue_inmemory(zi->ci.central_header+24,(uLong)0,4); /*uncompr size*/

-    ziplocal_putValue_inmemory(zi->ci.central_header+28,(uLong)size_filename,2);

-    ziplocal_putValue_inmemory(zi->ci.central_header+30,(uLong)size_extrafield_global,2);

-    ziplocal_putValue_inmemory(zi->ci.central_header+32,(uLong)size_comment,2);

-    ziplocal_putValue_inmemory(zi->ci.central_header+34,(uLong)0,2); /*disk nm start*/

-

-    if (zipfi==NULL)

-        ziplocal_putValue_inmemory(zi->ci.central_header+36,(uLong)0,2);

-    else

-        ziplocal_putValue_inmemory(zi->ci.central_header+36,(uLong)zipfi->internal_fa,2);

-

-    if (zipfi==NULL)

-        ziplocal_putValue_inmemory(zi->ci.central_header+38,(uLong)0,4);

-    else

-        ziplocal_putValue_inmemory(zi->ci.central_header+38,(uLong)zipfi->external_fa,4);

-

-    ziplocal_putValue_inmemory(zi->ci.central_header+42,(uLong)zi->ci.pos_local_header- zi->add_position_when_writting_offset,4);

-

-    for (i=0;i<size_filename;i++)

-        *(zi->ci.central_header+SIZECENTRALHEADER+i) = *(filename+i);

-

-    for (i=0;i<size_extrafield_global;i++)

-        *(zi->ci.central_header+SIZECENTRALHEADER+size_filename+i) =

-              *(((const char*)extrafield_global)+i);

-

-    for (i=0;i<size_comment;i++)

-        *(zi->ci.central_header+SIZECENTRALHEADER+size_filename+

-              size_extrafield_global+i) = *(comment+i);

-    if (zi->ci.central_header == NULL)

-        return ZIP_INTERNALERROR;

-

-

-    /* write the local header */

-    err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)LOCALHEADERMAGIC,4);

-

-    if (err==ZIP_OK)

-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)20,2);/* version needed to extract */

-    if (err==ZIP_OK)

-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.flag,2);

-

-    if (err==ZIP_OK)

-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.method,2);

-

-    if (err==ZIP_OK)

-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.dosDate,4);

-

-    if (err==ZIP_OK)

-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* crc 32, unknown */

-    if (err==ZIP_OK)

-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* compressed size, unknown */

-    if (err==ZIP_OK)

-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* uncompressed size, unknown */

-

-    if (err==ZIP_OK)

-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_filename,2);

-

-    if (err==ZIP_OK)

-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_extrafield_local,2);

-

-    if ((err==ZIP_OK) && (size_filename>0))

-        if (ZWRITE(zi->z_filefunc,zi->filestream,filename,size_filename)!=size_filename)

-                err = ZIP_ERRNO;

-

-    if ((err==ZIP_OK) && (size_extrafield_local>0))

-        if (ZWRITE(zi->z_filefunc,zi->filestream,extrafield_local,size_extrafield_local)

-                                                                           !=size_extrafield_local)

-                err = ZIP_ERRNO;

-

-    zi->ci.stream.avail_in = (uInt)0;

-    zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;

-    zi->ci.stream.next_out = zi->ci.buffered_data;

-    zi->ci.stream.total_in = 0;

-    zi->ci.stream.total_out = 0;

-

-    if ((err==ZIP_OK) && (zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))

-    {

-        zi->ci.stream.zalloc = (alloc_func)0;

-        zi->ci.stream.zfree = (free_func)0;

-        zi->ci.stream.opaque = (voidpf)0;

-

-        if (windowBits>0)

-            windowBits = -windowBits;

-

-        err = deflateInit2(&zi->ci.stream, level,

-               Z_DEFLATED, windowBits, memLevel, strategy);

-

-        if (err==Z_OK)

-            zi->ci.stream_initialised = 1;

-    }

-#    ifndef NOCRYPT

-    zi->ci.crypt_header_size = 0;

-    if ((err==Z_OK) && (password != NULL))

-    {

-        unsigned char bufHead[RAND_HEAD_LEN];

-        unsigned int sizeHead;

-        zi->ci.encrypt = 1;

-        zi->ci.pcrc_32_tab = get_crc_table();

-        /*init_keys(password,zi->ci.keys,zi->ci.pcrc_32_tab);*/

-

-        sizeHead=crypthead(password,bufHead,RAND_HEAD_LEN,zi->ci.keys,zi->ci.pcrc_32_tab,crcForCrypting);

-        zi->ci.crypt_header_size = sizeHead;

-

-        if (ZWRITE(zi->z_filefunc,zi->filestream,bufHead,sizeHead) != sizeHead)

-                err = ZIP_ERRNO;

-    }

-#    endif

-

-    if (err==Z_OK)

-        zi->in_opened_file_inzip = 1;

-    return err;

-}

-

-extern int ZEXPORT zipOpenNewFileInZip2(file, filename, zipfi,

-                                        extrafield_local, size_extrafield_local,

-                                        extrafield_global, size_extrafield_global,

-                                        comment, method, level, raw)

-    zipFile file;

-    const char* filename;

-    const zip_fileinfo* zipfi;

-    const void* extrafield_local;

-    uInt size_extrafield_local;

-    const void* extrafield_global;

-    uInt size_extrafield_global;

-    const char* comment;

-    int method;

-    int level;

-    int raw;

-{

-    return zipOpenNewFileInZip3 (file, filename, zipfi,

-                                 extrafield_local, size_extrafield_local,

-                                 extrafield_global, size_extrafield_global,

-                                 comment, method, level, raw,

-                                 -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,

-                                 NULL, 0);

-}

-

-extern int ZEXPORT zipOpenNewFileInZip (file, filename, zipfi,

-                                        extrafield_local, size_extrafield_local,

-                                        extrafield_global, size_extrafield_global,

-                                        comment, method, level)

-    zipFile file;

-    const char* filename;

-    const zip_fileinfo* zipfi;

-    const void* extrafield_local;

-    uInt size_extrafield_local;

-    const void* extrafield_global;

-    uInt size_extrafield_global;

-    const char* comment;

-    int method;

-    int level;

-{

-    return zipOpenNewFileInZip2 (file, filename, zipfi,

-                                 extrafield_local, size_extrafield_local,

-                                 extrafield_global, size_extrafield_global,

-                                 comment, method, level, 0);

-}

-

-local int zipFlushWriteBuffer(zi)

-  zip_internal* zi;

-{

-    int err=ZIP_OK;

-

-    if (zi->ci.encrypt != 0)

-    {

-#ifndef NOCRYPT

-        uInt i;

-        int t;

-        for (i=0;i<zi->ci.pos_in_buffered_data;i++)

-            zi->ci.buffered_data[i] = zencode(zi->ci.keys, zi->ci.pcrc_32_tab,

-                                       zi->ci.buffered_data[i],t);

-#endif

-    }

-    if (ZWRITE(zi->z_filefunc,zi->filestream,zi->ci.buffered_data,zi->ci.pos_in_buffered_data)

-                                                                    !=zi->ci.pos_in_buffered_data)

-      err = ZIP_ERRNO;

-    zi->ci.pos_in_buffered_data = 0;

-    return err;

-}

-

-extern int ZEXPORT zipWriteInFileInZip (file, buf, len)

-    zipFile file;

-    const void* buf;

-    unsigned len;

-{

-    zip_internal* zi;

-    int err=ZIP_OK;

-    

-    if (file == NULL)

-        return ZIP_PARAMERROR;

-    zi = (zip_internal*)file;

-

-    if (zi->in_opened_file_inzip == 0)

-        return ZIP_PARAMERROR;

-

-    zi->ci.stream.next_in = (void*)buf;

-    zi->ci.stream.avail_in = len;

-    zi->ci.crc32 = crc32(zi->ci.crc32,buf,len);

-

-    while ((err==ZIP_OK) && (zi->ci.stream.avail_in>0))

-    {

-        if (zi->ci.stream.avail_out == 0)

-        {

-            if (zipFlushWriteBuffer(zi) == ZIP_ERRNO)

-                err = ZIP_ERRNO;

-            zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;

-            zi->ci.stream.next_out = zi->ci.buffered_data;

-        }

-

-

-        if(err != ZIP_OK)

-            break;

-

-        if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))

-        {

-            uLong uTotalOutBefore = zi->ci.stream.total_out;

-            err=deflate(&zi->ci.stream,  Z_NO_FLUSH);

-            zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ;

-

-        }

-        else

-        {

-            uInt copy_this,i;

-            if (zi->ci.stream.avail_in < zi->ci.stream.avail_out)

-                copy_this = zi->ci.stream.avail_in;

-            else

-                copy_this = zi->ci.stream.avail_out;

-            for (i=0;i<copy_this;i++)

-                *(((char*)zi->ci.stream.next_out)+i) =

-                    *(((const char*)zi->ci.stream.next_in)+i);

-            {

-                zi->ci.stream.avail_in -= copy_this;

-                zi->ci.stream.avail_out-= copy_this;

-                zi->ci.stream.next_in+= copy_this;

-                zi->ci.stream.next_out+= copy_this;

-                zi->ci.stream.total_in+= copy_this;

-                zi->ci.stream.total_out+= copy_this;

-                zi->ci.pos_in_buffered_data += copy_this;

-            }

-        }

-    }

-    return err;

-}

-

-extern int ZEXPORT zipCloseFileInZipRaw (file, uncompressed_size, crc32)

-    zipFile file;

-    uLong uncompressed_size;

-    uLong crc32;

-{

-    zip_internal* zi;

-    uLong compressed_size;

-    int err=ZIP_OK;

-    if (file == NULL)

-        return ZIP_PARAMERROR;

-    zi = (zip_internal*)file;

-

-    if (zi->in_opened_file_inzip == 0)

-        return ZIP_PARAMERROR;

-    zi->ci.stream.avail_in = 0;

-

-    if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))

-        while (err==ZIP_OK)

-    {

-        uLong uTotalOutBefore;

-        if (zi->ci.stream.avail_out == 0)

-        {

-            if (zipFlushWriteBuffer(zi) == ZIP_ERRNO)

-                err = ZIP_ERRNO;

-            zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;

-            zi->ci.stream.next_out = zi->ci.buffered_data;

-        }

-        uTotalOutBefore = zi->ci.stream.total_out;

-        err=deflate(&zi->ci.stream,  Z_FINISH);

-        zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ;

-    }

-

-    if (err==Z_STREAM_END)

-        err=ZIP_OK; /* this is normal */

-

-    if ((zi->ci.pos_in_buffered_data>0) && (err==ZIP_OK))

-        if (zipFlushWriteBuffer(zi)==ZIP_ERRNO)

-            err = ZIP_ERRNO;

-

-    if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))

-    {

-        err=deflateEnd(&zi->ci.stream);

-        zi->ci.stream_initialised = 0;

-    }

-

-    if (!zi->ci.raw)

-    {

-        crc32 = (uLong)zi->ci.crc32;

-        uncompressed_size = (uLong)zi->ci.stream.total_in;

-    }

-    compressed_size = (uLong)zi->ci.stream.total_out;

-#    ifndef NOCRYPT

-    compressed_size += zi->ci.crypt_header_size;

-#    endif

-

-    ziplocal_putValue_inmemory(zi->ci.central_header+16,crc32,4); /*crc*/

-    ziplocal_putValue_inmemory(zi->ci.central_header+20,

-                                compressed_size,4); /*compr size*/

-    if (zi->ci.stream.data_type == Z_ASCII)

-        ziplocal_putValue_inmemory(zi->ci.central_header+36,(uLong)Z_ASCII,2);

-    ziplocal_putValue_inmemory(zi->ci.central_header+24,

-                                uncompressed_size,4); /*uncompr size*/

-

-    if (err==ZIP_OK)

-        err = add_data_in_datablock(&zi->central_dir,zi->ci.central_header,

-                                      (uLong)zi->ci.size_centralheader);

-    free(zi->ci.central_header);

-    

-    if (err==ZIP_OK)

-    {

-        long cur_pos_inzip = ZTELL(zi->z_filefunc,zi->filestream);

-        if (ZSEEK(zi->z_filefunc,zi->filestream,

-                  zi->ci.pos_local_header + 14,ZLIB_FILEFUNC_SEEK_SET)!=0)

-            err = ZIP_ERRNO;

-   

-    if (err==ZIP_OK)

-            err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,crc32,4); /* crc 32, unknown */

-

-        if (err==ZIP_OK) /* compressed size, unknown */

-            err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,compressed_size,4);

-

-        if (err==ZIP_OK) /* uncompressed size, unknown */

-            err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,uncompressed_size,4);

-

-        if (ZSEEK(zi->z_filefunc,zi->filestream,

-                  cur_pos_inzip,ZLIB_FILEFUNC_SEEK_SET)!=0)

-            err = ZIP_ERRNO;

-    }

-

-    zi->number_entry ++;

-    zi->in_opened_file_inzip = 0;

-

-    return err;

-}

-

-extern int ZEXPORT zipCloseFileInZip (file)

-    zipFile file;

-{

-    return zipCloseFileInZipRaw (file,0,0);

-}

-

-extern int ZEXPORT zipClose (file, global_comment)

-    zipFile file;

-    const char* global_comment;

-{

-    zip_internal* zi;

-    int err = 0;

-    uLong size_centraldir = 0;

-    uLong centraldir_pos_inzip ;

-    uInt size_global_comment;

-    if (file == NULL)

-        return ZIP_PARAMERROR;

-    zi = (zip_internal*)file;

-

-    if (zi->in_opened_file_inzip == 1)

-    {

-        err = zipCloseFileInZip (file);

-    }

-

-#ifndef NO_ADDFILEINEXISTINGZIP

-    if (global_comment==NULL)

-        global_comment = zi->globalcomment;

-#endif

-    if (global_comment==NULL)

-        size_global_comment = 0;

-    else

-        size_global_comment = (uInt)strlen(global_comment);

-

-    centraldir_pos_inzip = ZTELL(zi->z_filefunc,zi->filestream);

-    if (err==ZIP_OK)

-    {

-        linkedlist_datablock_internal* ldi = zi->central_dir.first_block ;

-        while (ldi!=NULL)

-        {

-            if ((err==ZIP_OK) && (ldi->filled_in_this_block>0))

-                if (ZWRITE(zi->z_filefunc,zi->filestream,

-                           ldi->data,ldi->filled_in_this_block)

-                              !=ldi->filled_in_this_block )

-                    err = ZIP_ERRNO;

-

-            size_centraldir += ldi->filled_in_this_block;

-            ldi = ldi->next_datablock;

-        }

-    }

-    free_datablock(zi->central_dir.first_block);

-

-    if (err==ZIP_OK) /* Magic End */

-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)ENDHEADERMAGIC,4);

-

-    if (err==ZIP_OK) /* number of this disk */

-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,2);

-

-    if (err==ZIP_OK) /* number of the disk with the start of the central directory */

-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,2);

-

-    if (err==ZIP_OK) /* total number of entries in the central dir on this disk */

-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->number_entry,2);

-

-    if (err==ZIP_OK) /* total number of entries in the central dir */

-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->number_entry,2);

-

-    if (err==ZIP_OK) /* size of the central directory */

-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_centraldir,4);

-

-    if (err==ZIP_OK) /* offset of start of central directory with respect to the

-                            starting disk number */

-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,

-                                (uLong)(centraldir_pos_inzip - zi->add_position_when_writting_offset),4);

-

-    if (err==ZIP_OK) /* zipfile comment length */

-        err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_global_comment,2);

-

-    if ((err==ZIP_OK) && (size_global_comment>0))

-        if (ZWRITE(zi->z_filefunc,zi->filestream,

-                   global_comment,size_global_comment) != size_global_comment)

-                err = ZIP_ERRNO;

-

-    if (ZCLOSE(zi->z_filefunc,zi->filestream) != 0)

-        if (err == ZIP_OK)

-            err = ZIP_ERRNO;

-

-#ifndef NO_ADDFILEINEXISTINGZIP

-    TRYFREE(zi->globalcomment);

-#endif

-    TRYFREE(zi);

-

-    return err;

-}

diff --git a/src/zip.h b/src/zip.h
deleted file mode 100644
index 5fee09b..0000000
--- a/src/zip.h
+++ /dev/null
@@ -1,237 +0,0 @@
-/* zip.h -- IO for compress .zip files using zlib

-   Version 1.01e, February 12th, 2005

-

-   Copyright (C) 1998-2005 Gilles Vollant

-

-   This unzip package allow creates .ZIP file, compatible with PKZip 2.04g

-     WinZip, InfoZip tools and compatible.

-   Multi volume ZipFile (span) are not supported.

-   Encryption compatible with pkzip 2.04g only supported

-   Old compressions used by old PKZip 1.x are not supported

-

-  For uncompress .zip file, look at unzip.h

-

-

-   I WAIT FEEDBACK at mail info@winimage.com

-   Visit also http://www.winimage.com/zLibDll/unzip.html for evolution

-

-   Condition of use and distribution are the same than zlib :

-

-  This software is provided 'as-is', without any express or implied

-  warranty.  In no event will the authors be held liable for any damages

-  arising from the use of this software.

-

-  Permission is granted to anyone to use this software for any purpose,

-  including commercial applications, and to alter it and redistribute it

-  freely, subject to the following restrictions:

-

-  1. The origin of this software must not be misrepresented; you must not

-     claim that you wrote the original software. If you use this software

-     in a product, an acknowledgment in the product documentation would be

-     appreciated but is not required.

-  2. Altered source versions must be plainly marked as such, and must not be

-     misrepresented as being the original software.

-  3. This notice may not be removed or altered from any source distribution.

-

-

-*/

-

-/* for more info about .ZIP format, see

-      http://www.info-zip.org/pub/infozip/doc/appnote-981119-iz.zip

-      http://www.info-zip.org/pub/infozip/doc/

-   PkWare has also a specification at :

-      ftp://ftp.pkware.com/probdesc.zip

-*/

-

-#ifndef _zip_H

-#define _zip_H

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-

-#define NOCRYPT

-

-#ifndef _ZLIB_H

-#include "zlib.h"

-#endif

-

-#ifndef _ZLIBIOAPI_H

-#include "ioapi.h"

-#endif

-

-#if defined(STRICTZIP) || defined(STRICTZIPUNZIP)

-/* like the STRICT of WIN32, we define a pointer that cannot be converted

-    from (void*) without cast */

-typedef struct TagzipFile__ { int unused; } zipFile__;

-typedef zipFile__ *zipFile;

-#else

-typedef voidp zipFile;

-#endif

-

-#define ZIP_OK                          (0)

-#define ZIP_EOF                         (0)

-#define ZIP_ERRNO                       (Z_ERRNO)

-#define ZIP_PARAMERROR                  (-102)

-#define ZIP_BADZIPFILE                  (-103)

-#define ZIP_INTERNALERROR               (-104)

-

-#ifndef DEF_MEM_LEVEL

-#  if MAX_MEM_LEVEL >= 8

-#    define DEF_MEM_LEVEL 8

-#  else

-#    define DEF_MEM_LEVEL  MAX_MEM_LEVEL

-#  endif

-#endif

-/* default memLevel */

-

-/* tm_zip contain date/time info */

-typedef struct tm_zip_s

-{

-    uInt tm_sec;            /* seconds after the minute - [0,59] */

-    uInt tm_min;            /* minutes after the hour - [0,59] */

-    uInt tm_hour;           /* hours since midnight - [0,23] */

-    uInt tm_mday;           /* day of the month - [1,31] */

-    uInt tm_mon;            /* months since January - [0,11] */

-    uInt tm_year;           /* years - [1980..2044] */

-} tm_zip;

-

-typedef struct

-{

-    tm_zip      tmz_date;       /* date in understandable format           */

-    uLong       dosDate;       /* if dos_date == 0, tmu_date is used      */

-/*    uLong       flag;        */   /* general purpose bit flag        2 bytes */

-

-    uLong       internal_fa;    /* internal file attributes        2 bytes */

-    uLong       external_fa;    /* external file attributes        4 bytes */

-} zip_fileinfo;

-

-typedef const char* zipcharpc;

-

-

-#define APPEND_STATUS_CREATE        (0)

-#define APPEND_STATUS_CREATEAFTER   (1)

-#define APPEND_STATUS_ADDINZIP      (2)

-

-extern zipFile ZEXPORT zipOpen OF((const char *pathname, int append));

-/*

-  Create a zipfile.

-     pathname contain on Windows XP a filename like "c:\\zlib\\zlib113.zip" or on

-       an Unix computer "zlib/zlib113.zip".

-     if the file pathname exist and append==APPEND_STATUS_CREATEAFTER, the zip

-       will be created at the end of the file.

-         (useful if the file contain a self extractor code)

-     if the file pathname exist and append==APPEND_STATUS_ADDINZIP, we will

-       add files in existing zip (be sure you don't add file that doesn't exist)

-     If the zipfile cannot be opened, the return value is NULL.

-     Else, the return value is a zipFile Handle, usable with other function

-       of this zip package.

-*/

-

-/* Note : there is no delete function into a zipfile.

-   If you want delete file into a zipfile, you must open a zipfile, and create another

-   Of couse, you can use RAW reading and writing to copy the file you did not want delte

-*/

-

-extern zipFile ZEXPORT zipOpen2 OF((const char *pathname,

-                                   int append,

-                                   zipcharpc* globalcomment,

-                                   zlib_filefunc_def* pzlib_filefunc_def));

-

-extern int ZEXPORT zipOpenNewFileInZip OF((zipFile file,

-                       const char* filename,

-                       const zip_fileinfo* zipfi,

-                       const void* extrafield_local,

-                       uInt size_extrafield_local,

-                       const void* extrafield_global,

-                       uInt size_extrafield_global,

-                       const char* comment,

-                       int method,

-                       int level));

-/*

-  Open a file in the ZIP for writing.

-  filename : the filename in zip (if NULL, '-' without quote will be used

-  *zipfi contain supplemental information

-  if extrafield_local!=NULL and size_extrafield_local>0, extrafield_local

-    contains the extrafield data the the local header

-  if extrafield_global!=NULL and size_extrafield_global>0, extrafield_global

-    contains the extrafield data the the local header

-  if comment != NULL, comment contain the comment string

-  method contain the compression method (0 for store, Z_DEFLATED for deflate)

-  level contain the level of compression (can be Z_DEFAULT_COMPRESSION)

-*/

-

-

-extern int ZEXPORT zipOpenNewFileInZip2 OF((zipFile file,

-                                            const char* filename,

-                                            const zip_fileinfo* zipfi,

-                                            const void* extrafield_local,

-                                            uInt size_extrafield_local,

-                                            const void* extrafield_global,

-                                            uInt size_extrafield_global,

-                                            const char* comment,

-                                            int method,

-                                            int level,

-                                            int raw));

-

-/*

-  Same than zipOpenNewFileInZip, except if raw=1, we write raw file

- */

-

-extern int ZEXPORT zipOpenNewFileInZip3 OF((zipFile file,

-                                            const char* filename,

-                                            const zip_fileinfo* zipfi,

-                                            const void* extrafield_local,

-                                            uInt size_extrafield_local,

-                                            const void* extrafield_global,

-                                            uInt size_extrafield_global,

-                                            const char* comment,

-                                            int method,

-                                            int level,

-                                            int raw,

-                                            int windowBits,

-                                            int memLevel,

-                                            int strategy,

-                                            const char* password,

-                                            uLong crcForCtypting));

-

-/*

-  Same than zipOpenNewFileInZip2, except

-    windowBits,memLevel,,strategy : see parameter strategy in deflateInit2

-    password : crypting password (NULL for no crypting)

-    crcForCtypting : crc of file to compress (needed for crypting)

- */

-

-

-extern int ZEXPORT zipWriteInFileInZip OF((zipFile file,

-                       const void* buf,

-                       unsigned len));

-/*

-  Write data in the zipfile

-*/

-

-extern int ZEXPORT zipCloseFileInZip OF((zipFile file));

-/*

-  Close the current file in the zipfile

-*/

-

-extern int ZEXPORT zipCloseFileInZipRaw OF((zipFile file,

-                                            uLong uncompressed_size,

-                                            uLong crc32));

-/*

-  Close the current file in the zipfile, for fiel opened with

-    parameter raw=1 in zipOpenNewFileInZip2

-  uncompressed_size and crc32 are value for the uncompressed size

-*/

-

-extern int ZEXPORT zipClose OF((zipFile file,

-                const char* global_comment));

-/*

-  Close the zipfile

-*/

-

-#ifdef __cplusplus

-}

-#endif

-

-#endif /* _zip_H */