Chris@43: /* zip.c -- IO on .zip files using zlib
Chris@43:    Version 1.1, February 14h, 2010
Chris@43:    part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
Chris@43: 
Chris@43:          Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
Chris@43: 
Chris@43:          Modifications for Zip64 support
Chris@43:          Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
Chris@43: 
Chris@43:          For more info read MiniZip_info.txt
Chris@43: 
Chris@43:          Changes
Chris@43:    Oct-2009 - Mathias Svensson - Remove old C style function prototypes
Chris@43:    Oct-2009 - Mathias Svensson - Added Zip64 Support when creating new file archives
Chris@43:    Oct-2009 - Mathias Svensson - Did some code cleanup and refactoring to get better overview of some functions.
Chris@43:    Oct-2009 - Mathias Svensson - Added zipRemoveExtraInfoBlock to strip extra field data from its ZIP64 data
Chris@43:                                  It is used when recreting zip archive with RAW when deleting items from a zip.
Chris@43:                                  ZIP64 data is automaticly added to items that needs it, and existing ZIP64 data need to be removed.
Chris@43:    Oct-2009 - Mathias Svensson - Added support for BZIP2 as compression mode (bzip2 lib is required)
Chris@43:    Jan-2010 - back to unzip and minizip 1.0 name scheme, with compatibility layer
Chris@43: 
Chris@43: */
Chris@43: 
Chris@43: 
Chris@43: #include <stdio.h>
Chris@43: #include <stdlib.h>
Chris@43: #include <string.h>
Chris@43: #include <time.h>
Chris@43: #include "zlib.h"
Chris@43: #include "zip.h"
Chris@43: 
Chris@43: #ifdef STDC
Chris@43: #  include <stddef.h>
Chris@43: #  include <string.h>
Chris@43: #  include <stdlib.h>
Chris@43: #endif
Chris@43: #ifdef NO_ERRNO_H
Chris@43:     extern int errno;
Chris@43: #else
Chris@43: #   include <errno.h>
Chris@43: #endif
Chris@43: 
Chris@43: 
Chris@43: #ifndef local
Chris@43: #  define local static
Chris@43: #endif
Chris@43: /* compile with -Dlocal if your debugger can't find static symbols */
Chris@43: 
Chris@43: #ifndef VERSIONMADEBY
Chris@43: # define VERSIONMADEBY   (0x0) /* platform depedent */
Chris@43: #endif
Chris@43: 
Chris@43: #ifndef Z_BUFSIZE
Chris@43: #define Z_BUFSIZE (64*1024) //(16384)
Chris@43: #endif
Chris@43: 
Chris@43: #ifndef Z_MAXFILENAMEINZIP
Chris@43: #define Z_MAXFILENAMEINZIP (256)
Chris@43: #endif
Chris@43: 
Chris@43: #ifndef ALLOC
Chris@43: # define ALLOC(size) (malloc(size))
Chris@43: #endif
Chris@43: #ifndef TRYFREE
Chris@43: # define TRYFREE(p) {if (p) free(p);}
Chris@43: #endif
Chris@43: 
Chris@43: /*
Chris@43: #define SIZECENTRALDIRITEM (0x2e)
Chris@43: #define SIZEZIPLOCALHEADER (0x1e)
Chris@43: */
Chris@43: 
Chris@43: /* I've found an old Unix (a SunOS 4.1.3_U1) without all SEEK_* defined.... */
Chris@43: 
Chris@43: 
Chris@43: // NOT sure that this work on ALL platform
Chris@43: #define MAKEULONG64(a, b) ((ZPOS64_T)(((unsigned long)(a)) | ((ZPOS64_T)((unsigned long)(b))) << 32))
Chris@43: 
Chris@43: #ifndef SEEK_CUR
Chris@43: #define SEEK_CUR    1
Chris@43: #endif
Chris@43: 
Chris@43: #ifndef SEEK_END
Chris@43: #define SEEK_END    2
Chris@43: #endif
Chris@43: 
Chris@43: #ifndef SEEK_SET
Chris@43: #define SEEK_SET    0
Chris@43: #endif
Chris@43: 
Chris@43: #ifndef DEF_MEM_LEVEL
Chris@43: #if MAX_MEM_LEVEL >= 8
Chris@43: #  define DEF_MEM_LEVEL 8
Chris@43: #else
Chris@43: #  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
Chris@43: #endif
Chris@43: #endif
Chris@43: const char zip_copyright[] =" zip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";
Chris@43: 
Chris@43: 
Chris@43: #define SIZEDATA_INDATABLOCK (4096-(4*4))
Chris@43: 
Chris@43: #define LOCALHEADERMAGIC    (0x04034b50)
Chris@43: #define CENTRALHEADERMAGIC  (0x02014b50)
Chris@43: #define ENDHEADERMAGIC      (0x06054b50)
Chris@43: #define ZIP64ENDHEADERMAGIC      (0x6064b50)
Chris@43: #define ZIP64ENDLOCHEADERMAGIC   (0x7064b50)
Chris@43: 
Chris@43: #define FLAG_LOCALHEADER_OFFSET (0x06)
Chris@43: #define CRC_LOCALHEADER_OFFSET  (0x0e)
Chris@43: 
Chris@43: #define SIZECENTRALHEADER (0x2e) /* 46 */
Chris@43: 
Chris@43: typedef struct linkedlist_datablock_internal_s
Chris@43: {
Chris@43:   struct linkedlist_datablock_internal_s* next_datablock;
Chris@43:   uLong  avail_in_this_block;
Chris@43:   uLong  filled_in_this_block;
Chris@43:   uLong  unused; /* for future use and alignement */
Chris@43:   unsigned char data[SIZEDATA_INDATABLOCK];
Chris@43: } linkedlist_datablock_internal;
Chris@43: 
Chris@43: typedef struct linkedlist_data_s
Chris@43: {
Chris@43:     linkedlist_datablock_internal* first_block;
Chris@43:     linkedlist_datablock_internal* last_block;
Chris@43: } linkedlist_data;
Chris@43: 
Chris@43: 
Chris@43: typedef struct
Chris@43: {
Chris@43:     z_stream stream;            /* zLib stream structure for inflate */
Chris@43: #ifdef HAVE_BZIP2
Chris@43:     bz_stream bstream;          /* bzLib stream structure for bziped */
Chris@43: #endif
Chris@43: 
Chris@43:     int  stream_initialised;    /* 1 is stream is initialised */
Chris@43:     uInt pos_in_buffered_data;  /* last written byte in buffered_data */
Chris@43: 
Chris@43:     ZPOS64_T pos_local_header;     /* offset of the local header of the file
Chris@43:                                      currenty writing */
Chris@43:     char* central_header;       /* central header data for the current file */
Chris@43:     uLong size_centralExtra;
Chris@43:     uLong size_centralheader;   /* size of the central header for cur file */
Chris@43:     uLong size_centralExtraFree; /* Extra bytes allocated to the centralheader but that are not used */
Chris@43:     uLong flag;                 /* flag of the file currently writing */
Chris@43: 
Chris@43:     int  method;                /* compression method of file currenty wr.*/
Chris@43:     int  raw;                   /* 1 for directly writing raw data */
Chris@43:     Byte buffered_data[Z_BUFSIZE];/* buffer contain compressed data to be writ*/
Chris@43:     uLong dosDate;
Chris@43:     uLong crc32;
Chris@43:     int  encrypt;
Chris@43:     int  zip64;               /* Add ZIP64 extened information in the extra field */
Chris@43:     ZPOS64_T pos_zip64extrainfo;
Chris@43:     ZPOS64_T totalCompressedData;
Chris@43:     ZPOS64_T totalUncompressedData;
Chris@43: #ifndef NOCRYPT
Chris@43:     unsigned long keys[3];     /* keys defining the pseudo-random sequence */
Chris@43:     const z_crc_t* pcrc_32_tab;
Chris@43:     int crypt_header_size;
Chris@43: #endif
Chris@43: } curfile64_info;
Chris@43: 
Chris@43: typedef struct
Chris@43: {
Chris@43:     zlib_filefunc64_32_def z_filefunc;
Chris@43:     voidpf filestream;        /* io structore of the zipfile */
Chris@43:     linkedlist_data central_dir;/* datablock with central dir in construction*/
Chris@43:     int  in_opened_file_inzip;  /* 1 if a file in the zip is currently writ.*/
Chris@43:     curfile64_info ci;            /* info on the file curretly writing */
Chris@43: 
Chris@43:     ZPOS64_T begin_pos;            /* position of the beginning of the zipfile */
Chris@43:     ZPOS64_T add_position_when_writting_offset;
Chris@43:     ZPOS64_T number_entry;
Chris@43: 
Chris@43: #ifndef NO_ADDFILEINEXISTINGZIP
Chris@43:     char *globalcomment;
Chris@43: #endif
Chris@43: 
Chris@43: } zip64_internal;
Chris@43: 
Chris@43: 
Chris@43: #ifndef NOCRYPT
Chris@43: #define INCLUDECRYPTINGCODE_IFCRYPTALLOWED
Chris@43: #include "crypt.h"
Chris@43: #endif
Chris@43: 
Chris@43: local linkedlist_datablock_internal* allocate_new_datablock()
Chris@43: {
Chris@43:     linkedlist_datablock_internal* ldi;
Chris@43:     ldi = (linkedlist_datablock_internal*)
Chris@43:                  ALLOC(sizeof(linkedlist_datablock_internal));
Chris@43:     if (ldi!=NULL)
Chris@43:     {
Chris@43:         ldi->next_datablock = NULL ;
Chris@43:         ldi->filled_in_this_block = 0 ;
Chris@43:         ldi->avail_in_this_block = SIZEDATA_INDATABLOCK ;
Chris@43:     }
Chris@43:     return ldi;
Chris@43: }
Chris@43: 
Chris@43: local void free_datablock(linkedlist_datablock_internal* ldi)
Chris@43: {
Chris@43:     while (ldi!=NULL)
Chris@43:     {
Chris@43:         linkedlist_datablock_internal* ldinext = ldi->next_datablock;
Chris@43:         TRYFREE(ldi);
Chris@43:         ldi = ldinext;
Chris@43:     }
Chris@43: }
Chris@43: 
Chris@43: local void init_linkedlist(linkedlist_data* ll)
Chris@43: {
Chris@43:     ll->first_block = ll->last_block = NULL;
Chris@43: }
Chris@43: 
Chris@43: local void free_linkedlist(linkedlist_data* ll)
Chris@43: {
Chris@43:     free_datablock(ll->first_block);
Chris@43:     ll->first_block = ll->last_block = NULL;
Chris@43: }
Chris@43: 
Chris@43: 
Chris@43: local int add_data_in_datablock(linkedlist_data* ll, const void* buf, uLong len)
Chris@43: {
Chris@43:     linkedlist_datablock_internal* ldi;
Chris@43:     const unsigned char* from_copy;
Chris@43: 
Chris@43:     if (ll==NULL)
Chris@43:         return ZIP_INTERNALERROR;
Chris@43: 
Chris@43:     if (ll->last_block == NULL)
Chris@43:     {
Chris@43:         ll->first_block = ll->last_block = allocate_new_datablock();
Chris@43:         if (ll->first_block == NULL)
Chris@43:             return ZIP_INTERNALERROR;
Chris@43:     }
Chris@43: 
Chris@43:     ldi = ll->last_block;
Chris@43:     from_copy = (unsigned char*)buf;
Chris@43: 
Chris@43:     while (len>0)
Chris@43:     {
Chris@43:         uInt copy_this;
Chris@43:         uInt i;
Chris@43:         unsigned char* to_copy;
Chris@43: 
Chris@43:         if (ldi->avail_in_this_block==0)
Chris@43:         {
Chris@43:             ldi->next_datablock = allocate_new_datablock();
Chris@43:             if (ldi->next_datablock == NULL)
Chris@43:                 return ZIP_INTERNALERROR;
Chris@43:             ldi = ldi->next_datablock ;
Chris@43:             ll->last_block = ldi;
Chris@43:         }
Chris@43: 
Chris@43:         if (ldi->avail_in_this_block < len)
Chris@43:             copy_this = (uInt)ldi->avail_in_this_block;
Chris@43:         else
Chris@43:             copy_this = (uInt)len;
Chris@43: 
Chris@43:         to_copy = &(ldi->data[ldi->filled_in_this_block]);
Chris@43: 
Chris@43:         for (i=0;i<copy_this;i++)
Chris@43:             *(to_copy+i)=*(from_copy+i);
Chris@43: 
Chris@43:         ldi->filled_in_this_block += copy_this;
Chris@43:         ldi->avail_in_this_block -= copy_this;
Chris@43:         from_copy += copy_this ;
Chris@43:         len -= copy_this;
Chris@43:     }
Chris@43:     return ZIP_OK;
Chris@43: }
Chris@43: 
Chris@43: 
Chris@43: 
Chris@43: /****************************************************************************/
Chris@43: 
Chris@43: #ifndef NO_ADDFILEINEXISTINGZIP
Chris@43: /* ===========================================================================
Chris@43:    Inputs a long in LSB order to the given file
Chris@43:    nbByte == 1, 2 ,4 or 8 (byte, short or long, ZPOS64_T)
Chris@43: */
Chris@43: 
Chris@43: local int zip64local_putValue OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, ZPOS64_T x, int nbByte));
Chris@43: local int zip64local_putValue (const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, ZPOS64_T x, int nbByte)
Chris@43: {
Chris@43:     unsigned char buf[8];
Chris@43:     int n;
Chris@43:     for (n = 0; n < nbByte; n++)
Chris@43:     {
Chris@43:         buf[n] = (unsigned char)(x & 0xff);
Chris@43:         x >>= 8;
Chris@43:     }
Chris@43:     if (x != 0)
Chris@43:       {     /* data overflow - hack for ZIP64 (X Roche) */
Chris@43:       for (n = 0; n < nbByte; n++)
Chris@43:         {
Chris@43:           buf[n] = 0xff;
Chris@43:         }
Chris@43:       }
Chris@43: 
Chris@43:     if (ZWRITE64(*pzlib_filefunc_def,filestream,buf,nbByte)!=(uLong)nbByte)
Chris@43:         return ZIP_ERRNO;
Chris@43:     else
Chris@43:         return ZIP_OK;
Chris@43: }
Chris@43: 
Chris@43: local void zip64local_putValue_inmemory OF((void* dest, ZPOS64_T x, int nbByte));
Chris@43: local void zip64local_putValue_inmemory (void* dest, ZPOS64_T x, int nbByte)
Chris@43: {
Chris@43:     unsigned char* buf=(unsigned char*)dest;
Chris@43:     int n;
Chris@43:     for (n = 0; n < nbByte; n++) {
Chris@43:         buf[n] = (unsigned char)(x & 0xff);
Chris@43:         x >>= 8;
Chris@43:     }
Chris@43: 
Chris@43:     if (x != 0)
Chris@43:     {     /* data overflow - hack for ZIP64 */
Chris@43:        for (n = 0; n < nbByte; n++)
Chris@43:        {
Chris@43:           buf[n] = 0xff;
Chris@43:        }
Chris@43:     }
Chris@43: }
Chris@43: 
Chris@43: /****************************************************************************/
Chris@43: 
Chris@43: 
Chris@43: local uLong zip64local_TmzDateToDosDate(const tm_zip* ptm)
Chris@43: {
Chris@43:     uLong year = (uLong)ptm->tm_year;
Chris@43:     if (year>=1980)
Chris@43:         year-=1980;
Chris@43:     else if (year>=80)
Chris@43:         year-=80;
Chris@43:     return
Chris@43:       (uLong) (((ptm->tm_mday) + (32 * (ptm->tm_mon+1)) + (512 * year)) << 16) |
Chris@43:         ((ptm->tm_sec/2) + (32* ptm->tm_min) + (2048 * (uLong)ptm->tm_hour));
Chris@43: }
Chris@43: 
Chris@43: 
Chris@43: /****************************************************************************/
Chris@43: 
Chris@43: local int zip64local_getByte OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, int *pi));
Chris@43: 
Chris@43: local int zip64local_getByte(const zlib_filefunc64_32_def* pzlib_filefunc_def,voidpf filestream,int* pi)
Chris@43: {
Chris@43:     unsigned char c;
Chris@43:     int err = (int)ZREAD64(*pzlib_filefunc_def,filestream,&c,1);
Chris@43:     if (err==1)
Chris@43:     {
Chris@43:         *pi = (int)c;
Chris@43:         return ZIP_OK;
Chris@43:     }
Chris@43:     else
Chris@43:     {
Chris@43:         if (ZERROR64(*pzlib_filefunc_def,filestream))
Chris@43:             return ZIP_ERRNO;
Chris@43:         else
Chris@43:             return ZIP_EOF;
Chris@43:     }
Chris@43: }
Chris@43: 
Chris@43: 
Chris@43: /* ===========================================================================
Chris@43:    Reads a long in LSB order from the given gz_stream. Sets
Chris@43: */
Chris@43: local int zip64local_getShort OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, uLong *pX));
Chris@43: 
Chris@43: local int zip64local_getShort (const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, uLong* pX)
Chris@43: {
Chris@43:     uLong x ;
Chris@43:     int i = 0;
Chris@43:     int err;
Chris@43: 
Chris@43:     err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
Chris@43:     x = (uLong)i;
Chris@43: 
Chris@43:     if (err==ZIP_OK)
Chris@43:         err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
Chris@43:     x += ((uLong)i)<<8;
Chris@43: 
Chris@43:     if (err==ZIP_OK)
Chris@43:         *pX = x;
Chris@43:     else
Chris@43:         *pX = 0;
Chris@43:     return err;
Chris@43: }
Chris@43: 
Chris@43: local int zip64local_getLong OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, uLong *pX));
Chris@43: 
Chris@43: local int zip64local_getLong (const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, uLong* pX)
Chris@43: {
Chris@43:     uLong x ;
Chris@43:     int i = 0;
Chris@43:     int err;
Chris@43: 
Chris@43:     err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
Chris@43:     x = (uLong)i;
Chris@43: 
Chris@43:     if (err==ZIP_OK)
Chris@43:         err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
Chris@43:     x += ((uLong)i)<<8;
Chris@43: 
Chris@43:     if (err==ZIP_OK)
Chris@43:         err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
Chris@43:     x += ((uLong)i)<<16;
Chris@43: 
Chris@43:     if (err==ZIP_OK)
Chris@43:         err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
Chris@43:     x += ((uLong)i)<<24;
Chris@43: 
Chris@43:     if (err==ZIP_OK)
Chris@43:         *pX = x;
Chris@43:     else
Chris@43:         *pX = 0;
Chris@43:     return err;
Chris@43: }
Chris@43: 
Chris@43: local int zip64local_getLong64 OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, ZPOS64_T *pX));
Chris@43: 
Chris@43: 
Chris@43: local int zip64local_getLong64 (const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, ZPOS64_T *pX)
Chris@43: {
Chris@43:   ZPOS64_T x;
Chris@43:   int i = 0;
Chris@43:   int err;
Chris@43: 
Chris@43:   err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
Chris@43:   x = (ZPOS64_T)i;
Chris@43: 
Chris@43:   if (err==ZIP_OK)
Chris@43:     err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
Chris@43:   x += ((ZPOS64_T)i)<<8;
Chris@43: 
Chris@43:   if (err==ZIP_OK)
Chris@43:     err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
Chris@43:   x += ((ZPOS64_T)i)<<16;
Chris@43: 
Chris@43:   if (err==ZIP_OK)
Chris@43:     err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
Chris@43:   x += ((ZPOS64_T)i)<<24;
Chris@43: 
Chris@43:   if (err==ZIP_OK)
Chris@43:     err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
Chris@43:   x += ((ZPOS64_T)i)<<32;
Chris@43: 
Chris@43:   if (err==ZIP_OK)
Chris@43:     err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
Chris@43:   x += ((ZPOS64_T)i)<<40;
Chris@43: 
Chris@43:   if (err==ZIP_OK)
Chris@43:     err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
Chris@43:   x += ((ZPOS64_T)i)<<48;
Chris@43: 
Chris@43:   if (err==ZIP_OK)
Chris@43:     err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
Chris@43:   x += ((ZPOS64_T)i)<<56;
Chris@43: 
Chris@43:   if (err==ZIP_OK)
Chris@43:     *pX = x;
Chris@43:   else
Chris@43:     *pX = 0;
Chris@43: 
Chris@43:   return err;
Chris@43: }
Chris@43: 
Chris@43: #ifndef BUFREADCOMMENT
Chris@43: #define BUFREADCOMMENT (0x400)
Chris@43: #endif
Chris@43: /*
Chris@43:   Locate the Central directory of a zipfile (at the end, just before
Chris@43:     the global comment)
Chris@43: */
Chris@43: local ZPOS64_T zip64local_SearchCentralDir OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream));
Chris@43: 
Chris@43: local ZPOS64_T zip64local_SearchCentralDir(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream)
Chris@43: {
Chris@43:   unsigned char* buf;
Chris@43:   ZPOS64_T uSizeFile;
Chris@43:   ZPOS64_T uBackRead;
Chris@43:   ZPOS64_T uMaxBack=0xffff; /* maximum size of global comment */
Chris@43:   ZPOS64_T uPosFound=0;
Chris@43: 
Chris@43:   if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
Chris@43:     return 0;
Chris@43: 
Chris@43: 
Chris@43:   uSizeFile = ZTELL64(*pzlib_filefunc_def,filestream);
Chris@43: 
Chris@43:   if (uMaxBack>uSizeFile)
Chris@43:     uMaxBack = uSizeFile;
Chris@43: 
Chris@43:   buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
Chris@43:   if (buf==NULL)
Chris@43:     return 0;
Chris@43: 
Chris@43:   uBackRead = 4;
Chris@43:   while (uBackRead<uMaxBack)
Chris@43:   {
Chris@43:     uLong uReadSize;
Chris@43:     ZPOS64_T uReadPos ;
Chris@43:     int i;
Chris@43:     if (uBackRead+BUFREADCOMMENT>uMaxBack)
Chris@43:       uBackRead = uMaxBack;
Chris@43:     else
Chris@43:       uBackRead+=BUFREADCOMMENT;
Chris@43:     uReadPos = uSizeFile-uBackRead ;
Chris@43: 
Chris@43:     uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
Chris@43:       (BUFREADCOMMENT+4) : (uLong)(uSizeFile-uReadPos);
Chris@43:     if (ZSEEK64(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
Chris@43:       break;
Chris@43: 
Chris@43:     if (ZREAD64(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
Chris@43:       break;
Chris@43: 
Chris@43:     for (i=(int)uReadSize-3; (i--)>0;)
Chris@43:       if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&
Chris@43:         ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))
Chris@43:       {
Chris@43:         uPosFound = uReadPos+i;
Chris@43:         break;
Chris@43:       }
Chris@43: 
Chris@43:       if (uPosFound!=0)
Chris@43:         break;
Chris@43:   }
Chris@43:   TRYFREE(buf);
Chris@43:   return uPosFound;
Chris@43: }
Chris@43: 
Chris@43: /*
Chris@43: Locate the End of Zip64 Central directory locator and from there find the CD of a zipfile (at the end, just before
Chris@43: the global comment)
Chris@43: */
Chris@43: local ZPOS64_T zip64local_SearchCentralDir64 OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream));
Chris@43: 
Chris@43: local ZPOS64_T zip64local_SearchCentralDir64(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream)
Chris@43: {
Chris@43:   unsigned char* buf;
Chris@43:   ZPOS64_T uSizeFile;
Chris@43:   ZPOS64_T uBackRead;
Chris@43:   ZPOS64_T uMaxBack=0xffff; /* maximum size of global comment */
Chris@43:   ZPOS64_T uPosFound=0;
Chris@43:   uLong uL;
Chris@43:   ZPOS64_T relativeOffset;
Chris@43: 
Chris@43:   if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
Chris@43:     return 0;
Chris@43: 
Chris@43:   uSizeFile = ZTELL64(*pzlib_filefunc_def,filestream);
Chris@43: 
Chris@43:   if (uMaxBack>uSizeFile)
Chris@43:     uMaxBack = uSizeFile;
Chris@43: 
Chris@43:   buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
Chris@43:   if (buf==NULL)
Chris@43:     return 0;
Chris@43: 
Chris@43:   uBackRead = 4;
Chris@43:   while (uBackRead<uMaxBack)
Chris@43:   {
Chris@43:     uLong uReadSize;
Chris@43:     ZPOS64_T uReadPos;
Chris@43:     int i;
Chris@43:     if (uBackRead+BUFREADCOMMENT>uMaxBack)
Chris@43:       uBackRead = uMaxBack;
Chris@43:     else
Chris@43:       uBackRead+=BUFREADCOMMENT;
Chris@43:     uReadPos = uSizeFile-uBackRead ;
Chris@43: 
Chris@43:     uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
Chris@43:       (BUFREADCOMMENT+4) : (uLong)(uSizeFile-uReadPos);
Chris@43:     if (ZSEEK64(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
Chris@43:       break;
Chris@43: 
Chris@43:     if (ZREAD64(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
Chris@43:       break;
Chris@43: 
Chris@43:     for (i=(int)uReadSize-3; (i--)>0;)
Chris@43:     {
Chris@43:       // Signature "0x07064b50" Zip64 end of central directory locater
Chris@43:       if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) && ((*(buf+i+2))==0x06) && ((*(buf+i+3))==0x07))
Chris@43:       {
Chris@43:         uPosFound = uReadPos+i;
Chris@43:         break;
Chris@43:       }
Chris@43:     }
Chris@43: 
Chris@43:       if (uPosFound!=0)
Chris@43:         break;
Chris@43:   }
Chris@43: 
Chris@43:   TRYFREE(buf);
Chris@43:   if (uPosFound == 0)
Chris@43:     return 0;
Chris@43: 
Chris@43:   /* Zip64 end of central directory locator */
Chris@43:   if (ZSEEK64(*pzlib_filefunc_def,filestream, uPosFound,ZLIB_FILEFUNC_SEEK_SET)!=0)
Chris@43:     return 0;
Chris@43: 
Chris@43:   /* the signature, already checked */
Chris@43:   if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
Chris@43:     return 0;
Chris@43: 
Chris@43:   /* number of the disk with the start of the zip64 end of  central directory */
Chris@43:   if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
Chris@43:     return 0;
Chris@43:   if (uL != 0)
Chris@43:     return 0;
Chris@43: 
Chris@43:   /* relative offset of the zip64 end of central directory record */
Chris@43:   if (zip64local_getLong64(pzlib_filefunc_def,filestream,&relativeOffset)!=ZIP_OK)
Chris@43:     return 0;
Chris@43: 
Chris@43:   /* total number of disks */
Chris@43:   if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
Chris@43:     return 0;
Chris@43:   if (uL != 1)
Chris@43:     return 0;
Chris@43: 
Chris@43:   /* Goto Zip64 end of central directory record */
Chris@43:   if (ZSEEK64(*pzlib_filefunc_def,filestream, relativeOffset,ZLIB_FILEFUNC_SEEK_SET)!=0)
Chris@43:     return 0;
Chris@43: 
Chris@43:   /* the signature */
Chris@43:   if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
Chris@43:     return 0;
Chris@43: 
Chris@43:   if (uL != 0x06064b50) // signature of 'Zip64 end of central directory'
Chris@43:     return 0;
Chris@43: 
Chris@43:   return relativeOffset;
Chris@43: }
Chris@43: 
Chris@43: int LoadCentralDirectoryRecord(zip64_internal* pziinit)
Chris@43: {
Chris@43:   int err=ZIP_OK;
Chris@43:   ZPOS64_T byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
Chris@43: 
Chris@43:   ZPOS64_T size_central_dir;     /* size of the central directory  */
Chris@43:   ZPOS64_T offset_central_dir;   /* offset of start of central directory */
Chris@43:   ZPOS64_T central_pos;
Chris@43:   uLong uL;
Chris@43: 
Chris@43:   uLong number_disk;          /* number of the current dist, used for
Chris@43:                               spaning ZIP, unsupported, always 0*/
Chris@43:   uLong number_disk_with_CD;  /* number the the disk with central dir, used
Chris@43:                               for spaning ZIP, unsupported, always 0*/
Chris@43:   ZPOS64_T number_entry;
Chris@43:   ZPOS64_T number_entry_CD;      /* total number of entries in
Chris@43:                                 the central dir
Chris@43:                                 (same than number_entry on nospan) */
Chris@43:   uLong VersionMadeBy;
Chris@43:   uLong VersionNeeded;
Chris@43:   uLong size_comment;
Chris@43: 
Chris@43:   int hasZIP64Record = 0;
Chris@43: 
Chris@43:   // check first if we find a ZIP64 record
Chris@43:   central_pos = zip64local_SearchCentralDir64(&pziinit->z_filefunc,pziinit->filestream);
Chris@43:   if(central_pos > 0)
Chris@43:   {
Chris@43:     hasZIP64Record = 1;
Chris@43:   }
Chris@43:   else if(central_pos == 0)
Chris@43:   {
Chris@43:     central_pos = zip64local_SearchCentralDir(&pziinit->z_filefunc,pziinit->filestream);
Chris@43:   }
Chris@43: 
Chris@43: /* disable to allow appending to empty ZIP archive
Chris@43:         if (central_pos==0)
Chris@43:             err=ZIP_ERRNO;
Chris@43: */
Chris@43: 
Chris@43:   if(hasZIP64Record)
Chris@43:   {
Chris@43:     ZPOS64_T sizeEndOfCentralDirectory;
Chris@43:     if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, central_pos, ZLIB_FILEFUNC_SEEK_SET) != 0)
Chris@43:       err=ZIP_ERRNO;
Chris@43: 
Chris@43:     /* the signature, already checked */
Chris@43:     if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&uL)!=ZIP_OK)
Chris@43:       err=ZIP_ERRNO;
Chris@43: 
Chris@43:     /* size of zip64 end of central directory record */
Chris@43:     if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream, &sizeEndOfCentralDirectory)!=ZIP_OK)
Chris@43:       err=ZIP_ERRNO;
Chris@43: 
Chris@43:     /* version made by */
Chris@43:     if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &VersionMadeBy)!=ZIP_OK)
Chris@43:       err=ZIP_ERRNO;
Chris@43: 
Chris@43:     /* version needed to extract */
Chris@43:     if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &VersionNeeded)!=ZIP_OK)
Chris@43:       err=ZIP_ERRNO;
Chris@43: 
Chris@43:     /* number of this disk */
Chris@43:     if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&number_disk)!=ZIP_OK)
Chris@43:       err=ZIP_ERRNO;
Chris@43: 
Chris@43:     /* number of the disk with the start of the central directory */
Chris@43:     if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&number_disk_with_CD)!=ZIP_OK)
Chris@43:       err=ZIP_ERRNO;
Chris@43: 
Chris@43:     /* total number of entries in the central directory on this disk */
Chris@43:     if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream, &number_entry)!=ZIP_OK)
Chris@43:       err=ZIP_ERRNO;
Chris@43: 
Chris@43:     /* total number of entries in the central directory */
Chris@43:     if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream,&number_entry_CD)!=ZIP_OK)
Chris@43:       err=ZIP_ERRNO;
Chris@43: 
Chris@43:     if ((number_entry_CD!=number_entry) || (number_disk_with_CD!=0) || (number_disk!=0))
Chris@43:       err=ZIP_BADZIPFILE;
Chris@43: 
Chris@43:     /* size of the central directory */
Chris@43:     if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream,&size_central_dir)!=ZIP_OK)
Chris@43:       err=ZIP_ERRNO;
Chris@43: 
Chris@43:     /* offset of start of central directory with respect to the
Chris@43:     starting disk number */
Chris@43:     if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream,&offset_central_dir)!=ZIP_OK)
Chris@43:       err=ZIP_ERRNO;
Chris@43: 
Chris@43:     // TODO..
Chris@43:     // read the comment from the standard central header.
Chris@43:     size_comment = 0;
Chris@43:   }
Chris@43:   else
Chris@43:   {
Chris@43:     // Read End of central Directory info
Chris@43:     if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)
Chris@43:       err=ZIP_ERRNO;
Chris@43: 
Chris@43:     /* the signature, already checked */
Chris@43:     if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&uL)!=ZIP_OK)
Chris@43:       err=ZIP_ERRNO;
Chris@43: 
Chris@43:     /* number of this disk */
Chris@43:     if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream,&number_disk)!=ZIP_OK)
Chris@43:       err=ZIP_ERRNO;
Chris@43: 
Chris@43:     /* number of the disk with the start of the central directory */
Chris@43:     if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream,&number_disk_with_CD)!=ZIP_OK)
Chris@43:       err=ZIP_ERRNO;
Chris@43: 
Chris@43:     /* total number of entries in the central dir on this disk */
Chris@43:     number_entry = 0;
Chris@43:     if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &uL)!=ZIP_OK)
Chris@43:       err=ZIP_ERRNO;
Chris@43:     else
Chris@43:       number_entry = uL;
Chris@43: 
Chris@43:     /* total number of entries in the central dir */
Chris@43:     number_entry_CD = 0;
Chris@43:     if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &uL)!=ZIP_OK)
Chris@43:       err=ZIP_ERRNO;
Chris@43:     else
Chris@43:       number_entry_CD = uL;
Chris@43: 
Chris@43:     if ((number_entry_CD!=number_entry) || (number_disk_with_CD!=0) || (number_disk!=0))
Chris@43:       err=ZIP_BADZIPFILE;
Chris@43: 
Chris@43:     /* size of the central directory */
Chris@43:     size_central_dir = 0;
Chris@43:     if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream, &uL)!=ZIP_OK)
Chris@43:       err=ZIP_ERRNO;
Chris@43:     else
Chris@43:       size_central_dir = uL;
Chris@43: 
Chris@43:     /* offset of start of central directory with respect to the starting disk number */
Chris@43:     offset_central_dir = 0;
Chris@43:     if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream, &uL)!=ZIP_OK)
Chris@43:       err=ZIP_ERRNO;
Chris@43:     else
Chris@43:       offset_central_dir = uL;
Chris@43: 
Chris@43: 
Chris@43:     /* zipfile global comment length */
Chris@43:     if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &size_comment)!=ZIP_OK)
Chris@43:       err=ZIP_ERRNO;
Chris@43:   }
Chris@43: 
Chris@43:   if ((central_pos<offset_central_dir+size_central_dir) &&
Chris@43:     (err==ZIP_OK))
Chris@43:     err=ZIP_BADZIPFILE;
Chris@43: 
Chris@43:   if (err!=ZIP_OK)
Chris@43:   {
Chris@43:     ZCLOSE64(pziinit->z_filefunc, pziinit->filestream);
Chris@43:     return ZIP_ERRNO;
Chris@43:   }
Chris@43: 
Chris@43:   if (size_comment>0)
Chris@43:   {
Chris@43:     pziinit->globalcomment = (char*)ALLOC(size_comment+1);
Chris@43:     if (pziinit->globalcomment)
Chris@43:     {
Chris@43:       size_comment = ZREAD64(pziinit->z_filefunc, pziinit->filestream, pziinit->globalcomment,size_comment);
Chris@43:       pziinit->globalcomment[size_comment]=0;
Chris@43:     }
Chris@43:   }
Chris@43: 
Chris@43:   byte_before_the_zipfile = central_pos - (offset_central_dir+size_central_dir);
Chris@43:   pziinit->add_position_when_writting_offset = byte_before_the_zipfile;
Chris@43: 
Chris@43:   {
Chris@43:     ZPOS64_T size_central_dir_to_read = size_central_dir;
Chris@43:     size_t buf_size = SIZEDATA_INDATABLOCK;
Chris@43:     void* buf_read = (void*)ALLOC(buf_size);
Chris@43:     if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, offset_central_dir + byte_before_the_zipfile, ZLIB_FILEFUNC_SEEK_SET) != 0)
Chris@43:       err=ZIP_ERRNO;
Chris@43: 
Chris@43:     while ((size_central_dir_to_read>0) && (err==ZIP_OK))
Chris@43:     {
Chris@43:       ZPOS64_T read_this = SIZEDATA_INDATABLOCK;
Chris@43:       if (read_this > size_central_dir_to_read)
Chris@43:         read_this = size_central_dir_to_read;
Chris@43: 
Chris@43:       if (ZREAD64(pziinit->z_filefunc, pziinit->filestream,buf_read,(uLong)read_this) != read_this)
Chris@43:         err=ZIP_ERRNO;
Chris@43: 
Chris@43:       if (err==ZIP_OK)
Chris@43:         err = add_data_in_datablock(&pziinit->central_dir,buf_read, (uLong)read_this);
Chris@43: 
Chris@43:       size_central_dir_to_read-=read_this;
Chris@43:     }
Chris@43:     TRYFREE(buf_read);
Chris@43:   }
Chris@43:   pziinit->begin_pos = byte_before_the_zipfile;
Chris@43:   pziinit->number_entry = number_entry_CD;
Chris@43: 
Chris@43:   if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, offset_central_dir+byte_before_the_zipfile,ZLIB_FILEFUNC_SEEK_SET) != 0)
Chris@43:     err=ZIP_ERRNO;
Chris@43: 
Chris@43:   return err;
Chris@43: }
Chris@43: 
Chris@43: 
Chris@43: #endif /* !NO_ADDFILEINEXISTINGZIP*/
Chris@43: 
Chris@43: 
Chris@43: /************************************************************/
Chris@43: extern zipFile ZEXPORT zipOpen3 (const void *pathname, int append, zipcharpc* globalcomment, zlib_filefunc64_32_def* pzlib_filefunc64_32_def)
Chris@43: {
Chris@43:     zip64_internal ziinit;
Chris@43:     zip64_internal* zi;
Chris@43:     int err=ZIP_OK;
Chris@43: 
Chris@43:     ziinit.z_filefunc.zseek32_file = NULL;
Chris@43:     ziinit.z_filefunc.ztell32_file = NULL;
Chris@43:     if (pzlib_filefunc64_32_def==NULL)
Chris@43:         fill_fopen64_filefunc(&ziinit.z_filefunc.zfile_func64);
Chris@43:     else
Chris@43:         ziinit.z_filefunc = *pzlib_filefunc64_32_def;
Chris@43: 
Chris@43:     ziinit.filestream = ZOPEN64(ziinit.z_filefunc,
Chris@43:                   pathname,
Chris@43:                   (append == APPEND_STATUS_CREATE) ?
Chris@43:                   (ZLIB_FILEFUNC_MODE_READ | ZLIB_FILEFUNC_MODE_WRITE | ZLIB_FILEFUNC_MODE_CREATE) :
Chris@43:                     (ZLIB_FILEFUNC_MODE_READ | ZLIB_FILEFUNC_MODE_WRITE | ZLIB_FILEFUNC_MODE_EXISTING));
Chris@43: 
Chris@43:     if (ziinit.filestream == NULL)
Chris@43:         return NULL;
Chris@43: 
Chris@43:     if (append == APPEND_STATUS_CREATEAFTER)
Chris@43:         ZSEEK64(ziinit.z_filefunc,ziinit.filestream,0,SEEK_END);
Chris@43: 
Chris@43:     ziinit.begin_pos = ZTELL64(ziinit.z_filefunc,ziinit.filestream);
Chris@43:     ziinit.in_opened_file_inzip = 0;
Chris@43:     ziinit.ci.stream_initialised = 0;
Chris@43:     ziinit.number_entry = 0;
Chris@43:     ziinit.add_position_when_writting_offset = 0;
Chris@43:     init_linkedlist(&(ziinit.central_dir));
Chris@43: 
Chris@43: 
Chris@43: 
Chris@43:     zi = (zip64_internal*)ALLOC(sizeof(zip64_internal));
Chris@43:     if (zi==NULL)
Chris@43:     {
Chris@43:         ZCLOSE64(ziinit.z_filefunc,ziinit.filestream);
Chris@43:         return NULL;
Chris@43:     }
Chris@43: 
Chris@43:     /* now we add file in a zipfile */
Chris@43: #    ifndef NO_ADDFILEINEXISTINGZIP
Chris@43:     ziinit.globalcomment = NULL;
Chris@43:     if (append == APPEND_STATUS_ADDINZIP)
Chris@43:     {
Chris@43:       // Read and Cache Central Directory Records
Chris@43:       err = LoadCentralDirectoryRecord(&ziinit);
Chris@43:     }
Chris@43: 
Chris@43:     if (globalcomment)
Chris@43:     {
Chris@43:       *globalcomment = ziinit.globalcomment;
Chris@43:     }
Chris@43: #    endif /* !NO_ADDFILEINEXISTINGZIP*/
Chris@43: 
Chris@43:     if (err != ZIP_OK)
Chris@43:     {
Chris@43: #    ifndef NO_ADDFILEINEXISTINGZIP
Chris@43:         TRYFREE(ziinit.globalcomment);
Chris@43: #    endif /* !NO_ADDFILEINEXISTINGZIP*/
Chris@43:         TRYFREE(zi);
Chris@43:         return NULL;
Chris@43:     }
Chris@43:     else
Chris@43:     {
Chris@43:         *zi = ziinit;
Chris@43:         return (zipFile)zi;
Chris@43:     }
Chris@43: }
Chris@43: 
Chris@43: extern zipFile ZEXPORT zipOpen2 (const char *pathname, int append, zipcharpc* globalcomment, zlib_filefunc_def* pzlib_filefunc32_def)
Chris@43: {
Chris@43:     if (pzlib_filefunc32_def != NULL)
Chris@43:     {
Chris@43:         zlib_filefunc64_32_def zlib_filefunc64_32_def_fill;
Chris@43:         fill_zlib_filefunc64_32_def_from_filefunc32(&zlib_filefunc64_32_def_fill,pzlib_filefunc32_def);
Chris@43:         return zipOpen3(pathname, append, globalcomment, &zlib_filefunc64_32_def_fill);
Chris@43:     }
Chris@43:     else
Chris@43:         return zipOpen3(pathname, append, globalcomment, NULL);
Chris@43: }
Chris@43: 
Chris@43: extern zipFile ZEXPORT zipOpen2_64 (const void *pathname, int append, zipcharpc* globalcomment, zlib_filefunc64_def* pzlib_filefunc_def)
Chris@43: {
Chris@43:     if (pzlib_filefunc_def != NULL)
Chris@43:     {
Chris@43:         zlib_filefunc64_32_def zlib_filefunc64_32_def_fill;
Chris@43:         zlib_filefunc64_32_def_fill.zfile_func64 = *pzlib_filefunc_def;
Chris@43:         zlib_filefunc64_32_def_fill.ztell32_file = NULL;
Chris@43:         zlib_filefunc64_32_def_fill.zseek32_file = NULL;
Chris@43:         return zipOpen3(pathname, append, globalcomment, &zlib_filefunc64_32_def_fill);
Chris@43:     }
Chris@43:     else
Chris@43:         return zipOpen3(pathname, append, globalcomment, NULL);
Chris@43: }
Chris@43: 
Chris@43: 
Chris@43: 
Chris@43: extern zipFile ZEXPORT zipOpen (const char* pathname, int append)
Chris@43: {
Chris@43:     return zipOpen3((const void*)pathname,append,NULL,NULL);
Chris@43: }
Chris@43: 
Chris@43: extern zipFile ZEXPORT zipOpen64 (const void* pathname, int append)
Chris@43: {
Chris@43:     return zipOpen3(pathname,append,NULL,NULL);
Chris@43: }
Chris@43: 
Chris@43: int Write_LocalFileHeader(zip64_internal* zi, const char* filename, uInt size_extrafield_local, const void* extrafield_local)
Chris@43: {
Chris@43:   /* write the local header */
Chris@43:   int err;
Chris@43:   uInt size_filename = (uInt)strlen(filename);
Chris@43:   uInt size_extrafield = size_extrafield_local;
Chris@43: 
Chris@43:   err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)LOCALHEADERMAGIC, 4);
Chris@43: 
Chris@43:   if (err==ZIP_OK)
Chris@43:   {
Chris@43:     if(zi->ci.zip64)
Chris@43:       err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)45,2);/* version needed to extract */
Chris@43:     else
Chris@43:       err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)20,2);/* version needed to extract */
Chris@43:   }
Chris@43: 
Chris@43:   if (err==ZIP_OK)
Chris@43:     err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.flag,2);
Chris@43: 
Chris@43:   if (err==ZIP_OK)
Chris@43:     err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.method,2);
Chris@43: 
Chris@43:   if (err==ZIP_OK)
Chris@43:     err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.dosDate,4);
Chris@43: 
Chris@43:   // CRC / Compressed size / Uncompressed size will be filled in later and rewritten later
Chris@43:   if (err==ZIP_OK)
Chris@43:     err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* crc 32, unknown */
Chris@43:   if (err==ZIP_OK)
Chris@43:   {
Chris@43:     if(zi->ci.zip64)
Chris@43:       err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0xFFFFFFFF,4); /* compressed size, unknown */
Chris@43:     else
Chris@43:       err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* compressed size, unknown */
Chris@43:   }
Chris@43:   if (err==ZIP_OK)
Chris@43:   {
Chris@43:     if(zi->ci.zip64)
Chris@43:       err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0xFFFFFFFF,4); /* uncompressed size, unknown */
Chris@43:     else
Chris@43:       err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* uncompressed size, unknown */
Chris@43:   }
Chris@43: 
Chris@43:   if (err==ZIP_OK)
Chris@43:     err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_filename,2);
Chris@43: 
Chris@43:   if(zi->ci.zip64)
Chris@43:   {
Chris@43:     size_extrafield += 20;
Chris@43:   }
Chris@43: 
Chris@43:   if (err==ZIP_OK)
Chris@43:     err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_extrafield,2);
Chris@43: 
Chris@43:   if ((err==ZIP_OK) && (size_filename > 0))
Chris@43:   {
Chris@43:     if (ZWRITE64(zi->z_filefunc,zi->filestream,filename,size_filename)!=size_filename)
Chris@43:       err = ZIP_ERRNO;
Chris@43:   }
Chris@43: 
Chris@43:   if ((err==ZIP_OK) && (size_extrafield_local > 0))
Chris@43:   {
Chris@43:     if (ZWRITE64(zi->z_filefunc, zi->filestream, extrafield_local, size_extrafield_local) != size_extrafield_local)
Chris@43:       err = ZIP_ERRNO;
Chris@43:   }
Chris@43: 
Chris@43: 
Chris@43:   if ((err==ZIP_OK) && (zi->ci.zip64))
Chris@43:   {
Chris@43:       // write the Zip64 extended info
Chris@43:       short HeaderID = 1;
Chris@43:       short DataSize = 16;
Chris@43:       ZPOS64_T CompressedSize = 0;
Chris@43:       ZPOS64_T UncompressedSize = 0;
Chris@43: 
Chris@43:       // Remember position of Zip64 extended info for the local file header. (needed when we update size after done with file)
Chris@43:       zi->ci.pos_zip64extrainfo = ZTELL64(zi->z_filefunc,zi->filestream);
Chris@43: 
Chris@43:       err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (short)HeaderID,2);
Chris@43:       err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (short)DataSize,2);
Chris@43: 
Chris@43:       err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (ZPOS64_T)UncompressedSize,8);
Chris@43:       err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (ZPOS64_T)CompressedSize,8);
Chris@43:   }
Chris@43: 
Chris@43:   return err;
Chris@43: }
Chris@43: 
Chris@43: /*
Chris@43:  NOTE.
Chris@43:  When writing RAW the ZIP64 extended information in extrafield_local and extrafield_global needs to be stripped
Chris@43:  before calling this function it can be done with zipRemoveExtraInfoBlock
Chris@43: 
Chris@43:  It is not done here because then we need to realloc a new buffer since parameters are 'const' and I want to minimize
Chris@43:  unnecessary allocations.
Chris@43:  */
Chris@43: extern int ZEXPORT zipOpenNewFileInZip4_64 (zipFile file, const char* filename, const zip_fileinfo* zipfi,
Chris@43:                                          const void* extrafield_local, uInt size_extrafield_local,
Chris@43:                                          const void* extrafield_global, uInt size_extrafield_global,
Chris@43:                                          const char* comment, int method, int level, int raw,
Chris@43:                                          int windowBits,int memLevel, int strategy,
Chris@43:                                          const char* password, uLong crcForCrypting,
Chris@43:                                          uLong versionMadeBy, uLong flagBase, int zip64)
Chris@43: {
Chris@43:     zip64_internal* zi;
Chris@43:     uInt size_filename;
Chris@43:     uInt size_comment;
Chris@43:     uInt i;
Chris@43:     int err = ZIP_OK;
Chris@43: 
Chris@43: #    ifdef NOCRYPT
Chris@43:     (crcForCrypting);
Chris@43:     if (password != NULL)
Chris@43:         return ZIP_PARAMERROR;
Chris@43: #    endif
Chris@43: 
Chris@43:     if (file == NULL)
Chris@43:         return ZIP_PARAMERROR;
Chris@43: 
Chris@43: #ifdef HAVE_BZIP2
Chris@43:     if ((method!=0) && (method!=Z_DEFLATED) && (method!=Z_BZIP2ED))
Chris@43:       return ZIP_PARAMERROR;
Chris@43: #else
Chris@43:     if ((method!=0) && (method!=Z_DEFLATED))
Chris@43:       return ZIP_PARAMERROR;
Chris@43: #endif
Chris@43: 
Chris@43:     zi = (zip64_internal*)file;
Chris@43: 
Chris@43:     if (zi->in_opened_file_inzip == 1)
Chris@43:     {
Chris@43:         err = zipCloseFileInZip (file);
Chris@43:         if (err != ZIP_OK)
Chris@43:             return err;
Chris@43:     }
Chris@43: 
Chris@43:     if (filename==NULL)
Chris@43:         filename="-";
Chris@43: 
Chris@43:     if (comment==NULL)
Chris@43:         size_comment = 0;
Chris@43:     else
Chris@43:         size_comment = (uInt)strlen(comment);
Chris@43: 
Chris@43:     size_filename = (uInt)strlen(filename);
Chris@43: 
Chris@43:     if (zipfi == NULL)
Chris@43:         zi->ci.dosDate = 0;
Chris@43:     else
Chris@43:     {
Chris@43:         if (zipfi->dosDate != 0)
Chris@43:             zi->ci.dosDate = zipfi->dosDate;
Chris@43:         else
Chris@43:           zi->ci.dosDate = zip64local_TmzDateToDosDate(&zipfi->tmz_date);
Chris@43:     }
Chris@43: 
Chris@43:     zi->ci.flag = flagBase;
Chris@43:     if ((level==8) || (level==9))
Chris@43:       zi->ci.flag |= 2;
Chris@43:     if (level==2)
Chris@43:       zi->ci.flag |= 4;
Chris@43:     if (level==1)
Chris@43:       zi->ci.flag |= 6;
Chris@43:     if (password != NULL)
Chris@43:       zi->ci.flag |= 1;
Chris@43: 
Chris@43:     zi->ci.crc32 = 0;
Chris@43:     zi->ci.method = method;
Chris@43:     zi->ci.encrypt = 0;
Chris@43:     zi->ci.stream_initialised = 0;
Chris@43:     zi->ci.pos_in_buffered_data = 0;
Chris@43:     zi->ci.raw = raw;
Chris@43:     zi->ci.pos_local_header = ZTELL64(zi->z_filefunc,zi->filestream);
Chris@43: 
Chris@43:     zi->ci.size_centralheader = SIZECENTRALHEADER + size_filename + size_extrafield_global + size_comment;
Chris@43:     zi->ci.size_centralExtraFree = 32; // Extra space we have reserved in case we need to add ZIP64 extra info data
Chris@43: 
Chris@43:     zi->ci.central_header = (char*)ALLOC((uInt)zi->ci.size_centralheader + zi->ci.size_centralExtraFree);
Chris@43: 
Chris@43:     zi->ci.size_centralExtra = size_extrafield_global;
Chris@43:     zip64local_putValue_inmemory(zi->ci.central_header,(uLong)CENTRALHEADERMAGIC,4);
Chris@43:     /* version info */
Chris@43:     zip64local_putValue_inmemory(zi->ci.central_header+4,(uLong)versionMadeBy,2);
Chris@43:     zip64local_putValue_inmemory(zi->ci.central_header+6,(uLong)20,2);
Chris@43:     zip64local_putValue_inmemory(zi->ci.central_header+8,(uLong)zi->ci.flag,2);
Chris@43:     zip64local_putValue_inmemory(zi->ci.central_header+10,(uLong)zi->ci.method,2);
Chris@43:     zip64local_putValue_inmemory(zi->ci.central_header+12,(uLong)zi->ci.dosDate,4);
Chris@43:     zip64local_putValue_inmemory(zi->ci.central_header+16,(uLong)0,4); /*crc*/
Chris@43:     zip64local_putValue_inmemory(zi->ci.central_header+20,(uLong)0,4); /*compr size*/
Chris@43:     zip64local_putValue_inmemory(zi->ci.central_header+24,(uLong)0,4); /*uncompr size*/
Chris@43:     zip64local_putValue_inmemory(zi->ci.central_header+28,(uLong)size_filename,2);
Chris@43:     zip64local_putValue_inmemory(zi->ci.central_header+30,(uLong)size_extrafield_global,2);
Chris@43:     zip64local_putValue_inmemory(zi->ci.central_header+32,(uLong)size_comment,2);
Chris@43:     zip64local_putValue_inmemory(zi->ci.central_header+34,(uLong)0,2); /*disk nm start*/
Chris@43: 
Chris@43:     if (zipfi==NULL)
Chris@43:         zip64local_putValue_inmemory(zi->ci.central_header+36,(uLong)0,2);
Chris@43:     else
Chris@43:         zip64local_putValue_inmemory(zi->ci.central_header+36,(uLong)zipfi->internal_fa,2);
Chris@43: 
Chris@43:     if (zipfi==NULL)
Chris@43:         zip64local_putValue_inmemory(zi->ci.central_header+38,(uLong)0,4);
Chris@43:     else
Chris@43:         zip64local_putValue_inmemory(zi->ci.central_header+38,(uLong)zipfi->external_fa,4);
Chris@43: 
Chris@43:     if(zi->ci.pos_local_header >= 0xffffffff)
Chris@43:       zip64local_putValue_inmemory(zi->ci.central_header+42,(uLong)0xffffffff,4);
Chris@43:     else
Chris@43:       zip64local_putValue_inmemory(zi->ci.central_header+42,(uLong)zi->ci.pos_local_header - zi->add_position_when_writting_offset,4);
Chris@43: 
Chris@43:     for (i=0;i<size_filename;i++)
Chris@43:         *(zi->ci.central_header+SIZECENTRALHEADER+i) = *(filename+i);
Chris@43: 
Chris@43:     for (i=0;i<size_extrafield_global;i++)
Chris@43:         *(zi->ci.central_header+SIZECENTRALHEADER+size_filename+i) =
Chris@43:               *(((const char*)extrafield_global)+i);
Chris@43: 
Chris@43:     for (i=0;i<size_comment;i++)
Chris@43:         *(zi->ci.central_header+SIZECENTRALHEADER+size_filename+
Chris@43:               size_extrafield_global+i) = *(comment+i);
Chris@43:     if (zi->ci.central_header == NULL)
Chris@43:         return ZIP_INTERNALERROR;
Chris@43: 
Chris@43:     zi->ci.zip64 = zip64;
Chris@43:     zi->ci.totalCompressedData = 0;
Chris@43:     zi->ci.totalUncompressedData = 0;
Chris@43:     zi->ci.pos_zip64extrainfo = 0;
Chris@43: 
Chris@43:     err = Write_LocalFileHeader(zi, filename, size_extrafield_local, extrafield_local);
Chris@43: 
Chris@43: #ifdef HAVE_BZIP2
Chris@43:     zi->ci.bstream.avail_in = (uInt)0;
Chris@43:     zi->ci.bstream.avail_out = (uInt)Z_BUFSIZE;
Chris@43:     zi->ci.bstream.next_out = (char*)zi->ci.buffered_data;
Chris@43:     zi->ci.bstream.total_in_hi32 = 0;
Chris@43:     zi->ci.bstream.total_in_lo32 = 0;
Chris@43:     zi->ci.bstream.total_out_hi32 = 0;
Chris@43:     zi->ci.bstream.total_out_lo32 = 0;
Chris@43: #endif
Chris@43: 
Chris@43:     zi->ci.stream.avail_in = (uInt)0;
Chris@43:     zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
Chris@43:     zi->ci.stream.next_out = zi->ci.buffered_data;
Chris@43:     zi->ci.stream.total_in = 0;
Chris@43:     zi->ci.stream.total_out = 0;
Chris@43:     zi->ci.stream.data_type = Z_BINARY;
Chris@43: 
Chris@43: #ifdef HAVE_BZIP2
Chris@43:     if ((err==ZIP_OK) && (zi->ci.method == Z_DEFLATED || zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw))
Chris@43: #else
Chris@43:     if ((err==ZIP_OK) && (zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
Chris@43: #endif
Chris@43:     {
Chris@43:         if(zi->ci.method == Z_DEFLATED)
Chris@43:         {
Chris@43:           zi->ci.stream.zalloc = (alloc_func)0;
Chris@43:           zi->ci.stream.zfree = (free_func)0;
Chris@43:           zi->ci.stream.opaque = (voidpf)0;
Chris@43: 
Chris@43:           if (windowBits>0)
Chris@43:               windowBits = -windowBits;
Chris@43: 
Chris@43:           err = deflateInit2(&zi->ci.stream, level, Z_DEFLATED, windowBits, memLevel, strategy);
Chris@43: 
Chris@43:           if (err==Z_OK)
Chris@43:               zi->ci.stream_initialised = Z_DEFLATED;
Chris@43:         }
Chris@43:         else if(zi->ci.method == Z_BZIP2ED)
Chris@43:         {
Chris@43: #ifdef HAVE_BZIP2
Chris@43:             // Init BZip stuff here
Chris@43:           zi->ci.bstream.bzalloc = 0;
Chris@43:           zi->ci.bstream.bzfree = 0;
Chris@43:           zi->ci.bstream.opaque = (voidpf)0;
Chris@43: 
Chris@43:           err = BZ2_bzCompressInit(&zi->ci.bstream, level, 0,35);
Chris@43:           if(err == BZ_OK)
Chris@43:             zi->ci.stream_initialised = Z_BZIP2ED;
Chris@43: #endif
Chris@43:         }
Chris@43: 
Chris@43:     }
Chris@43: 
Chris@43: #    ifndef NOCRYPT
Chris@43:     zi->ci.crypt_header_size = 0;
Chris@43:     if ((err==Z_OK) && (password != NULL))
Chris@43:     {
Chris@43:         unsigned char bufHead[RAND_HEAD_LEN];
Chris@43:         unsigned int sizeHead;
Chris@43:         zi->ci.encrypt = 1;
Chris@43:         zi->ci.pcrc_32_tab = get_crc_table();
Chris@43:         /*init_keys(password,zi->ci.keys,zi->ci.pcrc_32_tab);*/
Chris@43: 
Chris@43:         sizeHead=crypthead(password,bufHead,RAND_HEAD_LEN,zi->ci.keys,zi->ci.pcrc_32_tab,crcForCrypting);
Chris@43:         zi->ci.crypt_header_size = sizeHead;
Chris@43: 
Chris@43:         if (ZWRITE64(zi->z_filefunc,zi->filestream,bufHead,sizeHead) != sizeHead)
Chris@43:                 err = ZIP_ERRNO;
Chris@43:     }
Chris@43: #    endif
Chris@43: 
Chris@43:     if (err==Z_OK)
Chris@43:         zi->in_opened_file_inzip = 1;
Chris@43:     return err;
Chris@43: }
Chris@43: 
Chris@43: extern int ZEXPORT zipOpenNewFileInZip4 (zipFile file, const char* filename, const zip_fileinfo* zipfi,
Chris@43:                                          const void* extrafield_local, uInt size_extrafield_local,
Chris@43:                                          const void* extrafield_global, uInt size_extrafield_global,
Chris@43:                                          const char* comment, int method, int level, int raw,
Chris@43:                                          int windowBits,int memLevel, int strategy,
Chris@43:                                          const char* password, uLong crcForCrypting,
Chris@43:                                          uLong versionMadeBy, uLong flagBase)
Chris@43: {
Chris@43:     return zipOpenNewFileInZip4_64 (file, filename, zipfi,
Chris@43:                                  extrafield_local, size_extrafield_local,
Chris@43:                                  extrafield_global, size_extrafield_global,
Chris@43:                                  comment, method, level, raw,
Chris@43:                                  windowBits, memLevel, strategy,
Chris@43:                                  password, crcForCrypting, versionMadeBy, flagBase, 0);
Chris@43: }
Chris@43: 
Chris@43: extern int ZEXPORT zipOpenNewFileInZip3 (zipFile file, const char* filename, const zip_fileinfo* zipfi,
Chris@43:                                          const void* extrafield_local, uInt size_extrafield_local,
Chris@43:                                          const void* extrafield_global, uInt size_extrafield_global,
Chris@43:                                          const char* comment, int method, int level, int raw,
Chris@43:                                          int windowBits,int memLevel, int strategy,
Chris@43:                                          const char* password, uLong crcForCrypting)
Chris@43: {
Chris@43:     return zipOpenNewFileInZip4_64 (file, filename, zipfi,
Chris@43:                                  extrafield_local, size_extrafield_local,
Chris@43:                                  extrafield_global, size_extrafield_global,
Chris@43:                                  comment, method, level, raw,
Chris@43:                                  windowBits, memLevel, strategy,
Chris@43:                                  password, crcForCrypting, VERSIONMADEBY, 0, 0);
Chris@43: }
Chris@43: 
Chris@43: extern int ZEXPORT zipOpenNewFileInZip3_64(zipFile file, const char* filename, const zip_fileinfo* zipfi,
Chris@43:                                          const void* extrafield_local, uInt size_extrafield_local,
Chris@43:                                          const void* extrafield_global, uInt size_extrafield_global,
Chris@43:                                          const char* comment, int method, int level, int raw,
Chris@43:                                          int windowBits,int memLevel, int strategy,
Chris@43:                                          const char* password, uLong crcForCrypting, int zip64)
Chris@43: {
Chris@43:     return zipOpenNewFileInZip4_64 (file, filename, zipfi,
Chris@43:                                  extrafield_local, size_extrafield_local,
Chris@43:                                  extrafield_global, size_extrafield_global,
Chris@43:                                  comment, method, level, raw,
Chris@43:                                  windowBits, memLevel, strategy,
Chris@43:                                  password, crcForCrypting, VERSIONMADEBY, 0, zip64);
Chris@43: }
Chris@43: 
Chris@43: extern int ZEXPORT zipOpenNewFileInZip2(zipFile file, const char* filename, const zip_fileinfo* zipfi,
Chris@43:                                         const void* extrafield_local, uInt size_extrafield_local,
Chris@43:                                         const void* extrafield_global, uInt size_extrafield_global,
Chris@43:                                         const char* comment, int method, int level, int raw)
Chris@43: {
Chris@43:     return zipOpenNewFileInZip4_64 (file, filename, zipfi,
Chris@43:                                  extrafield_local, size_extrafield_local,
Chris@43:                                  extrafield_global, size_extrafield_global,
Chris@43:                                  comment, method, level, raw,
Chris@43:                                  -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
Chris@43:                                  NULL, 0, VERSIONMADEBY, 0, 0);
Chris@43: }
Chris@43: 
Chris@43: extern int ZEXPORT zipOpenNewFileInZip2_64(zipFile file, const char* filename, const zip_fileinfo* zipfi,
Chris@43:                                         const void* extrafield_local, uInt size_extrafield_local,
Chris@43:                                         const void* extrafield_global, uInt size_extrafield_global,
Chris@43:                                         const char* comment, int method, int level, int raw, int zip64)
Chris@43: {
Chris@43:     return zipOpenNewFileInZip4_64 (file, filename, zipfi,
Chris@43:                                  extrafield_local, size_extrafield_local,
Chris@43:                                  extrafield_global, size_extrafield_global,
Chris@43:                                  comment, method, level, raw,
Chris@43:                                  -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
Chris@43:                                  NULL, 0, VERSIONMADEBY, 0, zip64);
Chris@43: }
Chris@43: 
Chris@43: extern int ZEXPORT zipOpenNewFileInZip64 (zipFile file, const char* filename, const zip_fileinfo* zipfi,
Chris@43:                                         const void* extrafield_local, uInt size_extrafield_local,
Chris@43:                                         const void*extrafield_global, uInt size_extrafield_global,
Chris@43:                                         const char* comment, int method, int level, int zip64)
Chris@43: {
Chris@43:     return zipOpenNewFileInZip4_64 (file, filename, zipfi,
Chris@43:                                  extrafield_local, size_extrafield_local,
Chris@43:                                  extrafield_global, size_extrafield_global,
Chris@43:                                  comment, method, level, 0,
Chris@43:                                  -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
Chris@43:                                  NULL, 0, VERSIONMADEBY, 0, zip64);
Chris@43: }
Chris@43: 
Chris@43: extern int ZEXPORT zipOpenNewFileInZip (zipFile file, const char* filename, const zip_fileinfo* zipfi,
Chris@43:                                         const void* extrafield_local, uInt size_extrafield_local,
Chris@43:                                         const void*extrafield_global, uInt size_extrafield_global,
Chris@43:                                         const char* comment, int method, int level)
Chris@43: {
Chris@43:     return zipOpenNewFileInZip4_64 (file, filename, zipfi,
Chris@43:                                  extrafield_local, size_extrafield_local,
Chris@43:                                  extrafield_global, size_extrafield_global,
Chris@43:                                  comment, method, level, 0,
Chris@43:                                  -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
Chris@43:                                  NULL, 0, VERSIONMADEBY, 0, 0);
Chris@43: }
Chris@43: 
Chris@43: local int zip64FlushWriteBuffer(zip64_internal* zi)
Chris@43: {
Chris@43:     int err=ZIP_OK;
Chris@43: 
Chris@43:     if (zi->ci.encrypt != 0)
Chris@43:     {
Chris@43: #ifndef NOCRYPT
Chris@43:         uInt i;
Chris@43:         int t;
Chris@43:         for (i=0;i<zi->ci.pos_in_buffered_data;i++)
Chris@43:             zi->ci.buffered_data[i] = zencode(zi->ci.keys, zi->ci.pcrc_32_tab, zi->ci.buffered_data[i],t);
Chris@43: #endif
Chris@43:     }
Chris@43: 
Chris@43:     if (ZWRITE64(zi->z_filefunc,zi->filestream,zi->ci.buffered_data,zi->ci.pos_in_buffered_data) != zi->ci.pos_in_buffered_data)
Chris@43:       err = ZIP_ERRNO;
Chris@43: 
Chris@43:     zi->ci.totalCompressedData += zi->ci.pos_in_buffered_data;
Chris@43: 
Chris@43: #ifdef HAVE_BZIP2
Chris@43:     if(zi->ci.method == Z_BZIP2ED)
Chris@43:     {
Chris@43:       zi->ci.totalUncompressedData += zi->ci.bstream.total_in_lo32;
Chris@43:       zi->ci.bstream.total_in_lo32 = 0;
Chris@43:       zi->ci.bstream.total_in_hi32 = 0;
Chris@43:     }
Chris@43:     else
Chris@43: #endif
Chris@43:     {
Chris@43:       zi->ci.totalUncompressedData += zi->ci.stream.total_in;
Chris@43:       zi->ci.stream.total_in = 0;
Chris@43:     }
Chris@43: 
Chris@43: 
Chris@43:     zi->ci.pos_in_buffered_data = 0;
Chris@43: 
Chris@43:     return err;
Chris@43: }
Chris@43: 
Chris@43: extern int ZEXPORT zipWriteInFileInZip (zipFile file,const void* buf,unsigned int len)
Chris@43: {
Chris@43:     zip64_internal* zi;
Chris@43:     int err=ZIP_OK;
Chris@43: 
Chris@43:     if (file == NULL)
Chris@43:         return ZIP_PARAMERROR;
Chris@43:     zi = (zip64_internal*)file;
Chris@43: 
Chris@43:     if (zi->in_opened_file_inzip == 0)
Chris@43:         return ZIP_PARAMERROR;
Chris@43: 
Chris@43:     zi->ci.crc32 = crc32(zi->ci.crc32,buf,(uInt)len);
Chris@43: 
Chris@43: #ifdef HAVE_BZIP2
Chris@43:     if(zi->ci.method == Z_BZIP2ED && (!zi->ci.raw))
Chris@43:     {
Chris@43:       zi->ci.bstream.next_in = (void*)buf;
Chris@43:       zi->ci.bstream.avail_in = len;
Chris@43:       err = BZ_RUN_OK;
Chris@43: 
Chris@43:       while ((err==BZ_RUN_OK) && (zi->ci.bstream.avail_in>0))
Chris@43:       {
Chris@43:         if (zi->ci.bstream.avail_out == 0)
Chris@43:         {
Chris@43:           if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
Chris@43:             err = ZIP_ERRNO;
Chris@43:           zi->ci.bstream.avail_out = (uInt)Z_BUFSIZE;
Chris@43:           zi->ci.bstream.next_out = (char*)zi->ci.buffered_data;
Chris@43:         }
Chris@43: 
Chris@43: 
Chris@43:         if(err != BZ_RUN_OK)
Chris@43:           break;
Chris@43: 
Chris@43:         if ((zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw))
Chris@43:         {
Chris@43:           uLong uTotalOutBefore_lo = zi->ci.bstream.total_out_lo32;
Chris@43: //          uLong uTotalOutBefore_hi = zi->ci.bstream.total_out_hi32;
Chris@43:           err=BZ2_bzCompress(&zi->ci.bstream,  BZ_RUN);
Chris@43: 
Chris@43:           zi->ci.pos_in_buffered_data += (uInt)(zi->ci.bstream.total_out_lo32 - uTotalOutBefore_lo) ;
Chris@43:         }
Chris@43:       }
Chris@43: 
Chris@43:       if(err == BZ_RUN_OK)
Chris@43:         err = ZIP_OK;
Chris@43:     }
Chris@43:     else
Chris@43: #endif
Chris@43:     {
Chris@43:       zi->ci.stream.next_in = (Bytef*)buf;
Chris@43:       zi->ci.stream.avail_in = len;
Chris@43: 
Chris@43:       while ((err==ZIP_OK) && (zi->ci.stream.avail_in>0))
Chris@43:       {
Chris@43:           if (zi->ci.stream.avail_out == 0)
Chris@43:           {
Chris@43:               if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
Chris@43:                   err = ZIP_ERRNO;
Chris@43:               zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
Chris@43:               zi->ci.stream.next_out = zi->ci.buffered_data;
Chris@43:           }
Chris@43: 
Chris@43: 
Chris@43:           if(err != ZIP_OK)
Chris@43:               break;
Chris@43: 
Chris@43:           if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
Chris@43:           {
Chris@43:               uLong uTotalOutBefore = zi->ci.stream.total_out;
Chris@43:               err=deflate(&zi->ci.stream,  Z_NO_FLUSH);
Chris@43:               if(uTotalOutBefore > zi->ci.stream.total_out)
Chris@43:               {
Chris@43:                 int bBreak = 0;
Chris@43:                 bBreak++;
Chris@43:               }
Chris@43: 
Chris@43:               zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ;
Chris@43:           }
Chris@43:           else
Chris@43:           {
Chris@43:               uInt copy_this,i;
Chris@43:               if (zi->ci.stream.avail_in < zi->ci.stream.avail_out)
Chris@43:                   copy_this = zi->ci.stream.avail_in;
Chris@43:               else
Chris@43:                   copy_this = zi->ci.stream.avail_out;
Chris@43: 
Chris@43:               for (i = 0; i < copy_this; i++)
Chris@43:                   *(((char*)zi->ci.stream.next_out)+i) =
Chris@43:                       *(((const char*)zi->ci.stream.next_in)+i);
Chris@43:               {
Chris@43:                   zi->ci.stream.avail_in -= copy_this;
Chris@43:                   zi->ci.stream.avail_out-= copy_this;
Chris@43:                   zi->ci.stream.next_in+= copy_this;
Chris@43:                   zi->ci.stream.next_out+= copy_this;
Chris@43:                   zi->ci.stream.total_in+= copy_this;
Chris@43:                   zi->ci.stream.total_out+= copy_this;
Chris@43:                   zi->ci.pos_in_buffered_data += copy_this;
Chris@43:               }
Chris@43:           }
Chris@43:       }// while(...)
Chris@43:     }
Chris@43: 
Chris@43:     return err;
Chris@43: }
Chris@43: 
Chris@43: extern int ZEXPORT zipCloseFileInZipRaw (zipFile file, uLong uncompressed_size, uLong crc32)
Chris@43: {
Chris@43:     return zipCloseFileInZipRaw64 (file, uncompressed_size, crc32);
Chris@43: }
Chris@43: 
Chris@43: extern int ZEXPORT zipCloseFileInZipRaw64 (zipFile file, ZPOS64_T uncompressed_size, uLong crc32)
Chris@43: {
Chris@43:     zip64_internal* zi;
Chris@43:     ZPOS64_T compressed_size;
Chris@43:     uLong invalidValue = 0xffffffff;
Chris@43:     short datasize = 0;
Chris@43:     int err=ZIP_OK;
Chris@43: 
Chris@43:     if (file == NULL)
Chris@43:         return ZIP_PARAMERROR;
Chris@43:     zi = (zip64_internal*)file;
Chris@43: 
Chris@43:     if (zi->in_opened_file_inzip == 0)
Chris@43:         return ZIP_PARAMERROR;
Chris@43:     zi->ci.stream.avail_in = 0;
Chris@43: 
Chris@43:     if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
Chris@43:                 {
Chris@43:                         while (err==ZIP_OK)
Chris@43:                         {
Chris@43:                                 uLong uTotalOutBefore;
Chris@43:                                 if (zi->ci.stream.avail_out == 0)
Chris@43:                                 {
Chris@43:                                         if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
Chris@43:                                                 err = ZIP_ERRNO;
Chris@43:                                         zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
Chris@43:                                         zi->ci.stream.next_out = zi->ci.buffered_data;
Chris@43:                                 }
Chris@43:                                 uTotalOutBefore = zi->ci.stream.total_out;
Chris@43:                                 err=deflate(&zi->ci.stream,  Z_FINISH);
Chris@43:                                 zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ;
Chris@43:                         }
Chris@43:                 }
Chris@43:     else if ((zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw))
Chris@43:     {
Chris@43: #ifdef HAVE_BZIP2
Chris@43:       err = BZ_FINISH_OK;
Chris@43:       while (err==BZ_FINISH_OK)
Chris@43:       {
Chris@43:         uLong uTotalOutBefore;
Chris@43:         if (zi->ci.bstream.avail_out == 0)
Chris@43:         {
Chris@43:           if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
Chris@43:             err = ZIP_ERRNO;
Chris@43:           zi->ci.bstream.avail_out = (uInt)Z_BUFSIZE;
Chris@43:           zi->ci.bstream.next_out = (char*)zi->ci.buffered_data;
Chris@43:         }
Chris@43:         uTotalOutBefore = zi->ci.bstream.total_out_lo32;
Chris@43:         err=BZ2_bzCompress(&zi->ci.bstream,  BZ_FINISH);
Chris@43:         if(err == BZ_STREAM_END)
Chris@43:           err = Z_STREAM_END;
Chris@43: 
Chris@43:         zi->ci.pos_in_buffered_data += (uInt)(zi->ci.bstream.total_out_lo32 - uTotalOutBefore);
Chris@43:       }
Chris@43: 
Chris@43:       if(err == BZ_FINISH_OK)
Chris@43:         err = ZIP_OK;
Chris@43: #endif
Chris@43:     }
Chris@43: 
Chris@43:     if (err==Z_STREAM_END)
Chris@43:         err=ZIP_OK; /* this is normal */
Chris@43: 
Chris@43:     if ((zi->ci.pos_in_buffered_data>0) && (err==ZIP_OK))
Chris@43:                 {
Chris@43:         if (zip64FlushWriteBuffer(zi)==ZIP_ERRNO)
Chris@43:             err = ZIP_ERRNO;
Chris@43:                 }
Chris@43: 
Chris@43:     if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
Chris@43:     {
Chris@43:         int tmp_err = deflateEnd(&zi->ci.stream);
Chris@43:         if (err == ZIP_OK)
Chris@43:             err = tmp_err;
Chris@43:         zi->ci.stream_initialised = 0;
Chris@43:     }
Chris@43: #ifdef HAVE_BZIP2
Chris@43:     else if((zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw))
Chris@43:     {
Chris@43:       int tmperr = BZ2_bzCompressEnd(&zi->ci.bstream);
Chris@43:                         if (err==ZIP_OK)
Chris@43:                                 err = tmperr;
Chris@43:                         zi->ci.stream_initialised = 0;
Chris@43:     }
Chris@43: #endif
Chris@43: 
Chris@43:     if (!zi->ci.raw)
Chris@43:     {
Chris@43:         crc32 = (uLong)zi->ci.crc32;
Chris@43:         uncompressed_size = zi->ci.totalUncompressedData;
Chris@43:     }
Chris@43:     compressed_size = zi->ci.totalCompressedData;
Chris@43: 
Chris@43: #    ifndef NOCRYPT
Chris@43:     compressed_size += zi->ci.crypt_header_size;
Chris@43: #    endif
Chris@43: 
Chris@43:     // update Current Item crc and sizes,
Chris@43:     if(compressed_size >= 0xffffffff || uncompressed_size >= 0xffffffff || zi->ci.pos_local_header >= 0xffffffff)
Chris@43:     {
Chris@43:       /*version Made by*/
Chris@43:       zip64local_putValue_inmemory(zi->ci.central_header+4,(uLong)45,2);
Chris@43:       /*version needed*/
Chris@43:       zip64local_putValue_inmemory(zi->ci.central_header+6,(uLong)45,2);
Chris@43: 
Chris@43:     }
Chris@43: 
Chris@43:     zip64local_putValue_inmemory(zi->ci.central_header+16,crc32,4); /*crc*/
Chris@43: 
Chris@43: 
Chris@43:     if(compressed_size >= 0xffffffff)
Chris@43:       zip64local_putValue_inmemory(zi->ci.central_header+20, invalidValue,4); /*compr size*/
Chris@43:     else
Chris@43:       zip64local_putValue_inmemory(zi->ci.central_header+20, compressed_size,4); /*compr size*/
Chris@43: 
Chris@43:     /// set internal file attributes field
Chris@43:     if (zi->ci.stream.data_type == Z_ASCII)
Chris@43:         zip64local_putValue_inmemory(zi->ci.central_header+36,(uLong)Z_ASCII,2);
Chris@43: 
Chris@43:     if(uncompressed_size >= 0xffffffff)
Chris@43:       zip64local_putValue_inmemory(zi->ci.central_header+24, invalidValue,4); /*uncompr size*/
Chris@43:     else
Chris@43:       zip64local_putValue_inmemory(zi->ci.central_header+24, uncompressed_size,4); /*uncompr size*/
Chris@43: 
Chris@43:     // Add ZIP64 extra info field for uncompressed size
Chris@43:     if(uncompressed_size >= 0xffffffff)
Chris@43:       datasize += 8;
Chris@43: 
Chris@43:     // Add ZIP64 extra info field for compressed size
Chris@43:     if(compressed_size >= 0xffffffff)
Chris@43:       datasize += 8;
Chris@43: 
Chris@43:     // Add ZIP64 extra info field for relative offset to local file header of current file
Chris@43:     if(zi->ci.pos_local_header >= 0xffffffff)
Chris@43:       datasize += 8;
Chris@43: 
Chris@43:     if(datasize > 0)
Chris@43:     {
Chris@43:       char* p = NULL;
Chris@43: 
Chris@43:       if((uLong)(datasize + 4) > zi->ci.size_centralExtraFree)
Chris@43:       {
Chris@43:         // we can not write more data to the buffer that we have room for.
Chris@43:         return ZIP_BADZIPFILE;
Chris@43:       }
Chris@43: 
Chris@43:       p = zi->ci.central_header + zi->ci.size_centralheader;
Chris@43: 
Chris@43:       // Add Extra Information Header for 'ZIP64 information'
Chris@43:       zip64local_putValue_inmemory(p, 0x0001, 2); // HeaderID
Chris@43:       p += 2;
Chris@43:       zip64local_putValue_inmemory(p, datasize, 2); // DataSize
Chris@43:       p += 2;
Chris@43: 
Chris@43:       if(uncompressed_size >= 0xffffffff)
Chris@43:       {
Chris@43:         zip64local_putValue_inmemory(p, uncompressed_size, 8);
Chris@43:         p += 8;
Chris@43:       }
Chris@43: 
Chris@43:       if(compressed_size >= 0xffffffff)
Chris@43:       {
Chris@43:         zip64local_putValue_inmemory(p, compressed_size, 8);
Chris@43:         p += 8;
Chris@43:       }
Chris@43: 
Chris@43:       if(zi->ci.pos_local_header >= 0xffffffff)
Chris@43:       {
Chris@43:         zip64local_putValue_inmemory(p, zi->ci.pos_local_header, 8);
Chris@43:         p += 8;
Chris@43:       }
Chris@43: 
Chris@43:       // Update how much extra free space we got in the memory buffer
Chris@43:       // and increase the centralheader size so the new ZIP64 fields are included
Chris@43:       // ( 4 below is the size of HeaderID and DataSize field )
Chris@43:       zi->ci.size_centralExtraFree -= datasize + 4;
Chris@43:       zi->ci.size_centralheader += datasize + 4;
Chris@43: 
Chris@43:       // Update the extra info size field
Chris@43:       zi->ci.size_centralExtra += datasize + 4;
Chris@43:       zip64local_putValue_inmemory(zi->ci.central_header+30,(uLong)zi->ci.size_centralExtra,2);
Chris@43:     }
Chris@43: 
Chris@43:     if (err==ZIP_OK)
Chris@43:         err = add_data_in_datablock(&zi->central_dir, zi->ci.central_header, (uLong)zi->ci.size_centralheader);
Chris@43: 
Chris@43:     free(zi->ci.central_header);
Chris@43: 
Chris@43:     if (err==ZIP_OK)
Chris@43:     {
Chris@43:         // Update the LocalFileHeader with the new values.
Chris@43: 
Chris@43:         ZPOS64_T cur_pos_inzip = ZTELL64(zi->z_filefunc,zi->filestream);
Chris@43: 
Chris@43:         if (ZSEEK64(zi->z_filefunc,zi->filestream, zi->ci.pos_local_header + 14,ZLIB_FILEFUNC_SEEK_SET)!=0)
Chris@43:             err = ZIP_ERRNO;
Chris@43: 
Chris@43:         if (err==ZIP_OK)
Chris@43:             err = zip64local_putValue(&zi->z_filefunc,zi->filestream,crc32,4); /* crc 32, unknown */
Chris@43: 
Chris@43:         if(uncompressed_size >= 0xffffffff || compressed_size >= 0xffffffff )
Chris@43:         {
Chris@43:           if(zi->ci.pos_zip64extrainfo > 0)
Chris@43:           {
Chris@43:             // Update the size in the ZIP64 extended field.
Chris@43:             if (ZSEEK64(zi->z_filefunc,zi->filestream, zi->ci.pos_zip64extrainfo + 4,ZLIB_FILEFUNC_SEEK_SET)!=0)
Chris@43:               err = ZIP_ERRNO;
Chris@43: 
Chris@43:             if (err==ZIP_OK) /* compressed size, unknown */
Chris@43:               err = zip64local_putValue(&zi->z_filefunc, zi->filestream, uncompressed_size, 8);
Chris@43: 
Chris@43:             if (err==ZIP_OK) /* uncompressed size, unknown */
Chris@43:               err = zip64local_putValue(&zi->z_filefunc, zi->filestream, compressed_size, 8);
Chris@43:           }
Chris@43:           else
Chris@43:               err = ZIP_BADZIPFILE; // Caller passed zip64 = 0, so no room for zip64 info -> fatal
Chris@43:         }
Chris@43:         else
Chris@43:         {
Chris@43:           if (err==ZIP_OK) /* compressed size, unknown */
Chris@43:               err = zip64local_putValue(&zi->z_filefunc,zi->filestream,compressed_size,4);
Chris@43: 
Chris@43:           if (err==ZIP_OK) /* uncompressed size, unknown */
Chris@43:               err = zip64local_putValue(&zi->z_filefunc,zi->filestream,uncompressed_size,4);
Chris@43:         }
Chris@43: 
Chris@43:         if (ZSEEK64(zi->z_filefunc,zi->filestream, cur_pos_inzip,ZLIB_FILEFUNC_SEEK_SET)!=0)
Chris@43:             err = ZIP_ERRNO;
Chris@43:     }
Chris@43: 
Chris@43:     zi->number_entry ++;
Chris@43:     zi->in_opened_file_inzip = 0;
Chris@43: 
Chris@43:     return err;
Chris@43: }
Chris@43: 
Chris@43: extern int ZEXPORT zipCloseFileInZip (zipFile file)
Chris@43: {
Chris@43:     return zipCloseFileInZipRaw (file,0,0);
Chris@43: }
Chris@43: 
Chris@43: int Write_Zip64EndOfCentralDirectoryLocator(zip64_internal* zi, ZPOS64_T zip64eocd_pos_inzip)
Chris@43: {
Chris@43:   int err = ZIP_OK;
Chris@43:   ZPOS64_T pos = zip64eocd_pos_inzip - zi->add_position_when_writting_offset;
Chris@43: 
Chris@43:   err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)ZIP64ENDLOCHEADERMAGIC,4);
Chris@43: 
Chris@43:   /*num disks*/
Chris@43:     if (err==ZIP_OK) /* number of the disk with the start of the central directory */
Chris@43:       err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4);
Chris@43: 
Chris@43:   /*relative offset*/
Chris@43:     if (err==ZIP_OK) /* Relative offset to the Zip64EndOfCentralDirectory */
Chris@43:       err = zip64local_putValue(&zi->z_filefunc,zi->filestream, pos,8);
Chris@43: 
Chris@43:   /*total disks*/ /* Do not support spawning of disk so always say 1 here*/
Chris@43:     if (err==ZIP_OK) /* number of the disk with the start of the central directory */
Chris@43:       err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)1,4);
Chris@43: 
Chris@43:     return err;
Chris@43: }
Chris@43: 
Chris@43: int Write_Zip64EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
Chris@43: {
Chris@43:   int err = ZIP_OK;
Chris@43: 
Chris@43:   uLong Zip64DataSize = 44;
Chris@43: 
Chris@43:   err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)ZIP64ENDHEADERMAGIC,4);
Chris@43: 
Chris@43:   if (err==ZIP_OK) /* size of this 'zip64 end of central directory' */
Chris@43:     err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(ZPOS64_T)Zip64DataSize,8); // why ZPOS64_T of this ?
Chris@43: 
Chris@43:   if (err==ZIP_OK) /* version made by */
Chris@43:     err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)45,2);
Chris@43: 
Chris@43:   if (err==ZIP_OK) /* version needed */
Chris@43:     err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)45,2);
Chris@43: 
Chris@43:   if (err==ZIP_OK) /* number of this disk */
Chris@43:     err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4);
Chris@43: 
Chris@43:   if (err==ZIP_OK) /* number of the disk with the start of the central directory */
Chris@43:     err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4);
Chris@43: 
Chris@43:   if (err==ZIP_OK) /* total number of entries in the central dir on this disk */
Chris@43:     err = zip64local_putValue(&zi->z_filefunc, zi->filestream, zi->number_entry, 8);
Chris@43: 
Chris@43:   if (err==ZIP_OK) /* total number of entries in the central dir */
Chris@43:     err = zip64local_putValue(&zi->z_filefunc, zi->filestream, zi->number_entry, 8);
Chris@43: 
Chris@43:   if (err==ZIP_OK) /* size of the central directory */
Chris@43:     err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(ZPOS64_T)size_centraldir,8);
Chris@43: 
Chris@43:   if (err==ZIP_OK) /* offset of start of central directory with respect to the starting disk number */
Chris@43:   {
Chris@43:     ZPOS64_T pos = centraldir_pos_inzip - zi->add_position_when_writting_offset;
Chris@43:     err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (ZPOS64_T)pos,8);
Chris@43:   }
Chris@43:   return err;
Chris@43: }
Chris@43: int Write_EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
Chris@43: {
Chris@43:   int err = ZIP_OK;
Chris@43: 
Chris@43:   /*signature*/
Chris@43:   err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)ENDHEADERMAGIC,4);
Chris@43: 
Chris@43:   if (err==ZIP_OK) /* number of this disk */
Chris@43:     err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,2);
Chris@43: 
Chris@43:   if (err==ZIP_OK) /* number of the disk with the start of the central directory */
Chris@43:     err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,2);
Chris@43: 
Chris@43:   if (err==ZIP_OK) /* total number of entries in the central dir on this disk */
Chris@43:   {
Chris@43:     {
Chris@43:       if(zi->number_entry >= 0xFFFF)
Chris@43:         err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0xffff,2); // use value in ZIP64 record
Chris@43:       else
Chris@43:         err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->number_entry,2);
Chris@43:     }
Chris@43:   }
Chris@43: 
Chris@43:   if (err==ZIP_OK) /* total number of entries in the central dir */
Chris@43:   {
Chris@43:     if(zi->number_entry >= 0xFFFF)
Chris@43:       err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0xffff,2); // use value in ZIP64 record
Chris@43:     else
Chris@43:       err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->number_entry,2);
Chris@43:   }
Chris@43: 
Chris@43:   if (err==ZIP_OK) /* size of the central directory */
Chris@43:     err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_centraldir,4);
Chris@43: 
Chris@43:   if (err==ZIP_OK) /* offset of start of central directory with respect to the starting disk number */
Chris@43:   {
Chris@43:     ZPOS64_T pos = centraldir_pos_inzip - zi->add_position_when_writting_offset;
Chris@43:     if(pos >= 0xffffffff)
Chris@43:     {
Chris@43:       err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (uLong)0xffffffff,4);
Chris@43:     }
Chris@43:     else
Chris@43:       err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (uLong)(centraldir_pos_inzip - zi->add_position_when_writting_offset),4);
Chris@43:   }
Chris@43: 
Chris@43:    return err;
Chris@43: }
Chris@43: 
Chris@43: int Write_GlobalComment(zip64_internal* zi, const char* global_comment)
Chris@43: {
Chris@43:   int err = ZIP_OK;
Chris@43:   uInt size_global_comment = 0;
Chris@43: 
Chris@43:   if(global_comment != NULL)
Chris@43:     size_global_comment = (uInt)strlen(global_comment);
Chris@43: 
Chris@43:   err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_global_comment,2);
Chris@43: 
Chris@43:   if (err == ZIP_OK && size_global_comment > 0)
Chris@43:   {
Chris@43:     if (ZWRITE64(zi->z_filefunc,zi->filestream, global_comment, size_global_comment) != size_global_comment)
Chris@43:       err = ZIP_ERRNO;
Chris@43:   }
Chris@43:   return err;
Chris@43: }
Chris@43: 
Chris@43: extern int ZEXPORT zipClose (zipFile file, const char* global_comment)
Chris@43: {
Chris@43:     zip64_internal* zi;
Chris@43:     int err = 0;
Chris@43:     uLong size_centraldir = 0;
Chris@43:     ZPOS64_T centraldir_pos_inzip;
Chris@43:     ZPOS64_T pos;
Chris@43: 
Chris@43:     if (file == NULL)
Chris@43:         return ZIP_PARAMERROR;
Chris@43: 
Chris@43:     zi = (zip64_internal*)file;
Chris@43: 
Chris@43:     if (zi->in_opened_file_inzip == 1)
Chris@43:     {
Chris@43:         err = zipCloseFileInZip (file);
Chris@43:     }
Chris@43: 
Chris@43: #ifndef NO_ADDFILEINEXISTINGZIP
Chris@43:     if (global_comment==NULL)
Chris@43:         global_comment = zi->globalcomment;
Chris@43: #endif
Chris@43: 
Chris@43:     centraldir_pos_inzip = ZTELL64(zi->z_filefunc,zi->filestream);
Chris@43: 
Chris@43:     if (err==ZIP_OK)
Chris@43:     {
Chris@43:         linkedlist_datablock_internal* ldi = zi->central_dir.first_block;
Chris@43:         while (ldi!=NULL)
Chris@43:         {
Chris@43:             if ((err==ZIP_OK) && (ldi->filled_in_this_block>0))
Chris@43:             {
Chris@43:                 if (ZWRITE64(zi->z_filefunc,zi->filestream, ldi->data, ldi->filled_in_this_block) != ldi->filled_in_this_block)
Chris@43:                     err = ZIP_ERRNO;
Chris@43:             }
Chris@43: 
Chris@43:             size_centraldir += ldi->filled_in_this_block;
Chris@43:             ldi = ldi->next_datablock;
Chris@43:         }
Chris@43:     }
Chris@43:     free_linkedlist(&(zi->central_dir));
Chris@43: 
Chris@43:     pos = centraldir_pos_inzip - zi->add_position_when_writting_offset;
Chris@43:     if(pos >= 0xffffffff || zi->number_entry > 0xFFFF)
Chris@43:     {
Chris@43:       ZPOS64_T Zip64EOCDpos = ZTELL64(zi->z_filefunc,zi->filestream);
Chris@43:       Write_Zip64EndOfCentralDirectoryRecord(zi, size_centraldir, centraldir_pos_inzip);
Chris@43: 
Chris@43:       Write_Zip64EndOfCentralDirectoryLocator(zi, Zip64EOCDpos);
Chris@43:     }
Chris@43: 
Chris@43:     if (err==ZIP_OK)
Chris@43:       err = Write_EndOfCentralDirectoryRecord(zi, size_centraldir, centraldir_pos_inzip);
Chris@43: 
Chris@43:     if(err == ZIP_OK)
Chris@43:       err = Write_GlobalComment(zi, global_comment);
Chris@43: 
Chris@43:     if (ZCLOSE64(zi->z_filefunc,zi->filestream) != 0)
Chris@43:         if (err == ZIP_OK)
Chris@43:             err = ZIP_ERRNO;
Chris@43: 
Chris@43: #ifndef NO_ADDFILEINEXISTINGZIP
Chris@43:     TRYFREE(zi->globalcomment);
Chris@43: #endif
Chris@43:     TRYFREE(zi);
Chris@43: 
Chris@43:     return err;
Chris@43: }
Chris@43: 
Chris@43: extern int ZEXPORT zipRemoveExtraInfoBlock (char* pData, int* dataLen, short sHeader)
Chris@43: {
Chris@43:   char* p = pData;
Chris@43:   int size = 0;
Chris@43:   char* pNewHeader;
Chris@43:   char* pTmp;
Chris@43:   short header;
Chris@43:   short dataSize;
Chris@43: 
Chris@43:   int retVal = ZIP_OK;
Chris@43: 
Chris@43:   if(pData == NULL || *dataLen < 4)
Chris@43:     return ZIP_PARAMERROR;
Chris@43: 
Chris@43:   pNewHeader = (char*)ALLOC(*dataLen);
Chris@43:   pTmp = pNewHeader;
Chris@43: 
Chris@43:   while(p < (pData + *dataLen))
Chris@43:   {
Chris@43:     header = *(short*)p;
Chris@43:     dataSize = *(((short*)p)+1);
Chris@43: 
Chris@43:     if( header == sHeader ) // Header found.
Chris@43:     {
Chris@43:       p += dataSize + 4; // skip it. do not copy to temp buffer
Chris@43:     }
Chris@43:     else
Chris@43:     {
Chris@43:       // Extra Info block should not be removed, So copy it to the temp buffer.
Chris@43:       memcpy(pTmp, p, dataSize + 4);
Chris@43:       p += dataSize + 4;
Chris@43:       size += dataSize + 4;
Chris@43:     }
Chris@43: 
Chris@43:   }
Chris@43: 
Chris@43:   if(size < *dataLen)
Chris@43:   {
Chris@43:     // clean old extra info block.
Chris@43:     memset(pData,0, *dataLen);
Chris@43: 
Chris@43:     // copy the new extra info block over the old
Chris@43:     if(size > 0)
Chris@43:       memcpy(pData, pNewHeader, size);
Chris@43: 
Chris@43:     // set the new extra info size
Chris@43:     *dataLen = size;
Chris@43: 
Chris@43:     retVal = ZIP_OK;
Chris@43:   }
Chris@43:   else
Chris@43:     retVal = ZIP_ERRNO;
Chris@43: 
Chris@43:   TRYFREE(pNewHeader);
Chris@43: 
Chris@43:   return retVal;
Chris@43: }