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