]> git.sesse.net Git - vlc/blobdiff - modules/gui/skins2/unzip/unzip.c
Trailing ;
[vlc] / modules / gui / skins2 / unzip / unzip.c
index 86f739b03f2c6519cdf86d0cf164d78638947980..72f2dff331f2982f1f9459de48e73a6c871ab78b 100644 (file)
-/* unzip.c -- IO for uncompress .zip files using zlib\r
-   Version 1.01e, February 12th, 2005\r
-\r
-   Copyright (C) 1998-2005 Gilles Vollant\r
-\r
-   Read unzip.h for more info\r
-*/\r
-\r
-/* Decryption code comes from crypt.c by Info-ZIP but has been greatly reduced in terms of\r
-compatibility with older software. The following is from the original crypt.c. Code\r
-woven in by Terry Thorsen 1/2003.\r
-*/\r
-/*\r
-  Copyright (c) 1990-2000 Info-ZIP.  All rights reserved.\r
-\r
-  See the accompanying file LICENSE, version 2000-Apr-09 or later\r
-  (the contents of which are also included in zip.h) for terms of use.\r
-  If, for some reason, all these files are missing, the Info-ZIP license\r
-  also may be found at:  ftp://ftp.info-zip.org/pub/infozip/license.html\r
-*/\r
-/*\r
-  crypt.c (full version) by Info-ZIP.      Last revised:  [see crypt.h]\r
-\r
-  The encryption/decryption parts of this source code (as opposed to the\r
-  non-echoing password parts) were originally written in Europe.  The\r
-  whole source package can be freely distributed, including from the USA.\r
-  (Prior to January 2000, re-export from the US was a violation of US law.)\r
- */\r
-\r
-/*\r
-  This encryption code is a direct transcription of the algorithm from\r
-  Roger Schlafly, described by Phil Katz in the file appnote.txt.  This\r
-  file (appnote.txt) is distributed with the PKZIP program (even in the\r
-  version without encryption capabilities).\r
- */\r
-\r
-\r
-#include <stdio.h>\r
-#include <stdlib.h>\r
-#include <string.h>\r
-#include "zlib.h"\r
-#include "unzip.h"\r
-\r
-#ifdef STDC\r
-#  include <stddef.h>\r
-#  include <string.h>\r
-#  include <stdlib.h>\r
-#endif\r
-#ifdef NO_ERRNO_H\r
-    extern int errno;\r
-#else\r
-#   include <errno.h>\r
-#endif\r
-\r
-\r
-#ifndef local\r
-#  define local static\r
-#endif\r
-/* compile with -Dlocal if your debugger can't find static symbols */\r
-\r
-\r
-#ifndef CASESENSITIVITYDEFAULT_NO\r
-#  if !defined(unix) && !defined(CASESENSITIVITYDEFAULT_YES)\r
-#    define CASESENSITIVITYDEFAULT_NO\r
-#  endif\r
-#endif\r
-\r
-\r
-#ifndef UNZ_BUFSIZE\r
-#define UNZ_BUFSIZE (16384)\r
-#endif\r
-\r
-#ifndef UNZ_MAXFILENAMEINZIP\r
-#define UNZ_MAXFILENAMEINZIP (256)\r
-#endif\r
-\r
-#ifndef ALLOC\r
-# define ALLOC(size) (malloc(size))\r
-#endif\r
-#ifndef TRYFREE\r
-# define TRYFREE(p) {if (p) free(p);}\r
-#endif\r
-\r
-#define SIZECENTRALDIRITEM (0x2e)\r
-#define SIZEZIPLOCALHEADER (0x1e)\r
-\r
-\r
-\r
-\r
-const char unz_copyright[] =\r
-   " unzip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";\r
-\r
-/* unz_file_info_interntal contain internal info about a file in zipfile*/\r
-typedef struct unz_file_info_internal_s\r
-{\r
-    uLong offset_curfile;/* relative offset of local header 4 bytes */\r
-} unz_file_info_internal;\r
-\r
-\r
-/* file_in_zip_read_info_s contain internal information about a file in zipfile,\r
-    when reading and decompress it */\r
-typedef struct\r
-{\r
-    char  *read_buffer;         /* internal buffer for compressed data */\r
-    z_stream stream;            /* zLib stream structure for inflate */\r
-\r
-    uLong pos_in_zipfile;       /* position in byte on the zipfile, for fseek*/\r
-    uLong stream_initialised;   /* flag set if stream structure is initialised*/\r
-\r
-    uLong offset_local_extrafield;/* offset of the local extra field */\r
-    uInt  size_local_extrafield;/* size of the local extra field */\r
-    uLong pos_local_extrafield;   /* position in the local extra field in read*/\r
-\r
-    uLong crc32;                /* crc32 of all data uncompressed */\r
-    uLong crc32_wait;           /* crc32 we must obtain after decompress all */\r
-    uLong rest_read_compressed; /* number of byte to be decompressed */\r
-    uLong rest_read_uncompressed;/*number of byte to be obtained after decomp*/\r
-    zlib_filefunc_def z_filefunc;\r
-    voidpf filestream;        /* io structore of the zipfile */\r
-    uLong compression_method;   /* compression method (0==store) */\r
-    uLong byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/\r
-    int   raw;\r
-} file_in_zip_read_info_s;\r
-\r
-\r
-/* unz_s contain internal information about the zipfile\r
-*/\r
-typedef struct\r
-{\r
-    zlib_filefunc_def z_filefunc;\r
-    voidpf filestream;        /* io structore of the zipfile */\r
-    unz_global_info gi;       /* public global information */\r
-    uLong byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/\r
-    uLong num_file;             /* number of the current file in the zipfile*/\r
-    uLong pos_in_central_dir;   /* pos of the current file in the central dir*/\r
-    uLong current_file_ok;      /* flag about the usability of the current file*/\r
-    uLong central_pos;          /* position of the beginning of the central dir*/\r
-\r
-    uLong size_central_dir;     /* size of the central directory  */\r
-    uLong offset_central_dir;   /* offset of start of central directory with\r
-                                   respect to the starting disk number */\r
-\r
-    unz_file_info cur_file_info; /* public info about the current file in zip*/\r
-    unz_file_info_internal cur_file_info_internal; /* private info about it*/\r
-    file_in_zip_read_info_s* pfile_in_zip_read; /* structure about the current\r
-                                        file if we are decompressing it */\r
-    int encrypted;\r
-#    ifndef NOUNCRYPT\r
-    unsigned long keys[3];     /* keys defining the pseudo-random sequence */\r
-    const unsigned long* pcrc_32_tab;\r
-#    endif\r
-} unz_s;\r
-\r
-\r
-#ifndef NOUNCRYPT\r
-#include "crypt.h"\r
-#endif\r
-\r
-/* ===========================================================================\r
-     Read a byte from a gz_stream; update next_in and avail_in. Return EOF\r
-   for end of file.\r
-   IN assertion: the stream s has been sucessfully opened for reading.\r
-*/\r
-\r
-\r
-local int unzlocal_getByte OF((\r
-    const zlib_filefunc_def* pzlib_filefunc_def,\r
-    voidpf filestream,\r
-    int *pi));\r
-\r
-local int unzlocal_getByte(pzlib_filefunc_def,filestream,pi)\r
-    const zlib_filefunc_def* pzlib_filefunc_def;\r
-    voidpf filestream;\r
-    int *pi;\r
-{\r
-    unsigned char c;\r
-    int err = (int)ZREAD(*pzlib_filefunc_def,filestream,&c,1);\r
-    if (err==1)\r
-    {\r
-        *pi = (int)c;\r
-        return UNZ_OK;\r
-    }\r
-    else\r
-    {\r
-        if (ZERROR(*pzlib_filefunc_def,filestream))\r
-            return UNZ_ERRNO;\r
-        else\r
-            return UNZ_EOF;\r
-    }\r
-}\r
-\r
-\r
-/* ===========================================================================\r
-   Reads a long in LSB order from the given gz_stream. Sets\r
-*/\r
-local int unzlocal_getShort OF((\r
-    const zlib_filefunc_def* pzlib_filefunc_def,\r
-    voidpf filestream,\r
-    uLong *pX));\r
-\r
-local int unzlocal_getShort (pzlib_filefunc_def,filestream,pX)\r
-    const zlib_filefunc_def* pzlib_filefunc_def;\r
-    voidpf filestream;\r
-    uLong *pX;\r
-{\r
-    uLong x ;\r
-    int i;\r
-    int err;\r
-\r
-    err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);\r
-    x = (uLong)i;\r
-\r
-    if (err==UNZ_OK)\r
-        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);\r
-    x += ((uLong)i)<<8;\r
-\r
-    if (err==UNZ_OK)\r
-        *pX = x;\r
-    else\r
-        *pX = 0;\r
-    return err;\r
-}\r
-\r
-local int unzlocal_getLong OF((\r
-    const zlib_filefunc_def* pzlib_filefunc_def,\r
-    voidpf filestream,\r
-    uLong *pX));\r
-\r
-local int unzlocal_getLong (pzlib_filefunc_def,filestream,pX)\r
-    const zlib_filefunc_def* pzlib_filefunc_def;\r
-    voidpf filestream;\r
-    uLong *pX;\r
-{\r
-    uLong x ;\r
-    int i;\r
-    int err;\r
-\r
-    err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);\r
-    x = (uLong)i;\r
-\r
-    if (err==UNZ_OK)\r
-        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);\r
-    x += ((uLong)i)<<8;\r
-\r
-    if (err==UNZ_OK)\r
-        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);\r
-    x += ((uLong)i)<<16;\r
-\r
-    if (err==UNZ_OK)\r
-        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);\r
-    x += ((uLong)i)<<24;\r
-\r
-    if (err==UNZ_OK)\r
-        *pX = x;\r
-    else\r
-        *pX = 0;\r
-    return err;\r
-}\r
-\r
-\r
-/* My own strcmpi / strcasecmp */\r
-local int strcmpcasenosensitive_internal (fileName1,fileName2)\r
-    const char* fileName1;\r
-    const char* fileName2;\r
-{\r
-    for (;;)\r
-    {\r
-        char c1=*(fileName1++);\r
-        char c2=*(fileName2++);\r
-        if ((c1>='a') && (c1<='z'))\r
-            c1 -= 0x20;\r
-        if ((c2>='a') && (c2<='z'))\r
-            c2 -= 0x20;\r
-        if (c1=='\0')\r
-            return ((c2=='\0') ? 0 : -1);\r
-        if (c2=='\0')\r
-            return 1;\r
-        if (c1<c2)\r
-            return -1;\r
-        if (c1>c2)\r
-            return 1;\r
-    }\r
-}\r
-\r
-\r
-#ifdef  CASESENSITIVITYDEFAULT_NO\r
-#define CASESENSITIVITYDEFAULTVALUE 2\r
-#else\r
-#define CASESENSITIVITYDEFAULTVALUE 1\r
-#endif\r
-\r
-#ifndef STRCMPCASENOSENTIVEFUNCTION\r
-#define STRCMPCASENOSENTIVEFUNCTION strcmpcasenosensitive_internal\r
-#endif\r
-\r
-/*\r
-   Compare two filename (fileName1,fileName2).\r
-   If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)\r
-   If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi\r
-                                                                or strcasecmp)\r
-   If iCaseSenisivity = 0, case sensitivity is defaut of your operating system\r
-        (like 1 on Unix, 2 on Windows)\r
-\r
-*/\r
-extern int ZEXPORT unzStringFileNameCompare (fileName1,fileName2,iCaseSensitivity)\r
-    const char* fileName1;\r
-    const char* fileName2;\r
-    int iCaseSensitivity;\r
-{\r
-    if (iCaseSensitivity==0)\r
-        iCaseSensitivity=CASESENSITIVITYDEFAULTVALUE;\r
-\r
-    if (iCaseSensitivity==1)\r
-        return strcmp(fileName1,fileName2);\r
-\r
-    return STRCMPCASENOSENTIVEFUNCTION(fileName1,fileName2);\r
-}\r
-\r
-#ifndef BUFREADCOMMENT\r
-#define BUFREADCOMMENT (0x400)\r
-#endif\r
-\r
-/*\r
-  Locate the Central directory of a zipfile (at the end, just before\r
-    the global comment)\r
-*/\r
-local uLong unzlocal_SearchCentralDir OF((\r
-    const zlib_filefunc_def* pzlib_filefunc_def,\r
-    voidpf filestream));\r
-\r
-local uLong unzlocal_SearchCentralDir(pzlib_filefunc_def,filestream)\r
-    const zlib_filefunc_def* pzlib_filefunc_def;\r
-    voidpf filestream;\r
-{\r
-    unsigned char* buf;\r
-    uLong uSizeFile;\r
-    uLong uBackRead;\r
-    uLong uMaxBack=0xffff; /* maximum size of global comment */\r
-    uLong uPosFound=0;\r
-\r
-    if (ZSEEK(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)\r
-        return 0;\r
-\r
-\r
-    uSizeFile = ZTELL(*pzlib_filefunc_def,filestream);\r
-\r
-    if (uMaxBack>uSizeFile)\r
-        uMaxBack = uSizeFile;\r
-\r
-    buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);\r
-    if (buf==NULL)\r
-        return 0;\r
-\r
-    uBackRead = 4;\r
-    while (uBackRead<uMaxBack)\r
-    {\r
-        uLong uReadSize,uReadPos ;\r
-        int i;\r
-        if (uBackRead+BUFREADCOMMENT>uMaxBack)\r
-            uBackRead = uMaxBack;\r
-        else\r
-            uBackRead+=BUFREADCOMMENT;\r
-        uReadPos = uSizeFile-uBackRead ;\r
-\r
-        uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?\r
-                     (BUFREADCOMMENT+4) : (uSizeFile-uReadPos);\r
-        if (ZSEEK(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)\r
-            break;\r
-\r
-        if (ZREAD(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)\r
-            break;\r
-\r
-        for (i=(int)uReadSize-3; (i--)>0;)\r
-            if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&\r
-                ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))\r
-            {\r
-                uPosFound = uReadPos+i;\r
-                break;\r
-            }\r
-\r
-        if (uPosFound!=0)\r
-            break;\r
-    }\r
-    TRYFREE(buf);\r
-    return uPosFound;\r
-}\r
-\r
-/*\r
-  Open a Zip file. path contain the full pathname (by example,\r
-     on a Windows NT computer "c:\\test\\zlib114.zip" or on an Unix computer\r
-     "zlib/zlib114.zip".\r
-     If the zipfile cannot be opened (file doesn't exist or in not valid), the\r
-       return value is NULL.\r
-     Else, the return value is a unzFile Handle, usable with other function\r
-       of this unzip package.\r
-*/\r
-extern unzFile ZEXPORT unzOpen2 (path, pzlib_filefunc_def)\r
-    const char *path;\r
-    zlib_filefunc_def* pzlib_filefunc_def;\r
-{\r
-    unz_s us;\r
-    unz_s *s;\r
-    uLong central_pos,uL;\r
-\r
-    uLong number_disk;          /* number of the current dist, used for\r
-                                   spaning ZIP, unsupported, always 0*/\r
-    uLong number_disk_with_CD;  /* number the the disk with central dir, used\r
-                                   for spaning ZIP, unsupported, always 0*/\r
-    uLong number_entry_CD;      /* total number of entries in\r
-                                   the central dir\r
-                                   (same than number_entry on nospan) */\r
-\r
-    int err=UNZ_OK;\r
-\r
-    if (unz_copyright[0]!=' ')\r
-        return NULL;\r
-\r
-    if (pzlib_filefunc_def==NULL)\r
-        fill_fopen_filefunc(&us.z_filefunc);\r
-    else\r
-        us.z_filefunc = *pzlib_filefunc_def;\r
-\r
-    us.filestream= (*(us.z_filefunc.zopen_file))(us.z_filefunc.opaque,\r
-                                                 path,\r
-                                                 ZLIB_FILEFUNC_MODE_READ |\r
-                                                 ZLIB_FILEFUNC_MODE_EXISTING);\r
-    if (us.filestream==NULL)\r
-        return NULL;\r
-\r
-    central_pos = unzlocal_SearchCentralDir(&us.z_filefunc,us.filestream);\r
-    if (central_pos==0)\r
-        err=UNZ_ERRNO;\r
-\r
-    if (ZSEEK(us.z_filefunc, us.filestream,\r
-                                      central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)\r
-        err=UNZ_ERRNO;\r
-\r
-    /* the signature, already checked */\r
-    if (unzlocal_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)\r
-        err=UNZ_ERRNO;\r
-\r
-    /* number of this disk */\r
-    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_disk)!=UNZ_OK)\r
-        err=UNZ_ERRNO;\r
-\r
-    /* number of the disk with the start of the central directory */\r
-    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_disk_with_CD)!=UNZ_OK)\r
-        err=UNZ_ERRNO;\r
-\r
-    /* total number of entries in the central dir on this disk */\r
-    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&us.gi.number_entry)!=UNZ_OK)\r
-        err=UNZ_ERRNO;\r
-\r
-    /* total number of entries in the central dir */\r
-    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_entry_CD)!=UNZ_OK)\r
-        err=UNZ_ERRNO;\r
-\r
-    if ((number_entry_CD!=us.gi.number_entry) ||\r
-        (number_disk_with_CD!=0) ||\r
-        (number_disk!=0))\r
-        err=UNZ_BADZIPFILE;\r
-\r
-    /* size of the central directory */\r
-    if (unzlocal_getLong(&us.z_filefunc, us.filestream,&us.size_central_dir)!=UNZ_OK)\r
-        err=UNZ_ERRNO;\r
-\r
-    /* offset of start of central directory with respect to the\r
-          starting disk number */\r
-    if (unzlocal_getLong(&us.z_filefunc, us.filestream,&us.offset_central_dir)!=UNZ_OK)\r
-        err=UNZ_ERRNO;\r
-\r
-    /* zipfile comment length */\r
-    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&us.gi.size_comment)!=UNZ_OK)\r
-        err=UNZ_ERRNO;\r
-\r
-    if ((central_pos<us.offset_central_dir+us.size_central_dir) &&\r
-        (err==UNZ_OK))\r
-        err=UNZ_BADZIPFILE;\r
-\r
-    if (err!=UNZ_OK)\r
-    {\r
-        ZCLOSE(us.z_filefunc, us.filestream);\r
-        return NULL;\r
-    }\r
-\r
-    us.byte_before_the_zipfile = central_pos -\r
-                            (us.offset_central_dir+us.size_central_dir);\r
-    us.central_pos = central_pos;\r
-    us.pfile_in_zip_read = NULL;\r
-    us.encrypted = 0;\r
-\r
-\r
-    s=(unz_s*)ALLOC(sizeof(unz_s));\r
-    *s=us;\r
-    unzGoToFirstFile((unzFile)s);\r
-    return (unzFile)s;\r
-}\r
-\r
-\r
-extern unzFile ZEXPORT unzOpen (path)\r
-    const char *path;\r
-{\r
-    return unzOpen2(path, NULL);\r
-}\r
-\r
-/*\r
-  Close a ZipFile opened with unzipOpen.\r
-  If there is files inside the .Zip opened with unzipOpenCurrentFile (see later),\r
-    these files MUST be closed with unzipCloseCurrentFile before call unzipClose.\r
-  return UNZ_OK if there is no problem. */\r
-extern int ZEXPORT unzClose (file)\r
-    unzFile file;\r
-{\r
-    unz_s* s;\r
-    if (file==NULL)\r
-        return UNZ_PARAMERROR;\r
-    s=(unz_s*)file;\r
-\r
-    if (s->pfile_in_zip_read!=NULL)\r
-        unzCloseCurrentFile(file);\r
-\r
-    ZCLOSE(s->z_filefunc, s->filestream);\r
-    TRYFREE(s);\r
-    return UNZ_OK;\r
-}\r
-\r
-\r
-/*\r
-  Write info about the ZipFile in the *pglobal_info structure.\r
-  No preparation of the structure is needed\r
-  return UNZ_OK if there is no problem. */\r
-extern int ZEXPORT unzGetGlobalInfo (file,pglobal_info)\r
-    unzFile file;\r
-    unz_global_info *pglobal_info;\r
-{\r
-    unz_s* s;\r
-    if (file==NULL)\r
-        return UNZ_PARAMERROR;\r
-    s=(unz_s*)file;\r
-    *pglobal_info=s->gi;\r
-    return UNZ_OK;\r
-}\r
-\r
-\r
-/*\r
-   Translate date/time from Dos format to tm_unz (readable more easilty)\r
-*/\r
-local void unzlocal_DosDateToTmuDate (ulDosDate, ptm)\r
-    uLong ulDosDate;\r
-    tm_unz* ptm;\r
-{\r
-    uLong uDate;\r
-    uDate = (uLong)(ulDosDate>>16);\r
-    ptm->tm_mday = (uInt)(uDate&0x1f) ;\r
-    ptm->tm_mon =  (uInt)((((uDate)&0x1E0)/0x20)-1) ;\r
-    ptm->tm_year = (uInt)(((uDate&0x0FE00)/0x0200)+1980) ;\r
-\r
-    ptm->tm_hour = (uInt) ((ulDosDate &0xF800)/0x800);\r
-    ptm->tm_min =  (uInt) ((ulDosDate&0x7E0)/0x20) ;\r
-    ptm->tm_sec =  (uInt) (2*(ulDosDate&0x1f)) ;\r
-}\r
-\r
-/*\r
-  Get Info about the current file in the zipfile, with internal only info\r
-*/\r
-local int unzlocal_GetCurrentFileInfoInternal OF((unzFile file,\r
-                                                  unz_file_info *pfile_info,\r
-                                                  unz_file_info_internal\r
-                                                  *pfile_info_internal,\r
-                                                  char *szFileName,\r
-                                                  uLong fileNameBufferSize,\r
-                                                  void *extraField,\r
-                                                  uLong extraFieldBufferSize,\r
-                                                  char *szComment,\r
-                                                  uLong commentBufferSize));\r
-\r
-local int unzlocal_GetCurrentFileInfoInternal (file,\r
-                                              pfile_info,\r
-                                              pfile_info_internal,\r
-                                              szFileName, fileNameBufferSize,\r
-                                              extraField, extraFieldBufferSize,\r
-                                              szComment,  commentBufferSize)\r
-    unzFile file;\r
-    unz_file_info *pfile_info;\r
-    unz_file_info_internal *pfile_info_internal;\r
-    char *szFileName;\r
-    uLong fileNameBufferSize;\r
-    void *extraField;\r
-    uLong extraFieldBufferSize;\r
-    char *szComment;\r
-    uLong commentBufferSize;\r
-{\r
-    unz_s* s;\r
-    unz_file_info file_info;\r
-    unz_file_info_internal file_info_internal;\r
-    int err=UNZ_OK;\r
-    uLong uMagic;\r
-    long lSeek=0;\r
-\r
-    if (file==NULL)\r
-        return UNZ_PARAMERROR;\r
-    s=(unz_s*)file;\r
-    if (ZSEEK(s->z_filefunc, s->filestream,\r
-              s->pos_in_central_dir+s->byte_before_the_zipfile,\r
-              ZLIB_FILEFUNC_SEEK_SET)!=0)\r
-        err=UNZ_ERRNO;\r
-\r
-\r
-    /* we check the magic */\r
-    if (err==UNZ_OK)\r
-    {\r
-        if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)\r
-            err=UNZ_ERRNO;\r
-        else if (uMagic!=0x02014b50)\r
-            err=UNZ_BADZIPFILE;\r
-    }\r
-\r
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.version) != UNZ_OK)\r
-        err=UNZ_ERRNO;\r
-\r
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.version_needed) != UNZ_OK)\r
-        err=UNZ_ERRNO;\r
-\r
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.flag) != UNZ_OK)\r
-        err=UNZ_ERRNO;\r
-\r
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.compression_method) != UNZ_OK)\r
-        err=UNZ_ERRNO;\r
-\r
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.dosDate) != UNZ_OK)\r
-        err=UNZ_ERRNO;\r
-\r
-    unzlocal_DosDateToTmuDate(file_info.dosDate,&file_info.tmu_date);\r
-\r
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.crc) != UNZ_OK)\r
-        err=UNZ_ERRNO;\r
-\r
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.compressed_size) != UNZ_OK)\r
-        err=UNZ_ERRNO;\r
-\r
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.uncompressed_size) != UNZ_OK)\r
-        err=UNZ_ERRNO;\r
-\r
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_filename) != UNZ_OK)\r
-        err=UNZ_ERRNO;\r
-\r
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_extra) != UNZ_OK)\r
-        err=UNZ_ERRNO;\r
-\r
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_comment) != UNZ_OK)\r
-        err=UNZ_ERRNO;\r
-\r
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.disk_num_start) != UNZ_OK)\r
-        err=UNZ_ERRNO;\r
-\r
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.internal_fa) != UNZ_OK)\r
-        err=UNZ_ERRNO;\r
-\r
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.external_fa) != UNZ_OK)\r
-        err=UNZ_ERRNO;\r
-\r
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info_internal.offset_curfile) != UNZ_OK)\r
-        err=UNZ_ERRNO;\r
-\r
-    lSeek+=file_info.size_filename;\r
-    if ((err==UNZ_OK) && (szFileName!=NULL))\r
-    {\r
-        uLong uSizeRead ;\r
-        if (file_info.size_filename<fileNameBufferSize)\r
-        {\r
-            *(szFileName+file_info.size_filename)='\0';\r
-            uSizeRead = file_info.size_filename;\r
-        }\r
-        else\r
-            uSizeRead = fileNameBufferSize;\r
-\r
-        if ((file_info.size_filename>0) && (fileNameBufferSize>0))\r
-            if (ZREAD(s->z_filefunc, s->filestream,szFileName,uSizeRead)!=uSizeRead)\r
-                err=UNZ_ERRNO;\r
-        lSeek -= uSizeRead;\r
-    }\r
-\r
-\r
-    if ((err==UNZ_OK) && (extraField!=NULL))\r
-    {\r
-        uLong uSizeRead ;\r
-        if (file_info.size_file_extra<extraFieldBufferSize)\r
-            uSizeRead = file_info.size_file_extra;\r
-        else\r
-            uSizeRead = extraFieldBufferSize;\r
-\r
-        if (lSeek!=0)\r
-        {\r
-            if (ZSEEK(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)\r
-                lSeek=0;\r
-            else\r
-                err=UNZ_ERRNO;\r
-        }\r
-        if ((file_info.size_file_extra>0) && (extraFieldBufferSize>0))\r
-            if (ZREAD(s->z_filefunc, s->filestream,extraField,uSizeRead)!=uSizeRead)\r
-                err=UNZ_ERRNO;\r
-        lSeek += file_info.size_file_extra - uSizeRead;\r
-    }\r
-    else\r
-        lSeek+=file_info.size_file_extra;\r
-\r
-\r
-    if ((err==UNZ_OK) && (szComment!=NULL))\r
-    {\r
-        uLong uSizeRead ;\r
-        if (file_info.size_file_comment<commentBufferSize)\r
-        {\r
-            *(szComment+file_info.size_file_comment)='\0';\r
-            uSizeRead = file_info.size_file_comment;\r
-        }\r
-        else\r
-            uSizeRead = commentBufferSize;\r
-\r
-        if (lSeek!=0)\r
-        {\r
-            if (ZSEEK(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)\r
-                lSeek=0;\r
-            else\r
-                err=UNZ_ERRNO;\r
-        }\r
-        if ((file_info.size_file_comment>0) && (commentBufferSize>0))\r
-            if (ZREAD(s->z_filefunc, s->filestream,szComment,uSizeRead)!=uSizeRead)\r
-                err=UNZ_ERRNO;\r
-        lSeek+=file_info.size_file_comment - uSizeRead;\r
-    }\r
-    else\r
-        lSeek+=file_info.size_file_comment;\r
-\r
-    if ((err==UNZ_OK) && (pfile_info!=NULL))\r
-        *pfile_info=file_info;\r
-\r
-    if ((err==UNZ_OK) && (pfile_info_internal!=NULL))\r
-        *pfile_info_internal=file_info_internal;\r
-\r
-    return err;\r
-}\r
-\r
-\r
-\r
-/*\r
-  Write info about the ZipFile in the *pglobal_info structure.\r
-  No preparation of the structure is needed\r
-  return UNZ_OK if there is no problem.\r
-*/\r
-extern int ZEXPORT unzGetCurrentFileInfo (file,\r
-                                          pfile_info,\r
-                                          szFileName, fileNameBufferSize,\r
-                                          extraField, extraFieldBufferSize,\r
-                                          szComment,  commentBufferSize)\r
-    unzFile file;\r
-    unz_file_info *pfile_info;\r
-    char *szFileName;\r
-    uLong fileNameBufferSize;\r
-    void *extraField;\r
-    uLong extraFieldBufferSize;\r
-    char *szComment;\r
-    uLong commentBufferSize;\r
-{\r
-    return unzlocal_GetCurrentFileInfoInternal(file,pfile_info,NULL,\r
-                                                szFileName,fileNameBufferSize,\r
-                                                extraField,extraFieldBufferSize,\r
-                                                szComment,commentBufferSize);\r
-}\r
-\r
-/*\r
-  Set the current file of the zipfile to the first file.\r
-  return UNZ_OK if there is no problem\r
-*/\r
-extern int ZEXPORT unzGoToFirstFile (file)\r
-    unzFile file;\r
-{\r
-    int err=UNZ_OK;\r
-    unz_s* s;\r
-    if (file==NULL)\r
-        return UNZ_PARAMERROR;\r
-    s=(unz_s*)file;\r
-    s->pos_in_central_dir=s->offset_central_dir;\r
-    s->num_file=0;\r
-    err=unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,\r
-                                             &s->cur_file_info_internal,\r
-                                             NULL,0,NULL,0,NULL,0);\r
-    s->current_file_ok = (err == UNZ_OK);\r
-    return err;\r
-}\r
-\r
-/*\r
-  Set the current file of the zipfile to the next file.\r
-  return UNZ_OK if there is no problem\r
-  return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.\r
-*/\r
-extern int ZEXPORT unzGoToNextFile (file)\r
-    unzFile file;\r
-{\r
-    unz_s* s;\r
-    int err;\r
-\r
-    if (file==NULL)\r
-        return UNZ_PARAMERROR;\r
-    s=(unz_s*)file;\r
-    if (!s->current_file_ok)\r
-        return UNZ_END_OF_LIST_OF_FILE;\r
-    if (s->gi.number_entry != 0xffff)    /* 2^16 files overflow hack */\r
-      if (s->num_file+1==s->gi.number_entry)\r
-        return UNZ_END_OF_LIST_OF_FILE;\r
-\r
-    s->pos_in_central_dir += SIZECENTRALDIRITEM + s->cur_file_info.size_filename +\r
-            s->cur_file_info.size_file_extra + s->cur_file_info.size_file_comment ;\r
-    s->num_file++;\r
-    err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,\r
-                                               &s->cur_file_info_internal,\r
-                                               NULL,0,NULL,0,NULL,0);\r
-    s->current_file_ok = (err == UNZ_OK);\r
-    return err;\r
-}\r
-\r
-\r
-/*\r
-  Try locate the file szFileName in the zipfile.\r
-  For the iCaseSensitivity signification, see unzipStringFileNameCompare\r
-\r
-  return value :\r
-  UNZ_OK if the file is found. It becomes the current file.\r
-  UNZ_END_OF_LIST_OF_FILE if the file is not found\r
-*/\r
-extern int ZEXPORT unzLocateFile (file, szFileName, iCaseSensitivity)\r
-    unzFile file;\r
-    const char *szFileName;\r
-    int iCaseSensitivity;\r
-{\r
-    unz_s* s;\r
-    int err;\r
-\r
-    /* We remember the 'current' position in the file so that we can jump\r
-     * back there if we fail.\r
-     */\r
-    unz_file_info cur_file_infoSaved;\r
-    unz_file_info_internal cur_file_info_internalSaved;\r
-    uLong num_fileSaved;\r
-    uLong pos_in_central_dirSaved;\r
-\r
-\r
-    if (file==NULL)\r
-        return UNZ_PARAMERROR;\r
-\r
-    if (strlen(szFileName)>=UNZ_MAXFILENAMEINZIP)\r
-        return UNZ_PARAMERROR;\r
-\r
-    s=(unz_s*)file;\r
-    if (!s->current_file_ok)\r
-        return UNZ_END_OF_LIST_OF_FILE;\r
-\r
-    /* Save the current state */\r
-    num_fileSaved = s->num_file;\r
-    pos_in_central_dirSaved = s->pos_in_central_dir;\r
-    cur_file_infoSaved = s->cur_file_info;\r
-    cur_file_info_internalSaved = s->cur_file_info_internal;\r
-\r
-    err = unzGoToFirstFile(file);\r
-\r
-    while (err == UNZ_OK)\r
-    {\r
-        char szCurrentFileName[UNZ_MAXFILENAMEINZIP+1];\r
-        err = unzGetCurrentFileInfo(file,NULL,\r
-                                    szCurrentFileName,sizeof(szCurrentFileName)-1,\r
-                                    NULL,0,NULL,0);\r
-        if (err == UNZ_OK)\r
-        {\r
-            if (unzStringFileNameCompare(szCurrentFileName,\r
-                                            szFileName,iCaseSensitivity)==0)\r
-                return UNZ_OK;\r
-            err = unzGoToNextFile(file);\r
-        }\r
-    }\r
-\r
-    /* We failed, so restore the state of the 'current file' to where we\r
-     * were.\r
-     */\r
-    s->num_file = num_fileSaved ;\r
-    s->pos_in_central_dir = pos_in_central_dirSaved ;\r
-    s->cur_file_info = cur_file_infoSaved;\r
-    s->cur_file_info_internal = cur_file_info_internalSaved;\r
-    return err;\r
-}\r
-\r
-\r
-/*\r
-///////////////////////////////////////////\r
-// Contributed by Ryan Haksi (mailto://cryogen@infoserve.net)\r
-// I need random access\r
-//\r
-// Further optimization could be realized by adding an ability\r
-// to cache the directory in memory. The goal being a single\r
-// comprehensive file read to put the file I need in a memory.\r
-*/\r
-\r
-/*\r
-typedef struct unz_file_pos_s\r
-{\r
-    uLong pos_in_zip_directory;   // offset in file\r
-    uLong num_of_file;            // # of file\r
-} unz_file_pos;\r
-*/\r
-\r
-extern int ZEXPORT unzGetFilePos(file, file_pos)\r
-    unzFile file;\r
-    unz_file_pos* file_pos;\r
-{\r
-    unz_s* s;\r
-\r
-    if (file==NULL || file_pos==NULL)\r
-        return UNZ_PARAMERROR;\r
-    s=(unz_s*)file;\r
-    if (!s->current_file_ok)\r
-        return UNZ_END_OF_LIST_OF_FILE;\r
-\r
-    file_pos->pos_in_zip_directory  = s->pos_in_central_dir;\r
-    file_pos->num_of_file           = s->num_file;\r
-\r
-    return UNZ_OK;\r
-}\r
-\r
-extern int ZEXPORT unzGoToFilePos(file, file_pos)\r
-    unzFile file;\r
-    unz_file_pos* file_pos;\r
-{\r
-    unz_s* s;\r
-    int err;\r
-\r
-    if (file==NULL || file_pos==NULL)\r
-        return UNZ_PARAMERROR;\r
-    s=(unz_s*)file;\r
-\r
-    /* jump to the right spot */\r
-    s->pos_in_central_dir = file_pos->pos_in_zip_directory;\r
-    s->num_file           = file_pos->num_of_file;\r
-\r
-    /* set the current file */\r
-    err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,\r
-                                               &s->cur_file_info_internal,\r
-                                               NULL,0,NULL,0,NULL,0);\r
-    /* return results */\r
-    s->current_file_ok = (err == UNZ_OK);\r
-    return err;\r
-}\r
-\r
-/*\r
-// Unzip Helper Functions - should be here?\r
-///////////////////////////////////////////\r
-*/\r
-\r
-/*\r
-  Read the local header of the current zipfile\r
-  Check the coherency of the local header and info in the end of central\r
-        directory about this file\r
-  store in *piSizeVar the size of extra info in local header\r
-        (filename and size of extra field data)\r
-*/\r
-local int unzlocal_CheckCurrentFileCoherencyHeader (s,piSizeVar,\r
-                                                    poffset_local_extrafield,\r
-                                                    psize_local_extrafield)\r
-    unz_s* s;\r
-    uInt* piSizeVar;\r
-    uLong *poffset_local_extrafield;\r
-    uInt  *psize_local_extrafield;\r
-{\r
-    uLong uMagic,uData,uFlags;\r
-    uLong size_filename;\r
-    uLong size_extra_field;\r
-    int err=UNZ_OK;\r
-\r
-    *piSizeVar = 0;\r
-    *poffset_local_extrafield = 0;\r
-    *psize_local_extrafield = 0;\r
-\r
-    if (ZSEEK(s->z_filefunc, s->filestream,s->cur_file_info_internal.offset_curfile +\r
-                                s->byte_before_the_zipfile,ZLIB_FILEFUNC_SEEK_SET)!=0)\r
-        return UNZ_ERRNO;\r
-\r
-\r
-    if (err==UNZ_OK)\r
-    {\r
-        if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)\r
-            err=UNZ_ERRNO;\r
-        else if (uMagic!=0x04034b50)\r
-            err=UNZ_BADZIPFILE;\r
-    }\r
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)\r
-        err=UNZ_ERRNO;\r
-/*\r
-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.wVersion))\r
-        err=UNZ_BADZIPFILE;\r
-*/\r
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uFlags) != UNZ_OK)\r
-        err=UNZ_ERRNO;\r
-\r
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)\r
-        err=UNZ_ERRNO;\r
-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compression_method))\r
-        err=UNZ_BADZIPFILE;\r
-\r
-    if ((err==UNZ_OK) && (s->cur_file_info.compression_method!=0) &&\r
-                         (s->cur_file_info.compression_method!=Z_DEFLATED))\r
-        err=UNZ_BADZIPFILE;\r
-\r
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* date/time */\r
-        err=UNZ_ERRNO;\r
-\r
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* crc */\r
-        err=UNZ_ERRNO;\r
-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.crc) &&\r
-                              ((uFlags & 8)==0))\r
-        err=UNZ_BADZIPFILE;\r
-\r
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size compr */\r
-        err=UNZ_ERRNO;\r
-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compressed_size) &&\r
-                              ((uFlags & 8)==0))\r
-        err=UNZ_BADZIPFILE;\r
-\r
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size uncompr */\r
-        err=UNZ_ERRNO;\r
-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.uncompressed_size) &&\r
-                              ((uFlags & 8)==0))\r
-        err=UNZ_BADZIPFILE;\r
-\r
-\r
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&size_filename) != UNZ_OK)\r
-        err=UNZ_ERRNO;\r
-    else if ((err==UNZ_OK) && (size_filename!=s->cur_file_info.size_filename))\r
-        err=UNZ_BADZIPFILE;\r
-\r
-    *piSizeVar += (uInt)size_filename;\r
-\r
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&size_extra_field) != UNZ_OK)\r
-        err=UNZ_ERRNO;\r
-    *poffset_local_extrafield= s->cur_file_info_internal.offset_curfile +\r
-                                    SIZEZIPLOCALHEADER + size_filename;\r
-    *psize_local_extrafield = (uInt)size_extra_field;\r
-\r
-    *piSizeVar += (uInt)size_extra_field;\r
-\r
-    return err;\r
-}\r
-\r
-/*\r
-  Open for reading data the current file in the zipfile.\r
-  If there is no error and the file is opened, the return value is UNZ_OK.\r
-*/\r
-extern int ZEXPORT unzOpenCurrentFile3 (file, method, level, raw, password)\r
-    unzFile file;\r
-    int* method;\r
-    int* level;\r
-    int raw;\r
-    const char* password;\r
-{\r
-    int err=UNZ_OK;\r
-    uInt iSizeVar;\r
-    unz_s* s;\r
-    file_in_zip_read_info_s* pfile_in_zip_read_info;\r
-    uLong offset_local_extrafield;  /* offset of the local extra field */\r
-    uInt  size_local_extrafield;    /* size of the local extra field */\r
-#    ifndef NOUNCRYPT\r
-    char source[12];\r
-#    else\r
-    if (password != NULL)\r
-        return UNZ_PARAMERROR;\r
-#    endif\r
-\r
-    if (file==NULL)\r
-        return UNZ_PARAMERROR;\r
-    s=(unz_s*)file;\r
-    if (!s->current_file_ok)\r
-        return UNZ_PARAMERROR;\r
-\r
-    if (s->pfile_in_zip_read != NULL)\r
-        unzCloseCurrentFile(file);\r
-\r
-    if (unzlocal_CheckCurrentFileCoherencyHeader(s,&iSizeVar,\r
-                &offset_local_extrafield,&size_local_extrafield)!=UNZ_OK)\r
-        return UNZ_BADZIPFILE;\r
-\r
-    pfile_in_zip_read_info = (file_in_zip_read_info_s*)\r
-                                        ALLOC(sizeof(file_in_zip_read_info_s));\r
-    if (pfile_in_zip_read_info==NULL)\r
-        return UNZ_INTERNALERROR;\r
-\r
-    pfile_in_zip_read_info->read_buffer=(char*)ALLOC(UNZ_BUFSIZE);\r
-    pfile_in_zip_read_info->offset_local_extrafield = offset_local_extrafield;\r
-    pfile_in_zip_read_info->size_local_extrafield = size_local_extrafield;\r
-    pfile_in_zip_read_info->pos_local_extrafield=0;\r
-    pfile_in_zip_read_info->raw=raw;\r
-\r
-    if (pfile_in_zip_read_info->read_buffer==NULL)\r
-    {\r
-        TRYFREE(pfile_in_zip_read_info);\r
-        return UNZ_INTERNALERROR;\r
-    }\r
-\r
-    pfile_in_zip_read_info->stream_initialised=0;\r
-\r
-    if (method!=NULL)\r
-        *method = (int)s->cur_file_info.compression_method;\r
-\r
-    if (level!=NULL)\r
-    {\r
-        *level = 6;\r
-        switch (s->cur_file_info.flag & 0x06)\r
-        {\r
-          case 6 : *level = 1; break;\r
-          case 4 : *level = 2; break;\r
-          case 2 : *level = 9; break;\r
-        }\r
-    }\r
-\r
-    if ((s->cur_file_info.compression_method!=0) &&\r
-        (s->cur_file_info.compression_method!=Z_DEFLATED))\r
-        err=UNZ_BADZIPFILE;\r
-\r
-    pfile_in_zip_read_info->crc32_wait=s->cur_file_info.crc;\r
-    pfile_in_zip_read_info->crc32=0;\r
-    pfile_in_zip_read_info->compression_method =\r
-            s->cur_file_info.compression_method;\r
-    pfile_in_zip_read_info->filestream=s->filestream;\r
-    pfile_in_zip_read_info->z_filefunc=s->z_filefunc;\r
-    pfile_in_zip_read_info->byte_before_the_zipfile=s->byte_before_the_zipfile;\r
-\r
-    pfile_in_zip_read_info->stream.total_out = 0;\r
-\r
-    if ((s->cur_file_info.compression_method==Z_DEFLATED) &&\r
-        (!raw))\r
-    {\r
-      pfile_in_zip_read_info->stream.zalloc = (alloc_func)0;\r
-      pfile_in_zip_read_info->stream.zfree = (free_func)0;\r
-      pfile_in_zip_read_info->stream.opaque = (voidpf)0;\r
-      pfile_in_zip_read_info->stream.next_in = (voidpf)0;\r
-      pfile_in_zip_read_info->stream.avail_in = 0;\r
-\r
-      err=inflateInit2(&pfile_in_zip_read_info->stream, -MAX_WBITS);\r
-      if (err == Z_OK)\r
-        pfile_in_zip_read_info->stream_initialised=1;\r
-      else\r
-      {\r
-        TRYFREE(pfile_in_zip_read_info);\r
-        return err;\r
-      }\r
-        /* windowBits is passed < 0 to tell that there is no zlib header.\r
-         * Note that in this case inflate *requires* an extra "dummy" byte\r
-         * after the compressed stream in order to complete decompression and\r
-         * return Z_STREAM_END.\r
-         * In unzip, i don't wait absolutely Z_STREAM_END because I known the\r
-         * size of both compressed and uncompressed data\r
-         */\r
-    }\r
-    pfile_in_zip_read_info->rest_read_compressed =\r
-            s->cur_file_info.compressed_size ;\r
-    pfile_in_zip_read_info->rest_read_uncompressed =\r
-            s->cur_file_info.uncompressed_size ;\r
-\r
-\r
-    pfile_in_zip_read_info->pos_in_zipfile =\r
-            s->cur_file_info_internal.offset_curfile + SIZEZIPLOCALHEADER +\r
-              iSizeVar;\r
-\r
-    pfile_in_zip_read_info->stream.avail_in = (uInt)0;\r
-\r
-    s->pfile_in_zip_read = pfile_in_zip_read_info;\r
-\r
-#    ifndef NOUNCRYPT\r
-    if (password != NULL)\r
-    {\r
-        int i;\r
-        s->pcrc_32_tab = get_crc_table();\r
-        init_keys(password,s->keys,s->pcrc_32_tab);\r
-        if (ZSEEK(s->z_filefunc, s->filestream,\r
-                  s->pfile_in_zip_read->pos_in_zipfile +\r
-                     s->pfile_in_zip_read->byte_before_the_zipfile,\r
-                  SEEK_SET)!=0)\r
-            return UNZ_INTERNALERROR;\r
-        if(ZREAD(s->z_filefunc, s->filestream,source, 12)<12)\r
-            return UNZ_INTERNALERROR;\r
-\r
-        for (i = 0; i<12; i++)\r
-            zdecode(s->keys,s->pcrc_32_tab,source[i]);\r
-\r
-        s->pfile_in_zip_read->pos_in_zipfile+=12;\r
-        s->encrypted=1;\r
-    }\r
-#    endif\r
-\r
-\r
-    return UNZ_OK;\r
-}\r
-\r
-extern int ZEXPORT unzOpenCurrentFile (file)\r
-    unzFile file;\r
-{\r
-    return unzOpenCurrentFile3(file, NULL, NULL, 0, NULL);\r
-}\r
-\r
-extern int ZEXPORT unzOpenCurrentFilePassword (file, password)\r
-    unzFile file;\r
-    const char* password;\r
-{\r
-    return unzOpenCurrentFile3(file, NULL, NULL, 0, password);\r
-}\r
-\r
-extern int ZEXPORT unzOpenCurrentFile2 (file,method,level,raw)\r
-    unzFile file;\r
-    int* method;\r
-    int* level;\r
-    int raw;\r
-{\r
-    return unzOpenCurrentFile3(file, method, level, raw, NULL);\r
-}\r
-\r
-/*\r
-  Read bytes from the current file.\r
-  buf contain buffer where data must be copied\r
-  len the size of buf.\r
-\r
-  return the number of byte copied if somes bytes are copied\r
-  return 0 if the end of file was reached\r
-  return <0 with error code if there is an error\r
-    (UNZ_ERRNO for IO error, or zLib error for uncompress error)\r
-*/\r
-extern int ZEXPORT unzReadCurrentFile  (file, buf, len)\r
-    unzFile file;\r
-    voidp buf;\r
-    unsigned len;\r
-{\r
-    int err=UNZ_OK;\r
-    uInt iRead = 0;\r
-    unz_s* s;\r
-    file_in_zip_read_info_s* pfile_in_zip_read_info;\r
-    if (file==NULL)\r
-        return UNZ_PARAMERROR;\r
-    s=(unz_s*)file;\r
-    pfile_in_zip_read_info=s->pfile_in_zip_read;\r
-\r
-    if (pfile_in_zip_read_info==NULL)\r
-        return UNZ_PARAMERROR;\r
-\r
-\r
-    if ((pfile_in_zip_read_info->read_buffer == NULL))\r
-        return UNZ_END_OF_LIST_OF_FILE;\r
-    if (len==0)\r
-        return 0;\r
-\r
-    pfile_in_zip_read_info->stream.next_out = (Bytef*)buf;\r
-\r
-    pfile_in_zip_read_info->stream.avail_out = (uInt)len;\r
-\r
-    if ((len>pfile_in_zip_read_info->rest_read_uncompressed) &&\r
-        (!(pfile_in_zip_read_info->raw)))\r
-        pfile_in_zip_read_info->stream.avail_out =\r
-            (uInt)pfile_in_zip_read_info->rest_read_uncompressed;\r
-\r
-    if ((len>pfile_in_zip_read_info->rest_read_compressed+\r
-           pfile_in_zip_read_info->stream.avail_in) &&\r
-         (pfile_in_zip_read_info->raw))\r
-        pfile_in_zip_read_info->stream.avail_out =\r
-            (uInt)pfile_in_zip_read_info->rest_read_compressed+\r
-            pfile_in_zip_read_info->stream.avail_in;\r
-\r
-    while (pfile_in_zip_read_info->stream.avail_out>0)\r
-    {\r
-        if ((pfile_in_zip_read_info->stream.avail_in==0) &&\r
-            (pfile_in_zip_read_info->rest_read_compressed>0))\r
-        {\r
-            uInt uReadThis = UNZ_BUFSIZE;\r
-            if (pfile_in_zip_read_info->rest_read_compressed<uReadThis)\r
-                uReadThis = (uInt)pfile_in_zip_read_info->rest_read_compressed;\r
-            if (uReadThis == 0)\r
-                return UNZ_EOF;\r
-            if (ZSEEK(pfile_in_zip_read_info->z_filefunc,\r
-                      pfile_in_zip_read_info->filestream,\r
-                      pfile_in_zip_read_info->pos_in_zipfile +\r
-                         pfile_in_zip_read_info->byte_before_the_zipfile,\r
-                         ZLIB_FILEFUNC_SEEK_SET)!=0)\r
-                return UNZ_ERRNO;\r
-            if (ZREAD(pfile_in_zip_read_info->z_filefunc,\r
-                      pfile_in_zip_read_info->filestream,\r
-                      pfile_in_zip_read_info->read_buffer,\r
-                      uReadThis)!=uReadThis)\r
-                return UNZ_ERRNO;\r
-\r
-\r
-#            ifndef NOUNCRYPT\r
-            if(s->encrypted)\r
-            {\r
-                uInt i;\r
-                for(i=0;i<uReadThis;i++)\r
-                  pfile_in_zip_read_info->read_buffer[i] =\r
-                      zdecode(s->keys,s->pcrc_32_tab,\r
-                              pfile_in_zip_read_info->read_buffer[i]);\r
-            }\r
-#            endif\r
-\r
-\r
-            pfile_in_zip_read_info->pos_in_zipfile += uReadThis;\r
-\r
-            pfile_in_zip_read_info->rest_read_compressed-=uReadThis;\r
-\r
-            pfile_in_zip_read_info->stream.next_in =\r
-                (Bytef*)pfile_in_zip_read_info->read_buffer;\r
-            pfile_in_zip_read_info->stream.avail_in = (uInt)uReadThis;\r
-        }\r
-\r
-        if ((pfile_in_zip_read_info->compression_method==0) || (pfile_in_zip_read_info->raw))\r
-        {\r
-            uInt uDoCopy,i ;\r
-\r
-            if ((pfile_in_zip_read_info->stream.avail_in == 0) &&\r
-                (pfile_in_zip_read_info->rest_read_compressed == 0))\r
-                return (iRead==0) ? UNZ_EOF : iRead;\r
-\r
-            if (pfile_in_zip_read_info->stream.avail_out <\r
-                            pfile_in_zip_read_info->stream.avail_in)\r
-                uDoCopy = pfile_in_zip_read_info->stream.avail_out ;\r
-            else\r
-                uDoCopy = pfile_in_zip_read_info->stream.avail_in ;\r
-\r
-            for (i=0;i<uDoCopy;i++)\r
-                *(pfile_in_zip_read_info->stream.next_out+i) =\r
-                        *(pfile_in_zip_read_info->stream.next_in+i);\r
-\r
-            pfile_in_zip_read_info->crc32 = crc32(pfile_in_zip_read_info->crc32,\r
-                                pfile_in_zip_read_info->stream.next_out,\r
-                                uDoCopy);\r
-            pfile_in_zip_read_info->rest_read_uncompressed-=uDoCopy;\r
-            pfile_in_zip_read_info->stream.avail_in -= uDoCopy;\r
-            pfile_in_zip_read_info->stream.avail_out -= uDoCopy;\r
-            pfile_in_zip_read_info->stream.next_out += uDoCopy;\r
-            pfile_in_zip_read_info->stream.next_in += uDoCopy;\r
-            pfile_in_zip_read_info->stream.total_out += uDoCopy;\r
-            iRead += uDoCopy;\r
-        }\r
-        else\r
-        {\r
-            uLong uTotalOutBefore,uTotalOutAfter;\r
-            const Bytef *bufBefore;\r
-            uLong uOutThis;\r
-            int flush=Z_SYNC_FLUSH;\r
-\r
-            uTotalOutBefore = pfile_in_zip_read_info->stream.total_out;\r
-            bufBefore = pfile_in_zip_read_info->stream.next_out;\r
-\r
-            /*\r
-            if ((pfile_in_zip_read_info->rest_read_uncompressed ==\r
-                     pfile_in_zip_read_info->stream.avail_out) &&\r
-                (pfile_in_zip_read_info->rest_read_compressed == 0))\r
-                flush = Z_FINISH;\r
-            */\r
-            err=inflate(&pfile_in_zip_read_info->stream,flush);\r
-\r
-            if ((err>=0) && (pfile_in_zip_read_info->stream.msg!=NULL))\r
-              err = Z_DATA_ERROR;\r
-\r
-            uTotalOutAfter = pfile_in_zip_read_info->stream.total_out;\r
-            uOutThis = uTotalOutAfter-uTotalOutBefore;\r
-\r
-            pfile_in_zip_read_info->crc32 =\r
-                crc32(pfile_in_zip_read_info->crc32,bufBefore,\r
-                        (uInt)(uOutThis));\r
-\r
-            pfile_in_zip_read_info->rest_read_uncompressed -=\r
-                uOutThis;\r
-\r
-            iRead += (uInt)(uTotalOutAfter - uTotalOutBefore);\r
-\r
-            if (err==Z_STREAM_END)\r
-                return (iRead==0) ? UNZ_EOF : iRead;\r
-            if (err!=Z_OK)\r
-                break;\r
-        }\r
-    }\r
-\r
-    if (err==Z_OK)\r
-        return iRead;\r
-    return err;\r
-}\r
-\r
-\r
-/*\r
-  Give the current position in uncompressed data\r
-*/\r
-extern z_off_t ZEXPORT unztell (file)\r
-    unzFile file;\r
-{\r
-    unz_s* s;\r
-    file_in_zip_read_info_s* pfile_in_zip_read_info;\r
-    if (file==NULL)\r
-        return UNZ_PARAMERROR;\r
-    s=(unz_s*)file;\r
-    pfile_in_zip_read_info=s->pfile_in_zip_read;\r
-\r
-    if (pfile_in_zip_read_info==NULL)\r
-        return UNZ_PARAMERROR;\r
-\r
-    return (z_off_t)pfile_in_zip_read_info->stream.total_out;\r
-}\r
-\r
-\r
-/*\r
-  return 1 if the end of file was reached, 0 elsewhere\r
-*/\r
-extern int ZEXPORT unzeof (file)\r
-    unzFile file;\r
-{\r
-    unz_s* s;\r
-    file_in_zip_read_info_s* pfile_in_zip_read_info;\r
-    if (file==NULL)\r
-        return UNZ_PARAMERROR;\r
-    s=(unz_s*)file;\r
-    pfile_in_zip_read_info=s->pfile_in_zip_read;\r
-\r
-    if (pfile_in_zip_read_info==NULL)\r
-        return UNZ_PARAMERROR;\r
-\r
-    if (pfile_in_zip_read_info->rest_read_uncompressed == 0)\r
-        return 1;\r
-    else\r
-        return 0;\r
-}\r
-\r
-\r
-\r
-/*\r
-  Read extra field from the current file (opened by unzOpenCurrentFile)\r
-  This is the local-header version of the extra field (sometimes, there is\r
-    more info in the local-header version than in the central-header)\r
-\r
-  if buf==NULL, it return the size of the local extra field that can be read\r
-\r
-  if buf!=NULL, len is the size of the buffer, the extra header is copied in\r
-    buf.\r
-  the return value is the number of bytes copied in buf, or (if <0)\r
-    the error code\r
-*/\r
-extern int ZEXPORT unzGetLocalExtrafield (file,buf,len)\r
-    unzFile file;\r
-    voidp buf;\r
-    unsigned len;\r
-{\r
-    unz_s* s;\r
-    file_in_zip_read_info_s* pfile_in_zip_read_info;\r
-    uInt read_now;\r
-    uLong size_to_read;\r
-\r
-    if (file==NULL)\r
-        return UNZ_PARAMERROR;\r
-    s=(unz_s*)file;\r
-    pfile_in_zip_read_info=s->pfile_in_zip_read;\r
-\r
-    if (pfile_in_zip_read_info==NULL)\r
-        return UNZ_PARAMERROR;\r
-\r
-    size_to_read = (pfile_in_zip_read_info->size_local_extrafield -\r
-                pfile_in_zip_read_info->pos_local_extrafield);\r
-\r
-    if (buf==NULL)\r
-        return (int)size_to_read;\r
-\r
-    if (len>size_to_read)\r
-        read_now = (uInt)size_to_read;\r
-    else\r
-        read_now = (uInt)len ;\r
-\r
-    if (read_now==0)\r
-        return 0;\r
-\r
-    if (ZSEEK(pfile_in_zip_read_info->z_filefunc,\r
-              pfile_in_zip_read_info->filestream,\r
-              pfile_in_zip_read_info->offset_local_extrafield +\r
-              pfile_in_zip_read_info->pos_local_extrafield,\r
-              ZLIB_FILEFUNC_SEEK_SET)!=0)\r
-        return UNZ_ERRNO;\r
-\r
-    if (ZREAD(pfile_in_zip_read_info->z_filefunc,\r
-              pfile_in_zip_read_info->filestream,\r
-              buf,read_now)!=read_now)\r
-        return UNZ_ERRNO;\r
-\r
-    return (int)read_now;\r
-}\r
-\r
-/*\r
-  Close the file in zip opened with unzipOpenCurrentFile\r
-  Return UNZ_CRCERROR if all the file was read but the CRC is not good\r
-*/\r
-extern int ZEXPORT unzCloseCurrentFile (file)\r
-    unzFile file;\r
-{\r
-    int err=UNZ_OK;\r
-\r
-    unz_s* s;\r
-    file_in_zip_read_info_s* pfile_in_zip_read_info;\r
-    if (file==NULL)\r
-        return UNZ_PARAMERROR;\r
-    s=(unz_s*)file;\r
-    pfile_in_zip_read_info=s->pfile_in_zip_read;\r
-\r
-    if (pfile_in_zip_read_info==NULL)\r
-        return UNZ_PARAMERROR;\r
-\r
-\r
-    if ((pfile_in_zip_read_info->rest_read_uncompressed == 0) &&\r
-        (!pfile_in_zip_read_info->raw))\r
-    {\r
-        if (pfile_in_zip_read_info->crc32 != pfile_in_zip_read_info->crc32_wait)\r
-            err=UNZ_CRCERROR;\r
-    }\r
-\r
-\r
-    TRYFREE(pfile_in_zip_read_info->read_buffer);\r
-    pfile_in_zip_read_info->read_buffer = NULL;\r
-    if (pfile_in_zip_read_info->stream_initialised)\r
-        inflateEnd(&pfile_in_zip_read_info->stream);\r
-\r
-    pfile_in_zip_read_info->stream_initialised = 0;\r
-    TRYFREE(pfile_in_zip_read_info);\r
-\r
-    s->pfile_in_zip_read=NULL;\r
-\r
-    return err;\r
-}\r
-\r
-\r
-/*\r
-  Get the global comment string of the ZipFile, in the szComment buffer.\r
-  uSizeBuf is the size of the szComment buffer.\r
-  return the number of byte copied or an error code <0\r
-*/\r
-extern int ZEXPORT unzGetGlobalComment (file, szComment, uSizeBuf)\r
-    unzFile file;\r
-    char *szComment;\r
-    uLong uSizeBuf;\r
-{\r
-    unz_s* s;\r
-    uLong uReadThis ;\r
-    if (file==NULL)\r
-        return UNZ_PARAMERROR;\r
-    s=(unz_s*)file;\r
-\r
-    uReadThis = uSizeBuf;\r
-    if (uReadThis>s->gi.size_comment)\r
-        uReadThis = s->gi.size_comment;\r
-\r
-    if (ZSEEK(s->z_filefunc,s->filestream,s->central_pos+22,ZLIB_FILEFUNC_SEEK_SET)!=0)\r
-        return UNZ_ERRNO;\r
-\r
-    if (uReadThis>0)\r
-    {\r
-      *szComment='\0';\r
-      if (ZREAD(s->z_filefunc,s->filestream,szComment,uReadThis)!=uReadThis)\r
-        return UNZ_ERRNO;\r
-    }\r
-\r
-    if ((szComment != NULL) && (uSizeBuf > s->gi.size_comment))\r
-        *(szComment+s->gi.size_comment)='\0';\r
-    return (int)uReadThis;\r
-}\r
-\r
-/* Additions by RX '2004 */\r
-extern uLong ZEXPORT unzGetOffset (file)\r
-    unzFile file;\r
-{\r
-    unz_s* s;\r
-\r
-    if (file==NULL)\r
-          return UNZ_PARAMERROR;\r
-    s=(unz_s*)file;\r
-    if (!s->current_file_ok)\r
-      return 0;\r
-    if (s->gi.number_entry != 0 && s->gi.number_entry != 0xffff)\r
-      if (s->num_file==s->gi.number_entry)\r
-         return 0;\r
-    return s->pos_in_central_dir;\r
-}\r
-\r
-extern int ZEXPORT unzSetOffset (file, pos)\r
-        unzFile file;\r
-        uLong pos;\r
-{\r
-    unz_s* s;\r
-    int err;\r
-\r
-    if (file==NULL)\r
-        return UNZ_PARAMERROR;\r
-    s=(unz_s*)file;\r
-\r
-    s->pos_in_central_dir = pos;\r
-    s->num_file = s->gi.number_entry;      /* hack */\r
-    err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,\r
-                                              &s->cur_file_info_internal,\r
-                                              NULL,0,NULL,0,NULL,0);\r
-    s->current_file_ok = (err == UNZ_OK);\r
-    return err;\r
-}\r
+/* 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 "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
+
+#include <assert.h>
+
+#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) {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 = 0;
+    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 = 0;
+    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;
+{
+    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;
+}