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