Mercurial > hg > sv-dependency-builds

annotate src/zlib-1.2.7/contrib/minizip/zip.c @ 124:e3d5853d5918

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Current stable PortAudio source
author Chris Cannam <cannam@all-day-breakfast.com>
date Tue, 18 Oct 2016 13:11:05 +0100
parents 8a15ff55d9af
children
rev   line source
cannam@89 1 /* zip.c -- IO on .zip files using zlib
cannam@89 2 Version 1.1, February 14h, 2010
cannam@89 3 part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html )
cannam@89 4
cannam@89 5 Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html )
cannam@89 6
cannam@89 7 Modifications for Zip64 support
cannam@89 8 Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com )
cannam@89 9
cannam@89 10 For more info read MiniZip_info.txt
cannam@89 11
cannam@89 12 Changes
cannam@89 13 Oct-2009 - Mathias Svensson - Remove old C style function prototypes
cannam@89 14 Oct-2009 - Mathias Svensson - Added Zip64 Support when creating new file archives
cannam@89 15 Oct-2009 - Mathias Svensson - Did some code cleanup and refactoring to get better overview of some functions.
cannam@89 16 Oct-2009 - Mathias Svensson - Added zipRemoveExtraInfoBlock to strip extra field data from its ZIP64 data
cannam@89 17 It is used when recreting zip archive with RAW when deleting items from a zip.
cannam@89 18 ZIP64 data is automaticly added to items that needs it, and existing ZIP64 data need to be removed.
cannam@89 19 Oct-2009 - Mathias Svensson - Added support for BZIP2 as compression mode (bzip2 lib is required)
cannam@89 20 Jan-2010 - back to unzip and minizip 1.0 name scheme, with compatibility layer
cannam@89 21
cannam@89 22 */
cannam@89 23
cannam@89 24
cannam@89 25 #include <stdio.h>
cannam@89 26 #include <stdlib.h>
cannam@89 27 #include <string.h>
cannam@89 28 #include <time.h>
cannam@89 29 #include "zlib.h"
cannam@89 30 #include "zip.h"
cannam@89 31
cannam@89 32 #ifdef STDC
cannam@89 33 # include <stddef.h>
cannam@89 34 # include <string.h>
cannam@89 35 # include <stdlib.h>
cannam@89 36 #endif
cannam@89 37 #ifdef NO_ERRNO_H
cannam@89 38 extern int errno;
cannam@89 39 #else
cannam@89 40 # include <errno.h>
cannam@89 41 #endif
cannam@89 42
cannam@89 43
cannam@89 44 #ifndef local
cannam@89 45 # define local static
cannam@89 46 #endif
cannam@89 47 /* compile with -Dlocal if your debugger can't find static symbols */
cannam@89 48
cannam@89 49 #ifndef VERSIONMADEBY
cannam@89 50 # define VERSIONMADEBY (0x0) /* platform depedent */
cannam@89 51 #endif
cannam@89 52
cannam@89 53 #ifndef Z_BUFSIZE
cannam@89 54 #define Z_BUFSIZE (64*1024) //(16384)
cannam@89 55 #endif
cannam@89 56
cannam@89 57 #ifndef Z_MAXFILENAMEINZIP
cannam@89 58 #define Z_MAXFILENAMEINZIP (256)
cannam@89 59 #endif
cannam@89 60
cannam@89 61 #ifndef ALLOC
cannam@89 62 # define ALLOC(size) (malloc(size))
cannam@89 63 #endif
cannam@89 64 #ifndef TRYFREE
cannam@89 65 # define TRYFREE(p) {if (p) free(p);}
cannam@89 66 #endif
cannam@89 67
cannam@89 68 /*
cannam@89 69 #define SIZECENTRALDIRITEM (0x2e)
cannam@89 70 #define SIZEZIPLOCALHEADER (0x1e)
cannam@89 71 */
cannam@89 72
cannam@89 73 /* I've found an old Unix (a SunOS 4.1.3_U1) without all SEEK_* defined.... */
cannam@89 74
cannam@89 75
cannam@89 76 // NOT sure that this work on ALL platform
cannam@89 77 #define MAKEULONG64(a, b) ((ZPOS64_T)(((unsigned long)(a)) | ((ZPOS64_T)((unsigned long)(b))) << 32))
cannam@89 78
cannam@89 79 #ifndef SEEK_CUR
cannam@89 80 #define SEEK_CUR 1
cannam@89 81 #endif
cannam@89 82
cannam@89 83 #ifndef SEEK_END
cannam@89 84 #define SEEK_END 2
cannam@89 85 #endif
cannam@89 86
cannam@89 87 #ifndef SEEK_SET
cannam@89 88 #define SEEK_SET 0
cannam@89 89 #endif
cannam@89 90
cannam@89 91 #ifndef DEF_MEM_LEVEL
cannam@89 92 #if MAX_MEM_LEVEL >= 8
cannam@89 93 # define DEF_MEM_LEVEL 8
cannam@89 94 #else
cannam@89 95 # define DEF_MEM_LEVEL MAX_MEM_LEVEL
cannam@89 96 #endif
cannam@89 97 #endif
cannam@89 98 const char zip_copyright[] =" zip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";
cannam@89 99
cannam@89 100
cannam@89 101 #define SIZEDATA_INDATABLOCK (4096-(4*4))
cannam@89 102
cannam@89 103 #define LOCALHEADERMAGIC (0x04034b50)
cannam@89 104 #define CENTRALHEADERMAGIC (0x02014b50)
cannam@89 105 #define ENDHEADERMAGIC (0x06054b50)
cannam@89 106 #define ZIP64ENDHEADERMAGIC (0x6064b50)
cannam@89 107 #define ZIP64ENDLOCHEADERMAGIC (0x7064b50)
cannam@89 108
cannam@89 109 #define FLAG_LOCALHEADER_OFFSET (0x06)
cannam@89 110 #define CRC_LOCALHEADER_OFFSET (0x0e)
cannam@89 111
cannam@89 112 #define SIZECENTRALHEADER (0x2e) /* 46 */
cannam@89 113
cannam@89 114 typedef struct linkedlist_datablock_internal_s
cannam@89 115 {
cannam@89 116 struct linkedlist_datablock_internal_s* next_datablock;
cannam@89 117 uLong avail_in_this_block;
cannam@89 118 uLong filled_in_this_block;
cannam@89 119 uLong unused; /* for future use and alignement */
cannam@89 120 unsigned char data[SIZEDATA_INDATABLOCK];
cannam@89 121 } linkedlist_datablock_internal;
cannam@89 122
cannam@89 123 typedef struct linkedlist_data_s
cannam@89 124 {
cannam@89 125 linkedlist_datablock_internal* first_block;
cannam@89 126 linkedlist_datablock_internal* last_block;
cannam@89 127 } linkedlist_data;
cannam@89 128
cannam@89 129
cannam@89 130 typedef struct
cannam@89 131 {
cannam@89 132 z_stream stream; /* zLib stream structure for inflate */
cannam@89 133 #ifdef HAVE_BZIP2
cannam@89 134 bz_stream bstream; /* bzLib stream structure for bziped */
cannam@89 135 #endif
cannam@89 136
cannam@89 137 int stream_initialised; /* 1 is stream is initialised */
cannam@89 138 uInt pos_in_buffered_data; /* last written byte in buffered_data */
cannam@89 139
cannam@89 140 ZPOS64_T pos_local_header; /* offset of the local header of the file
cannam@89 141 currenty writing */
cannam@89 142 char* central_header; /* central header data for the current file */
cannam@89 143 uLong size_centralExtra;
cannam@89 144 uLong size_centralheader; /* size of the central header for cur file */
cannam@89 145 uLong size_centralExtraFree; /* Extra bytes allocated to the centralheader but that are not used */
cannam@89 146 uLong flag; /* flag of the file currently writing */
cannam@89 147
cannam@89 148 int method; /* compression method of file currenty wr.*/
cannam@89 149 int raw; /* 1 for directly writing raw data */
cannam@89 150 Byte buffered_data[Z_BUFSIZE];/* buffer contain compressed data to be writ*/
cannam@89 151 uLong dosDate;
cannam@89 152 uLong crc32;
cannam@89 153 int encrypt;
cannam@89 154 int zip64; /* Add ZIP64 extened information in the extra field */
cannam@89 155 ZPOS64_T pos_zip64extrainfo;
cannam@89 156 ZPOS64_T totalCompressedData;
cannam@89 157 ZPOS64_T totalUncompressedData;
cannam@89 158 #ifndef NOCRYPT
cannam@89 159 unsigned long keys[3]; /* keys defining the pseudo-random sequence */
cannam@89 160 const unsigned long* pcrc_32_tab;
cannam@89 161 int crypt_header_size;
cannam@89 162 #endif
cannam@89 163 } curfile64_info;
cannam@89 164
cannam@89 165 typedef struct
cannam@89 166 {
cannam@89 167 zlib_filefunc64_32_def z_filefunc;
cannam@89 168 voidpf filestream; /* io structore of the zipfile */
cannam@89 169 linkedlist_data central_dir;/* datablock with central dir in construction*/
cannam@89 170 int in_opened_file_inzip; /* 1 if a file in the zip is currently writ.*/
cannam@89 171 curfile64_info ci; /* info on the file curretly writing */
cannam@89 172
cannam@89 173 ZPOS64_T begin_pos; /* position of the beginning of the zipfile */
cannam@89 174 ZPOS64_T add_position_when_writting_offset;
cannam@89 175 ZPOS64_T number_entry;
cannam@89 176
cannam@89 177 #ifndef NO_ADDFILEINEXISTINGZIP
cannam@89 178 char *globalcomment;
cannam@89 179 #endif
cannam@89 180
cannam@89 181 } zip64_internal;
cannam@89 182
cannam@89 183
cannam@89 184 #ifndef NOCRYPT
cannam@89 185 #define INCLUDECRYPTINGCODE_IFCRYPTALLOWED
cannam@89 186 #include "crypt.h"
cannam@89 187 #endif
cannam@89 188
cannam@89 189 local linkedlist_datablock_internal* allocate_new_datablock()
cannam@89 190 {
cannam@89 191 linkedlist_datablock_internal* ldi;
cannam@89 192 ldi = (linkedlist_datablock_internal*)
cannam@89 193 ALLOC(sizeof(linkedlist_datablock_internal));
cannam@89 194 if (ldi!=NULL)
cannam@89 195 {
cannam@89 196 ldi->next_datablock = NULL ;
cannam@89 197 ldi->filled_in_this_block = 0 ;
cannam@89 198 ldi->avail_in_this_block = SIZEDATA_INDATABLOCK ;
cannam@89 199 }
cannam@89 200 return ldi;
cannam@89 201 }
cannam@89 202
cannam@89 203 local void free_datablock(linkedlist_datablock_internal* ldi)
cannam@89 204 {
cannam@89 205 while (ldi!=NULL)
cannam@89 206 {
cannam@89 207 linkedlist_datablock_internal* ldinext = ldi->next_datablock;
cannam@89 208 TRYFREE(ldi);
cannam@89 209 ldi = ldinext;
cannam@89 210 }
cannam@89 211 }
cannam@89 212
cannam@89 213 local void init_linkedlist(linkedlist_data* ll)
cannam@89 214 {
cannam@89 215 ll->first_block = ll->last_block = NULL;
cannam@89 216 }
cannam@89 217
cannam@89 218 local void free_linkedlist(linkedlist_data* ll)
cannam@89 219 {
cannam@89 220 free_datablock(ll->first_block);
cannam@89 221 ll->first_block = ll->last_block = NULL;
cannam@89 222 }
cannam@89 223
cannam@89 224
cannam@89 225 local int add_data_in_datablock(linkedlist_data* ll, const void* buf, uLong len)
cannam@89 226 {
cannam@89 227 linkedlist_datablock_internal* ldi;
cannam@89 228 const unsigned char* from_copy;
cannam@89 229
cannam@89 230 if (ll==NULL)
cannam@89 231 return ZIP_INTERNALERROR;
cannam@89 232
cannam@89 233 if (ll->last_block == NULL)
cannam@89 234 {
cannam@89 235 ll->first_block = ll->last_block = allocate_new_datablock();
cannam@89 236 if (ll->first_block == NULL)
cannam@89 237 return ZIP_INTERNALERROR;
cannam@89 238 }
cannam@89 239
cannam@89 240 ldi = ll->last_block;
cannam@89 241 from_copy = (unsigned char*)buf;
cannam@89 242
cannam@89 243 while (len>0)
cannam@89 244 {
cannam@89 245 uInt copy_this;
cannam@89 246 uInt i;
cannam@89 247 unsigned char* to_copy;
cannam@89 248
cannam@89 249 if (ldi->avail_in_this_block==0)
cannam@89 250 {
cannam@89 251 ldi->next_datablock = allocate_new_datablock();
cannam@89 252 if (ldi->next_datablock == NULL)
cannam@89 253 return ZIP_INTERNALERROR;
cannam@89 254 ldi = ldi->next_datablock ;
cannam@89 255 ll->last_block = ldi;
cannam@89 256 }
cannam@89 257
cannam@89 258 if (ldi->avail_in_this_block < len)
cannam@89 259 copy_this = (uInt)ldi->avail_in_this_block;
cannam@89 260 else
cannam@89 261 copy_this = (uInt)len;
cannam@89 262
cannam@89 263 to_copy = &(ldi->data[ldi->filled_in_this_block]);
cannam@89 264
cannam@89 265 for (i=0;i<copy_this;i++)
cannam@89 266 *(to_copy+i)=*(from_copy+i);
cannam@89 267
cannam@89 268 ldi->filled_in_this_block += copy_this;
cannam@89 269 ldi->avail_in_this_block -= copy_this;
cannam@89 270 from_copy += copy_this ;
cannam@89 271 len -= copy_this;
cannam@89 272 }
cannam@89 273 return ZIP_OK;
cannam@89 274 }
cannam@89 275
cannam@89 276
cannam@89 277
cannam@89 278 /****************************************************************************/
cannam@89 279
cannam@89 280 #ifndef NO_ADDFILEINEXISTINGZIP
cannam@89 281 /* ===========================================================================
cannam@89 282 Inputs a long in LSB order to the given file
cannam@89 283 nbByte == 1, 2 ,4 or 8 (byte, short or long, ZPOS64_T)
cannam@89 284 */
cannam@89 285
cannam@89 286 local int zip64local_putValue OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, ZPOS64_T x, int nbByte));
cannam@89 287 local int zip64local_putValue (const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, ZPOS64_T x, int nbByte)
cannam@89 288 {
cannam@89 289 unsigned char buf[8];
cannam@89 290 int n;
cannam@89 291 for (n = 0; n < nbByte; n++)
cannam@89 292 {
cannam@89 293 buf[n] = (unsigned char)(x & 0xff);
cannam@89 294 x >>= 8;
cannam@89 295 }
cannam@89 296 if (x != 0)
cannam@89 297 { /* data overflow - hack for ZIP64 (X Roche) */
cannam@89 298 for (n = 0; n < nbByte; n++)
cannam@89 299 {
cannam@89 300 buf[n] = 0xff;
cannam@89 301 }
cannam@89 302 }
cannam@89 303
cannam@89 304 if (ZWRITE64(*pzlib_filefunc_def,filestream,buf,nbByte)!=(uLong)nbByte)
cannam@89 305 return ZIP_ERRNO;
cannam@89 306 else
cannam@89 307 return ZIP_OK;
cannam@89 308 }
cannam@89 309
cannam@89 310 local void zip64local_putValue_inmemory OF((void* dest, ZPOS64_T x, int nbByte));
cannam@89 311 local void zip64local_putValue_inmemory (void* dest, ZPOS64_T x, int nbByte)
cannam@89 312 {
cannam@89 313 unsigned char* buf=(unsigned char*)dest;
cannam@89 314 int n;
cannam@89 315 for (n = 0; n < nbByte; n++) {
cannam@89 316 buf[n] = (unsigned char)(x & 0xff);
cannam@89 317 x >>= 8;
cannam@89 318 }
cannam@89 319
cannam@89 320 if (x != 0)
cannam@89 321 { /* data overflow - hack for ZIP64 */
cannam@89 322 for (n = 0; n < nbByte; n++)
cannam@89 323 {
cannam@89 324 buf[n] = 0xff;
cannam@89 325 }
cannam@89 326 }
cannam@89 327 }
cannam@89 328
cannam@89 329 /****************************************************************************/
cannam@89 330
cannam@89 331
cannam@89 332 local uLong zip64local_TmzDateToDosDate(const tm_zip* ptm)
cannam@89 333 {
cannam@89 334 uLong year = (uLong)ptm->tm_year;
cannam@89 335 if (year>=1980)
cannam@89 336 year-=1980;
cannam@89 337 else if (year>=80)
cannam@89 338 year-=80;
cannam@89 339 return
cannam@89 340 (uLong) (((ptm->tm_mday) + (32 * (ptm->tm_mon+1)) + (512 * year)) << 16) |
cannam@89 341 ((ptm->tm_sec/2) + (32* ptm->tm_min) + (2048 * (uLong)ptm->tm_hour));
cannam@89 342 }
cannam@89 343
cannam@89 344
cannam@89 345 /****************************************************************************/
cannam@89 346
cannam@89 347 local int zip64local_getByte OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, int *pi));
cannam@89 348
cannam@89 349 local int zip64local_getByte(const zlib_filefunc64_32_def* pzlib_filefunc_def,voidpf filestream,int* pi)
cannam@89 350 {
cannam@89 351 unsigned char c;
cannam@89 352 int err = (int)ZREAD64(*pzlib_filefunc_def,filestream,&c,1);
cannam@89 353 if (err==1)
cannam@89 354 {
cannam@89 355 *pi = (int)c;
cannam@89 356 return ZIP_OK;
cannam@89 357 }
cannam@89 358 else
cannam@89 359 {
cannam@89 360 if (ZERROR64(*pzlib_filefunc_def,filestream))
cannam@89 361 return ZIP_ERRNO;
cannam@89 362 else
cannam@89 363 return ZIP_EOF;
cannam@89 364 }
cannam@89 365 }
cannam@89 366
cannam@89 367
cannam@89 368 /* ===========================================================================
cannam@89 369 Reads a long in LSB order from the given gz_stream. Sets
cannam@89 370 */
cannam@89 371 local int zip64local_getShort OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, uLong *pX));
cannam@89 372
cannam@89 373 local int zip64local_getShort (const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, uLong* pX)
cannam@89 374 {
cannam@89 375 uLong x ;
cannam@89 376 int i = 0;
cannam@89 377 int err;
cannam@89 378
cannam@89 379 err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
cannam@89 380 x = (uLong)i;
cannam@89 381
cannam@89 382 if (err==ZIP_OK)
cannam@89 383 err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
cannam@89 384 x += ((uLong)i)<<8;
cannam@89 385
cannam@89 386 if (err==ZIP_OK)
cannam@89 387 *pX = x;
cannam@89 388 else
cannam@89 389 *pX = 0;
cannam@89 390 return err;
cannam@89 391 }
cannam@89 392
cannam@89 393 local int zip64local_getLong OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, uLong *pX));
cannam@89 394
cannam@89 395 local int zip64local_getLong (const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, uLong* pX)
cannam@89 396 {
cannam@89 397 uLong x ;
cannam@89 398 int i = 0;
cannam@89 399 int err;
cannam@89 400
cannam@89 401 err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
cannam@89 402 x = (uLong)i;
cannam@89 403
cannam@89 404 if (err==ZIP_OK)
cannam@89 405 err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
cannam@89 406 x += ((uLong)i)<<8;
cannam@89 407
cannam@89 408 if (err==ZIP_OK)
cannam@89 409 err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
cannam@89 410 x += ((uLong)i)<<16;
cannam@89 411
cannam@89 412 if (err==ZIP_OK)
cannam@89 413 err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
cannam@89 414 x += ((uLong)i)<<24;
cannam@89 415
cannam@89 416 if (err==ZIP_OK)
cannam@89 417 *pX = x;
cannam@89 418 else
cannam@89 419 *pX = 0;
cannam@89 420 return err;
cannam@89 421 }
cannam@89 422
cannam@89 423 local int zip64local_getLong64 OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, ZPOS64_T *pX));
cannam@89 424
cannam@89 425
cannam@89 426 local int zip64local_getLong64 (const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream, ZPOS64_T *pX)
cannam@89 427 {
cannam@89 428 ZPOS64_T x;
cannam@89 429 int i = 0;
cannam@89 430 int err;
cannam@89 431
cannam@89 432 err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
cannam@89 433 x = (ZPOS64_T)i;
cannam@89 434
cannam@89 435 if (err==ZIP_OK)
cannam@89 436 err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
cannam@89 437 x += ((ZPOS64_T)i)<<8;
cannam@89 438
cannam@89 439 if (err==ZIP_OK)
cannam@89 440 err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
cannam@89 441 x += ((ZPOS64_T)i)<<16;
cannam@89 442
cannam@89 443 if (err==ZIP_OK)
cannam@89 444 err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
cannam@89 445 x += ((ZPOS64_T)i)<<24;
cannam@89 446
cannam@89 447 if (err==ZIP_OK)
cannam@89 448 err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
cannam@89 449 x += ((ZPOS64_T)i)<<32;
cannam@89 450
cannam@89 451 if (err==ZIP_OK)
cannam@89 452 err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
cannam@89 453 x += ((ZPOS64_T)i)<<40;
cannam@89 454
cannam@89 455 if (err==ZIP_OK)
cannam@89 456 err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
cannam@89 457 x += ((ZPOS64_T)i)<<48;
cannam@89 458
cannam@89 459 if (err==ZIP_OK)
cannam@89 460 err = zip64local_getByte(pzlib_filefunc_def,filestream,&i);
cannam@89 461 x += ((ZPOS64_T)i)<<56;
cannam@89 462
cannam@89 463 if (err==ZIP_OK)
cannam@89 464 *pX = x;
cannam@89 465 else
cannam@89 466 *pX = 0;
cannam@89 467
cannam@89 468 return err;
cannam@89 469 }
cannam@89 470
cannam@89 471 #ifndef BUFREADCOMMENT
cannam@89 472 #define BUFREADCOMMENT (0x400)
cannam@89 473 #endif
cannam@89 474 /*
cannam@89 475 Locate the Central directory of a zipfile (at the end, just before
cannam@89 476 the global comment)
cannam@89 477 */
cannam@89 478 local ZPOS64_T zip64local_SearchCentralDir OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream));
cannam@89 479
cannam@89 480 local ZPOS64_T zip64local_SearchCentralDir(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream)
cannam@89 481 {
cannam@89 482 unsigned char* buf;
cannam@89 483 ZPOS64_T uSizeFile;
cannam@89 484 ZPOS64_T uBackRead;
cannam@89 485 ZPOS64_T uMaxBack=0xffff; /* maximum size of global comment */
cannam@89 486 ZPOS64_T uPosFound=0;
cannam@89 487
cannam@89 488 if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
cannam@89 489 return 0;
cannam@89 490
cannam@89 491
cannam@89 492 uSizeFile = ZTELL64(*pzlib_filefunc_def,filestream);
cannam@89 493
cannam@89 494 if (uMaxBack>uSizeFile)
cannam@89 495 uMaxBack = uSizeFile;
cannam@89 496
cannam@89 497 buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
cannam@89 498 if (buf==NULL)
cannam@89 499 return 0;
cannam@89 500
cannam@89 501 uBackRead = 4;
cannam@89 502 while (uBackRead<uMaxBack)
cannam@89 503 {
cannam@89 504 uLong uReadSize;
cannam@89 505 ZPOS64_T uReadPos ;
cannam@89 506 int i;
cannam@89 507 if (uBackRead+BUFREADCOMMENT>uMaxBack)
cannam@89 508 uBackRead = uMaxBack;
cannam@89 509 else
cannam@89 510 uBackRead+=BUFREADCOMMENT;
cannam@89 511 uReadPos = uSizeFile-uBackRead ;
cannam@89 512
cannam@89 513 uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
cannam@89 514 (BUFREADCOMMENT+4) : (uLong)(uSizeFile-uReadPos);
cannam@89 515 if (ZSEEK64(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
cannam@89 516 break;
cannam@89 517
cannam@89 518 if (ZREAD64(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
cannam@89 519 break;
cannam@89 520
cannam@89 521 for (i=(int)uReadSize-3; (i--)>0;)
cannam@89 522 if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&
cannam@89 523 ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))
cannam@89 524 {
cannam@89 525 uPosFound = uReadPos+i;
cannam@89 526 break;
cannam@89 527 }
cannam@89 528
cannam@89 529 if (uPosFound!=0)
cannam@89 530 break;
cannam@89 531 }
cannam@89 532 TRYFREE(buf);
cannam@89 533 return uPosFound;
cannam@89 534 }
cannam@89 535
cannam@89 536 /*
cannam@89 537 Locate the End of Zip64 Central directory locator and from there find the CD of a zipfile (at the end, just before
cannam@89 538 the global comment)
cannam@89 539 */
cannam@89 540 local ZPOS64_T zip64local_SearchCentralDir64 OF((const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream));
cannam@89 541
cannam@89 542 local ZPOS64_T zip64local_SearchCentralDir64(const zlib_filefunc64_32_def* pzlib_filefunc_def, voidpf filestream)
cannam@89 543 {
cannam@89 544 unsigned char* buf;
cannam@89 545 ZPOS64_T uSizeFile;
cannam@89 546 ZPOS64_T uBackRead;
cannam@89 547 ZPOS64_T uMaxBack=0xffff; /* maximum size of global comment */
cannam@89 548 ZPOS64_T uPosFound=0;
cannam@89 549 uLong uL;
cannam@89 550 ZPOS64_T relativeOffset;
cannam@89 551
cannam@89 552 if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
cannam@89 553 return 0;
cannam@89 554
cannam@89 555 uSizeFile = ZTELL64(*pzlib_filefunc_def,filestream);
cannam@89 556
cannam@89 557 if (uMaxBack>uSizeFile)
cannam@89 558 uMaxBack = uSizeFile;
cannam@89 559
cannam@89 560 buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
cannam@89 561 if (buf==NULL)
cannam@89 562 return 0;
cannam@89 563
cannam@89 564 uBackRead = 4;
cannam@89 565 while (uBackRead<uMaxBack)
cannam@89 566 {
cannam@89 567 uLong uReadSize;
cannam@89 568 ZPOS64_T uReadPos;
cannam@89 569 int i;
cannam@89 570 if (uBackRead+BUFREADCOMMENT>uMaxBack)
cannam@89 571 uBackRead = uMaxBack;
cannam@89 572 else
cannam@89 573 uBackRead+=BUFREADCOMMENT;
cannam@89 574 uReadPos = uSizeFile-uBackRead ;
cannam@89 575
cannam@89 576 uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
cannam@89 577 (BUFREADCOMMENT+4) : (uLong)(uSizeFile-uReadPos);
cannam@89 578 if (ZSEEK64(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
cannam@89 579 break;
cannam@89 580
cannam@89 581 if (ZREAD64(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
cannam@89 582 break;
cannam@89 583
cannam@89 584 for (i=(int)uReadSize-3; (i--)>0;)
cannam@89 585 {
cannam@89 586 // Signature "0x07064b50" Zip64 end of central directory locater
cannam@89 587 if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) && ((*(buf+i+2))==0x06) && ((*(buf+i+3))==0x07))
cannam@89 588 {
cannam@89 589 uPosFound = uReadPos+i;
cannam@89 590 break;
cannam@89 591 }
cannam@89 592 }
cannam@89 593
cannam@89 594 if (uPosFound!=0)
cannam@89 595 break;
cannam@89 596 }
cannam@89 597
cannam@89 598 TRYFREE(buf);
cannam@89 599 if (uPosFound == 0)
cannam@89 600 return 0;
cannam@89 601
cannam@89 602 /* Zip64 end of central directory locator */
cannam@89 603 if (ZSEEK64(*pzlib_filefunc_def,filestream, uPosFound,ZLIB_FILEFUNC_SEEK_SET)!=0)
cannam@89 604 return 0;
cannam@89 605
cannam@89 606 /* the signature, already checked */
cannam@89 607 if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
cannam@89 608 return 0;
cannam@89 609
cannam@89 610 /* number of the disk with the start of the zip64 end of central directory */
cannam@89 611 if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
cannam@89 612 return 0;
cannam@89 613 if (uL != 0)
cannam@89 614 return 0;
cannam@89 615
cannam@89 616 /* relative offset of the zip64 end of central directory record */
cannam@89 617 if (zip64local_getLong64(pzlib_filefunc_def,filestream,&relativeOffset)!=ZIP_OK)
cannam@89 618 return 0;
cannam@89 619
cannam@89 620 /* total number of disks */
cannam@89 621 if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
cannam@89 622 return 0;
cannam@89 623 if (uL != 1)
cannam@89 624 return 0;
cannam@89 625
cannam@89 626 /* Goto Zip64 end of central directory record */
cannam@89 627 if (ZSEEK64(*pzlib_filefunc_def,filestream, relativeOffset,ZLIB_FILEFUNC_SEEK_SET)!=0)
cannam@89 628 return 0;
cannam@89 629
cannam@89 630 /* the signature */
cannam@89 631 if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
cannam@89 632 return 0;
cannam@89 633
cannam@89 634 if (uL != 0x06064b50) // signature of 'Zip64 end of central directory'
cannam@89 635 return 0;
cannam@89 636
cannam@89 637 return relativeOffset;
cannam@89 638 }
cannam@89 639
cannam@89 640 int LoadCentralDirectoryRecord(zip64_internal* pziinit)
cannam@89 641 {
cannam@89 642 int err=ZIP_OK;
cannam@89 643 ZPOS64_T byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
cannam@89 644
cannam@89 645 ZPOS64_T size_central_dir; /* size of the central directory */
cannam@89 646 ZPOS64_T offset_central_dir; /* offset of start of central directory */
cannam@89 647 ZPOS64_T central_pos;
cannam@89 648 uLong uL;
cannam@89 649
cannam@89 650 uLong number_disk; /* number of the current dist, used for
cannam@89 651 spaning ZIP, unsupported, always 0*/
cannam@89 652 uLong number_disk_with_CD; /* number the the disk with central dir, used
cannam@89 653 for spaning ZIP, unsupported, always 0*/
cannam@89 654 ZPOS64_T number_entry;
cannam@89 655 ZPOS64_T number_entry_CD; /* total number of entries in
cannam@89 656 the central dir
cannam@89 657 (same than number_entry on nospan) */
cannam@89 658 uLong VersionMadeBy;
cannam@89 659 uLong VersionNeeded;
cannam@89 660 uLong size_comment;
cannam@89 661
cannam@89 662 int hasZIP64Record = 0;
cannam@89 663
cannam@89 664 // check first if we find a ZIP64 record
cannam@89 665 central_pos = zip64local_SearchCentralDir64(&pziinit->z_filefunc,pziinit->filestream);
cannam@89 666 if(central_pos > 0)
cannam@89 667 {
cannam@89 668 hasZIP64Record = 1;
cannam@89 669 }
cannam@89 670 else if(central_pos == 0)
cannam@89 671 {
cannam@89 672 central_pos = zip64local_SearchCentralDir(&pziinit->z_filefunc,pziinit->filestream);
cannam@89 673 }
cannam@89 674
cannam@89 675 /* disable to allow appending to empty ZIP archive
cannam@89 676 if (central_pos==0)
cannam@89 677 err=ZIP_ERRNO;
cannam@89 678 */
cannam@89 679
cannam@89 680 if(hasZIP64Record)
cannam@89 681 {
cannam@89 682 ZPOS64_T sizeEndOfCentralDirectory;
cannam@89 683 if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, central_pos, ZLIB_FILEFUNC_SEEK_SET) != 0)
cannam@89 684 err=ZIP_ERRNO;
cannam@89 685
cannam@89 686 /* the signature, already checked */
cannam@89 687 if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&uL)!=ZIP_OK)
cannam@89 688 err=ZIP_ERRNO;
cannam@89 689
cannam@89 690 /* size of zip64 end of central directory record */
cannam@89 691 if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream, &sizeEndOfCentralDirectory)!=ZIP_OK)
cannam@89 692 err=ZIP_ERRNO;
cannam@89 693
cannam@89 694 /* version made by */
cannam@89 695 if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &VersionMadeBy)!=ZIP_OK)
cannam@89 696 err=ZIP_ERRNO;
cannam@89 697
cannam@89 698 /* version needed to extract */
cannam@89 699 if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &VersionNeeded)!=ZIP_OK)
cannam@89 700 err=ZIP_ERRNO;
cannam@89 701
cannam@89 702 /* number of this disk */
cannam@89 703 if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&number_disk)!=ZIP_OK)
cannam@89 704 err=ZIP_ERRNO;
cannam@89 705
cannam@89 706 /* number of the disk with the start of the central directory */
cannam@89 707 if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&number_disk_with_CD)!=ZIP_OK)
cannam@89 708 err=ZIP_ERRNO;
cannam@89 709
cannam@89 710 /* total number of entries in the central directory on this disk */
cannam@89 711 if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream, &number_entry)!=ZIP_OK)
cannam@89 712 err=ZIP_ERRNO;
cannam@89 713
cannam@89 714 /* total number of entries in the central directory */
cannam@89 715 if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream,&number_entry_CD)!=ZIP_OK)
cannam@89 716 err=ZIP_ERRNO;
cannam@89 717
cannam@89 718 if ((number_entry_CD!=number_entry) || (number_disk_with_CD!=0) || (number_disk!=0))
cannam@89 719 err=ZIP_BADZIPFILE;
cannam@89 720
cannam@89 721 /* size of the central directory */
cannam@89 722 if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream,&size_central_dir)!=ZIP_OK)
cannam@89 723 err=ZIP_ERRNO;
cannam@89 724
cannam@89 725 /* offset of start of central directory with respect to the
cannam@89 726 starting disk number */
cannam@89 727 if (zip64local_getLong64(&pziinit->z_filefunc, pziinit->filestream,&offset_central_dir)!=ZIP_OK)
cannam@89 728 err=ZIP_ERRNO;
cannam@89 729
cannam@89 730 // TODO..
cannam@89 731 // read the comment from the standard central header.
cannam@89 732 size_comment = 0;
cannam@89 733 }
cannam@89 734 else
cannam@89 735 {
cannam@89 736 // Read End of central Directory info
cannam@89 737 if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)
cannam@89 738 err=ZIP_ERRNO;
cannam@89 739
cannam@89 740 /* the signature, already checked */
cannam@89 741 if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream,&uL)!=ZIP_OK)
cannam@89 742 err=ZIP_ERRNO;
cannam@89 743
cannam@89 744 /* number of this disk */
cannam@89 745 if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream,&number_disk)!=ZIP_OK)
cannam@89 746 err=ZIP_ERRNO;
cannam@89 747
cannam@89 748 /* number of the disk with the start of the central directory */
cannam@89 749 if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream,&number_disk_with_CD)!=ZIP_OK)
cannam@89 750 err=ZIP_ERRNO;
cannam@89 751
cannam@89 752 /* total number of entries in the central dir on this disk */
cannam@89 753 number_entry = 0;
cannam@89 754 if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &uL)!=ZIP_OK)
cannam@89 755 err=ZIP_ERRNO;
cannam@89 756 else
cannam@89 757 number_entry = uL;
cannam@89 758
cannam@89 759 /* total number of entries in the central dir */
cannam@89 760 number_entry_CD = 0;
cannam@89 761 if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &uL)!=ZIP_OK)
cannam@89 762 err=ZIP_ERRNO;
cannam@89 763 else
cannam@89 764 number_entry_CD = uL;
cannam@89 765
cannam@89 766 if ((number_entry_CD!=number_entry) || (number_disk_with_CD!=0) || (number_disk!=0))
cannam@89 767 err=ZIP_BADZIPFILE;
cannam@89 768
cannam@89 769 /* size of the central directory */
cannam@89 770 size_central_dir = 0;
cannam@89 771 if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream, &uL)!=ZIP_OK)
cannam@89 772 err=ZIP_ERRNO;
cannam@89 773 else
cannam@89 774 size_central_dir = uL;
cannam@89 775
cannam@89 776 /* offset of start of central directory with respect to the starting disk number */
cannam@89 777 offset_central_dir = 0;
cannam@89 778 if (zip64local_getLong(&pziinit->z_filefunc, pziinit->filestream, &uL)!=ZIP_OK)
cannam@89 779 err=ZIP_ERRNO;
cannam@89 780 else
cannam@89 781 offset_central_dir = uL;
cannam@89 782
cannam@89 783
cannam@89 784 /* zipfile global comment length */
cannam@89 785 if (zip64local_getShort(&pziinit->z_filefunc, pziinit->filestream, &size_comment)!=ZIP_OK)
cannam@89 786 err=ZIP_ERRNO;
cannam@89 787 }
cannam@89 788
cannam@89 789 if ((central_pos<offset_central_dir+size_central_dir) &&
cannam@89 790 (err==ZIP_OK))
cannam@89 791 err=ZIP_BADZIPFILE;
cannam@89 792
cannam@89 793 if (err!=ZIP_OK)
cannam@89 794 {
cannam@89 795 ZCLOSE64(pziinit->z_filefunc, pziinit->filestream);
cannam@89 796 return ZIP_ERRNO;
cannam@89 797 }
cannam@89 798
cannam@89 799 if (size_comment>0)
cannam@89 800 {
cannam@89 801 pziinit->globalcomment = (char*)ALLOC(size_comment+1);
cannam@89 802 if (pziinit->globalcomment)
cannam@89 803 {
cannam@89 804 size_comment = ZREAD64(pziinit->z_filefunc, pziinit->filestream, pziinit->globalcomment,size_comment);
cannam@89 805 pziinit->globalcomment[size_comment]=0;
cannam@89 806 }
cannam@89 807 }
cannam@89 808
cannam@89 809 byte_before_the_zipfile = central_pos - (offset_central_dir+size_central_dir);
cannam@89 810 pziinit->add_position_when_writting_offset = byte_before_the_zipfile;
cannam@89 811
cannam@89 812 {
cannam@89 813 ZPOS64_T size_central_dir_to_read = size_central_dir;
cannam@89 814 size_t buf_size = SIZEDATA_INDATABLOCK;
cannam@89 815 void* buf_read = (void*)ALLOC(buf_size);
cannam@89 816 if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, offset_central_dir + byte_before_the_zipfile, ZLIB_FILEFUNC_SEEK_SET) != 0)
cannam@89 817 err=ZIP_ERRNO;
cannam@89 818
cannam@89 819 while ((size_central_dir_to_read>0) && (err==ZIP_OK))
cannam@89 820 {
cannam@89 821 ZPOS64_T read_this = SIZEDATA_INDATABLOCK;
cannam@89 822 if (read_this > size_central_dir_to_read)
cannam@89 823 read_this = size_central_dir_to_read;
cannam@89 824
cannam@89 825 if (ZREAD64(pziinit->z_filefunc, pziinit->filestream,buf_read,(uLong)read_this) != read_this)
cannam@89 826 err=ZIP_ERRNO;
cannam@89 827
cannam@89 828 if (err==ZIP_OK)
cannam@89 829 err = add_data_in_datablock(&pziinit->central_dir,buf_read, (uLong)read_this);
cannam@89 830
cannam@89 831 size_central_dir_to_read-=read_this;
cannam@89 832 }
cannam@89 833 TRYFREE(buf_read);
cannam@89 834 }
cannam@89 835 pziinit->begin_pos = byte_before_the_zipfile;
cannam@89 836 pziinit->number_entry = number_entry_CD;
cannam@89 837
cannam@89 838 if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, offset_central_dir+byte_before_the_zipfile,ZLIB_FILEFUNC_SEEK_SET) != 0)
cannam@89 839 err=ZIP_ERRNO;
cannam@89 840
cannam@89 841 return err;
cannam@89 842 }
cannam@89 843
cannam@89 844
cannam@89 845 #endif /* !NO_ADDFILEINEXISTINGZIP*/
cannam@89 846
cannam@89 847
cannam@89 848 /************************************************************/
cannam@89 849 extern zipFile ZEXPORT zipOpen3 (const void *pathname, int append, zipcharpc* globalcomment, zlib_filefunc64_32_def* pzlib_filefunc64_32_def)
cannam@89 850 {
cannam@89 851 zip64_internal ziinit;
cannam@89 852 zip64_internal* zi;
cannam@89 853 int err=ZIP_OK;
cannam@89 854
cannam@89 855 ziinit.z_filefunc.zseek32_file = NULL;
cannam@89 856 ziinit.z_filefunc.ztell32_file = NULL;
cannam@89 857 if (pzlib_filefunc64_32_def==NULL)
cannam@89 858 fill_fopen64_filefunc(&ziinit.z_filefunc.zfile_func64);
cannam@89 859 else
cannam@89 860 ziinit.z_filefunc = *pzlib_filefunc64_32_def;
cannam@89 861
cannam@89 862 ziinit.filestream = ZOPEN64(ziinit.z_filefunc,
cannam@89 863 pathname,
cannam@89 864 (append == APPEND_STATUS_CREATE) ?
cannam@89 865 (ZLIB_FILEFUNC_MODE_READ | ZLIB_FILEFUNC_MODE_WRITE | ZLIB_FILEFUNC_MODE_CREATE) :
cannam@89 866 (ZLIB_FILEFUNC_MODE_READ | ZLIB_FILEFUNC_MODE_WRITE | ZLIB_FILEFUNC_MODE_EXISTING));
cannam@89 867
cannam@89 868 if (ziinit.filestream == NULL)
cannam@89 869 return NULL;
cannam@89 870
cannam@89 871 if (append == APPEND_STATUS_CREATEAFTER)
cannam@89 872 ZSEEK64(ziinit.z_filefunc,ziinit.filestream,0,SEEK_END);
cannam@89 873
cannam@89 874 ziinit.begin_pos = ZTELL64(ziinit.z_filefunc,ziinit.filestream);
cannam@89 875 ziinit.in_opened_file_inzip = 0;
cannam@89 876 ziinit.ci.stream_initialised = 0;
cannam@89 877 ziinit.number_entry = 0;
cannam@89 878 ziinit.add_position_when_writting_offset = 0;
cannam@89 879 init_linkedlist(&(ziinit.central_dir));
cannam@89 880
cannam@89 881
cannam@89 882
cannam@89 883 zi = (zip64_internal*)ALLOC(sizeof(zip64_internal));
cannam@89 884 if (zi==NULL)
cannam@89 885 {
cannam@89 886 ZCLOSE64(ziinit.z_filefunc,ziinit.filestream);
cannam@89 887 return NULL;
cannam@89 888 }
cannam@89 889
cannam@89 890 /* now we add file in a zipfile */
cannam@89 891 # ifndef NO_ADDFILEINEXISTINGZIP
cannam@89 892 ziinit.globalcomment = NULL;
cannam@89 893 if (append == APPEND_STATUS_ADDINZIP)
cannam@89 894 {
cannam@89 895 // Read and Cache Central Directory Records
cannam@89 896 err = LoadCentralDirectoryRecord(&ziinit);
cannam@89 897 }
cannam@89 898
cannam@89 899 if (globalcomment)
cannam@89 900 {
cannam@89 901 *globalcomment = ziinit.globalcomment;
cannam@89 902 }
cannam@89 903 # endif /* !NO_ADDFILEINEXISTINGZIP*/
cannam@89 904
cannam@89 905 if (err != ZIP_OK)
cannam@89 906 {
cannam@89 907 # ifndef NO_ADDFILEINEXISTINGZIP
cannam@89 908 TRYFREE(ziinit.globalcomment);
cannam@89 909 # endif /* !NO_ADDFILEINEXISTINGZIP*/
cannam@89 910 TRYFREE(zi);
cannam@89 911 return NULL;
cannam@89 912 }
cannam@89 913 else
cannam@89 914 {
cannam@89 915 *zi = ziinit;
cannam@89 916 return (zipFile)zi;
cannam@89 917 }
cannam@89 918 }
cannam@89 919
cannam@89 920 extern zipFile ZEXPORT zipOpen2 (const char *pathname, int append, zipcharpc* globalcomment, zlib_filefunc_def* pzlib_filefunc32_def)
cannam@89 921 {
cannam@89 922 if (pzlib_filefunc32_def != NULL)
cannam@89 923 {
cannam@89 924 zlib_filefunc64_32_def zlib_filefunc64_32_def_fill;
cannam@89 925 fill_zlib_filefunc64_32_def_from_filefunc32(&zlib_filefunc64_32_def_fill,pzlib_filefunc32_def);
cannam@89 926 return zipOpen3(pathname, append, globalcomment, &zlib_filefunc64_32_def_fill);
cannam@89 927 }
cannam@89 928 else
cannam@89 929 return zipOpen3(pathname, append, globalcomment, NULL);
cannam@89 930 }
cannam@89 931
cannam@89 932 extern zipFile ZEXPORT zipOpen2_64 (const void *pathname, int append, zipcharpc* globalcomment, zlib_filefunc64_def* pzlib_filefunc_def)
cannam@89 933 {
cannam@89 934 if (pzlib_filefunc_def != NULL)
cannam@89 935 {
cannam@89 936 zlib_filefunc64_32_def zlib_filefunc64_32_def_fill;
cannam@89 937 zlib_filefunc64_32_def_fill.zfile_func64 = *pzlib_filefunc_def;
cannam@89 938 zlib_filefunc64_32_def_fill.ztell32_file = NULL;
cannam@89 939 zlib_filefunc64_32_def_fill.zseek32_file = NULL;
cannam@89 940 return zipOpen3(pathname, append, globalcomment, &zlib_filefunc64_32_def_fill);
cannam@89 941 }
cannam@89 942 else
cannam@89 943 return zipOpen3(pathname, append, globalcomment, NULL);
cannam@89 944 }
cannam@89 945
cannam@89 946
cannam@89 947
cannam@89 948 extern zipFile ZEXPORT zipOpen (const char* pathname, int append)
cannam@89 949 {
cannam@89 950 return zipOpen3((const void*)pathname,append,NULL,NULL);
cannam@89 951 }
cannam@89 952
cannam@89 953 extern zipFile ZEXPORT zipOpen64 (const void* pathname, int append)
cannam@89 954 {
cannam@89 955 return zipOpen3(pathname,append,NULL,NULL);
cannam@89 956 }
cannam@89 957
cannam@89 958 int Write_LocalFileHeader(zip64_internal* zi, const char* filename, uInt size_extrafield_local, const void* extrafield_local)
cannam@89 959 {
cannam@89 960 /* write the local header */
cannam@89 961 int err;
cannam@89 962 uInt size_filename = (uInt)strlen(filename);
cannam@89 963 uInt size_extrafield = size_extrafield_local;
cannam@89 964
cannam@89 965 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)LOCALHEADERMAGIC, 4);
cannam@89 966
cannam@89 967 if (err==ZIP_OK)
cannam@89 968 {
cannam@89 969 if(zi->ci.zip64)
cannam@89 970 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)45,2);/* version needed to extract */
cannam@89 971 else
cannam@89 972 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)20,2);/* version needed to extract */
cannam@89 973 }
cannam@89 974
cannam@89 975 if (err==ZIP_OK)
cannam@89 976 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.flag,2);
cannam@89 977
cannam@89 978 if (err==ZIP_OK)
cannam@89 979 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.method,2);
cannam@89 980
cannam@89 981 if (err==ZIP_OK)
cannam@89 982 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.dosDate,4);
cannam@89 983
cannam@89 984 // CRC / Compressed size / Uncompressed size will be filled in later and rewritten later
cannam@89 985 if (err==ZIP_OK)
cannam@89 986 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* crc 32, unknown */
cannam@89 987 if (err==ZIP_OK)
cannam@89 988 {
cannam@89 989 if(zi->ci.zip64)
cannam@89 990 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0xFFFFFFFF,4); /* compressed size, unknown */
cannam@89 991 else
cannam@89 992 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* compressed size, unknown */
cannam@89 993 }
cannam@89 994 if (err==ZIP_OK)
cannam@89 995 {
cannam@89 996 if(zi->ci.zip64)
cannam@89 997 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0xFFFFFFFF,4); /* uncompressed size, unknown */
cannam@89 998 else
cannam@89 999 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* uncompressed size, unknown */
cannam@89 1000 }
cannam@89 1001
cannam@89 1002 if (err==ZIP_OK)
cannam@89 1003 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_filename,2);
cannam@89 1004
cannam@89 1005 if(zi->ci.zip64)
cannam@89 1006 {
cannam@89 1007 size_extrafield += 20;
cannam@89 1008 }
cannam@89 1009
cannam@89 1010 if (err==ZIP_OK)
cannam@89 1011 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_extrafield,2);
cannam@89 1012
cannam@89 1013 if ((err==ZIP_OK) && (size_filename > 0))
cannam@89 1014 {
cannam@89 1015 if (ZWRITE64(zi->z_filefunc,zi->filestream,filename,size_filename)!=size_filename)
cannam@89 1016 err = ZIP_ERRNO;
cannam@89 1017 }
cannam@89 1018
cannam@89 1019 if ((err==ZIP_OK) && (size_extrafield_local > 0))
cannam@89 1020 {
cannam@89 1021 if (ZWRITE64(zi->z_filefunc, zi->filestream, extrafield_local, size_extrafield_local) != size_extrafield_local)
cannam@89 1022 err = ZIP_ERRNO;
cannam@89 1023 }
cannam@89 1024
cannam@89 1025
cannam@89 1026 if ((err==ZIP_OK) && (zi->ci.zip64))
cannam@89 1027 {
cannam@89 1028 // write the Zip64 extended info
cannam@89 1029 short HeaderID = 1;
cannam@89 1030 short DataSize = 16;
cannam@89 1031 ZPOS64_T CompressedSize = 0;
cannam@89 1032 ZPOS64_T UncompressedSize = 0;
cannam@89 1033
cannam@89 1034 // Remember position of Zip64 extended info for the local file header. (needed when we update size after done with file)
cannam@89 1035 zi->ci.pos_zip64extrainfo = ZTELL64(zi->z_filefunc,zi->filestream);
cannam@89 1036
cannam@89 1037 err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (short)HeaderID,2);
cannam@89 1038 err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (short)DataSize,2);
cannam@89 1039
cannam@89 1040 err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (ZPOS64_T)UncompressedSize,8);
cannam@89 1041 err = zip64local_putValue(&zi->z_filefunc, zi->filestream, (ZPOS64_T)CompressedSize,8);
cannam@89 1042 }
cannam@89 1043
cannam@89 1044 return err;
cannam@89 1045 }
cannam@89 1046
cannam@89 1047 /*
cannam@89 1048 NOTE.
cannam@89 1049 When writing RAW the ZIP64 extended information in extrafield_local and extrafield_global needs to be stripped
cannam@89 1050 before calling this function it can be done with zipRemoveExtraInfoBlock
cannam@89 1051
cannam@89 1052 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 1053 unnecessary allocations.
cannam@89 1054 */
cannam@89 1055 extern int ZEXPORT zipOpenNewFileInZip4_64 (zipFile file, const char* filename, const zip_fileinfo* zipfi,
cannam@89 1056 const void* extrafield_local, uInt size_extrafield_local,
cannam@89 1057 const void* extrafield_global, uInt size_extrafield_global,
cannam@89 1058 const char* comment, int method, int level, int raw,
cannam@89 1059 int windowBits,int memLevel, int strategy,
cannam@89 1060 const char* password, uLong crcForCrypting,
cannam@89 1061 uLong versionMadeBy, uLong flagBase, int zip64)
cannam@89 1062 {
cannam@89 1063 zip64_internal* zi;
cannam@89 1064 uInt size_filename;
cannam@89 1065 uInt size_comment;
cannam@89 1066 uInt i;
cannam@89 1067 int err = ZIP_OK;
cannam@89 1068
cannam@89 1069 # ifdef NOCRYPT
cannam@89 1070 (crcForCrypting);
cannam@89 1071 if (password != NULL)
cannam@89 1072 return ZIP_PARAMERROR;
cannam@89 1073 # endif
cannam@89 1074
cannam@89 1075 if (file == NULL)
cannam@89 1076 return ZIP_PARAMERROR;
cannam@89 1077
cannam@89 1078 #ifdef HAVE_BZIP2
cannam@89 1079 if ((method!=0) && (method!=Z_DEFLATED) && (method!=Z_BZIP2ED))
cannam@89 1080 return ZIP_PARAMERROR;
cannam@89 1081 #else
cannam@89 1082 if ((method!=0) && (method!=Z_DEFLATED))
cannam@89 1083 return ZIP_PARAMERROR;
cannam@89 1084 #endif
cannam@89 1085
cannam@89 1086 zi = (zip64_internal*)file;
cannam@89 1087
cannam@89 1088 if (zi->in_opened_file_inzip == 1)
cannam@89 1089 {
cannam@89 1090 err = zipCloseFileInZip (file);
cannam@89 1091 if (err != ZIP_OK)
cannam@89 1092 return err;
cannam@89 1093 }
cannam@89 1094
cannam@89 1095 if (filename==NULL)
cannam@89 1096 filename="-";
cannam@89 1097
cannam@89 1098 if (comment==NULL)
cannam@89 1099 size_comment = 0;
cannam@89 1100 else
cannam@89 1101 size_comment = (uInt)strlen(comment);
cannam@89 1102
cannam@89 1103 size_filename = (uInt)strlen(filename);
cannam@89 1104
cannam@89 1105 if (zipfi == NULL)
cannam@89 1106 zi->ci.dosDate = 0;
cannam@89 1107 else
cannam@89 1108 {
cannam@89 1109 if (zipfi->dosDate != 0)
cannam@89 1110 zi->ci.dosDate = zipfi->dosDate;
cannam@89 1111 else
cannam@89 1112 zi->ci.dosDate = zip64local_TmzDateToDosDate(&zipfi->tmz_date);
cannam@89 1113 }
cannam@89 1114
cannam@89 1115 zi->ci.flag = flagBase;
cannam@89 1116 if ((level==8) || (level==9))
cannam@89 1117 zi->ci.flag |= 2;
cannam@89 1118 if (level==2)
cannam@89 1119 zi->ci.flag |= 4;
cannam@89 1120 if (level==1)
cannam@89 1121 zi->ci.flag |= 6;
cannam@89 1122 if (password != NULL)
cannam@89 1123 zi->ci.flag |= 1;
cannam@89 1124
cannam@89 1125 zi->ci.crc32 = 0;
cannam@89 1126 zi->ci.method = method;
cannam@89 1127 zi->ci.encrypt = 0;
cannam@89 1128 zi->ci.stream_initialised = 0;
cannam@89 1129 zi->ci.pos_in_buffered_data = 0;
cannam@89 1130 zi->ci.raw = raw;
cannam@89 1131 zi->ci.pos_local_header = ZTELL64(zi->z_filefunc,zi->filestream);
cannam@89 1132
cannam@89 1133 zi->ci.size_centralheader = SIZECENTRALHEADER + size_filename + size_extrafield_global + size_comment;
cannam@89 1134 zi->ci.size_centralExtraFree = 32; // Extra space we have reserved in case we need to add ZIP64 extra info data
cannam@89 1135
cannam@89 1136 zi->ci.central_header = (char*)ALLOC((uInt)zi->ci.size_centralheader + zi->ci.size_centralExtraFree);
cannam@89 1137
cannam@89 1138 zi->ci.size_centralExtra = size_extrafield_global;
cannam@89 1139 zip64local_putValue_inmemory(zi->ci.central_header,(uLong)CENTRALHEADERMAGIC,4);
cannam@89 1140 /* version info */
cannam@89 1141 zip64local_putValue_inmemory(zi->ci.central_header+4,(uLong)versionMadeBy,2);
cannam@89 1142 zip64local_putValue_inmemory(zi->ci.central_header+6,(uLong)20,2);
cannam@89 1143 zip64local_putValue_inmemory(zi->ci.central_header+8,(uLong)zi->ci.flag,2);
cannam@89 1144 zip64local_putValue_inmemory(zi->ci.central_header+10,(uLong)zi->ci.method,2);
cannam@89 1145 zip64local_putValue_inmemory(zi->ci.central_header+12,(uLong)zi->ci.dosDate,4);
cannam@89 1146 zip64local_putValue_inmemory(zi->ci.central_header+16,(uLong)0,4); /*crc*/
cannam@89 1147 zip64local_putValue_inmemory(zi->ci.central_header+20,(uLong)0,4); /*compr size*/
cannam@89 1148 zip64local_putValue_inmemory(zi->ci.central_header+24,(uLong)0,4); /*uncompr size*/
cannam@89 1149 zip64local_putValue_inmemory(zi->ci.central_header+28,(uLong)size_filename,2);
cannam@89 1150 zip64local_putValue_inmemory(zi->ci.central_header+30,(uLong)size_extrafield_global,2);
cannam@89 1151 zip64local_putValue_inmemory(zi->ci.central_header+32,(uLong)size_comment,2);
cannam@89 1152 zip64local_putValue_inmemory(zi->ci.central_header+34,(uLong)0,2); /*disk nm start*/
cannam@89 1153
cannam@89 1154 if (zipfi==NULL)
cannam@89 1155 zip64local_putValue_inmemory(zi->ci.central_header+36,(uLong)0,2);
cannam@89 1156 else
cannam@89 1157 zip64local_putValue_inmemory(zi->ci.central_header+36,(uLong)zipfi->internal_fa,2);
cannam@89 1158
cannam@89 1159 if (zipfi==NULL)
cannam@89 1160 zip64local_putValue_inmemory(zi->ci.central_header+38,(uLong)0,4);
cannam@89 1161 else
cannam@89 1162 zip64local_putValue_inmemory(zi->ci.central_header+38,(uLong)zipfi->external_fa,4);
cannam@89 1163
cannam@89 1164 if(zi->ci.pos_local_header >= 0xffffffff)
cannam@89 1165 zip64local_putValue_inmemory(zi->ci.central_header+42,(uLong)0xffffffff,4);
cannam@89 1166 else
cannam@89 1167 zip64local_putValue_inmemory(zi->ci.central_header+42,(uLong)zi->ci.pos_local_header - zi->add_position_when_writting_offset,4);
cannam@89 1168
cannam@89 1169 for (i=0;i<size_filename;i++)
cannam@89 1170 *(zi->ci.central_header+SIZECENTRALHEADER+i) = *(filename+i);
cannam@89 1171
cannam@89 1172 for (i=0;i<size_extrafield_global;i++)
cannam@89 1173 *(zi->ci.central_header+SIZECENTRALHEADER+size_filename+i) =
cannam@89 1174 *(((const char*)extrafield_global)+i);
cannam@89 1175
cannam@89 1176 for (i=0;i<size_comment;i++)
cannam@89 1177 *(zi->ci.central_header+SIZECENTRALHEADER+size_filename+
cannam@89 1178 size_extrafield_global+i) = *(comment+i);
cannam@89 1179 if (zi->ci.central_header == NULL)
cannam@89 1180 return ZIP_INTERNALERROR;
cannam@89 1181
cannam@89 1182 zi->ci.zip64 = zip64;
cannam@89 1183 zi->ci.totalCompressedData = 0;
cannam@89 1184 zi->ci.totalUncompressedData = 0;
cannam@89 1185 zi->ci.pos_zip64extrainfo = 0;
cannam@89 1186
cannam@89 1187 err = Write_LocalFileHeader(zi, filename, size_extrafield_local, extrafield_local);
cannam@89 1188
cannam@89 1189 #ifdef HAVE_BZIP2
cannam@89 1190 zi->ci.bstream.avail_in = (uInt)0;
cannam@89 1191 zi->ci.bstream.avail_out = (uInt)Z_BUFSIZE;
cannam@89 1192 zi->ci.bstream.next_out = (char*)zi->ci.buffered_data;
cannam@89 1193 zi->ci.bstream.total_in_hi32 = 0;
cannam@89 1194 zi->ci.bstream.total_in_lo32 = 0;
cannam@89 1195 zi->ci.bstream.total_out_hi32 = 0;
cannam@89 1196 zi->ci.bstream.total_out_lo32 = 0;
cannam@89 1197 #endif
cannam@89 1198
cannam@89 1199 zi->ci.stream.avail_in = (uInt)0;
cannam@89 1200 zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
cannam@89 1201 zi->ci.stream.next_out = zi->ci.buffered_data;
cannam@89 1202 zi->ci.stream.total_in = 0;
cannam@89 1203 zi->ci.stream.total_out = 0;
cannam@89 1204 zi->ci.stream.data_type = Z_BINARY;
cannam@89 1205
cannam@89 1206 #ifdef HAVE_BZIP2
cannam@89 1207 if ((err==ZIP_OK) && (zi->ci.method == Z_DEFLATED || zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw))
cannam@89 1208 #else
cannam@89 1209 if ((err==ZIP_OK) && (zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
cannam@89 1210 #endif
cannam@89 1211 {
cannam@89 1212 if(zi->ci.method == Z_DEFLATED)
cannam@89 1213 {
cannam@89 1214 zi->ci.stream.zalloc = (alloc_func)0;
cannam@89 1215 zi->ci.stream.zfree = (free_func)0;
cannam@89 1216 zi->ci.stream.opaque = (voidpf)0;
cannam@89 1217
cannam@89 1218 if (windowBits>0)
cannam@89 1219 windowBits = -windowBits;
cannam@89 1220
cannam@89 1221 err = deflateInit2(&zi->ci.stream, level, Z_DEFLATED, windowBits, memLevel, strategy);
cannam@89 1222
cannam@89 1223 if (err==Z_OK)
cannam@89 1224 zi->ci.stream_initialised = Z_DEFLATED;
cannam@89 1225 }
cannam@89 1226 else if(zi->ci.method == Z_BZIP2ED)
cannam@89 1227 {
cannam@89 1228 #ifdef HAVE_BZIP2
cannam@89 1229 // Init BZip stuff here
cannam@89 1230 zi->ci.bstream.bzalloc = 0;
cannam@89 1231 zi->ci.bstream.bzfree = 0;
cannam@89 1232 zi->ci.bstream.opaque = (voidpf)0;
cannam@89 1233
cannam@89 1234 err = BZ2_bzCompressInit(&zi->ci.bstream, level, 0,35);
cannam@89 1235 if(err == BZ_OK)
cannam@89 1236 zi->ci.stream_initialised = Z_BZIP2ED;
cannam@89 1237 #endif
cannam@89 1238 }
cannam@89 1239
cannam@89 1240 }
cannam@89 1241
cannam@89 1242 # ifndef NOCRYPT
cannam@89 1243 zi->ci.crypt_header_size = 0;
cannam@89 1244 if ((err==Z_OK) && (password != NULL))
cannam@89 1245 {
cannam@89 1246 unsigned char bufHead[RAND_HEAD_LEN];
cannam@89 1247 unsigned int sizeHead;
cannam@89 1248 zi->ci.encrypt = 1;
cannam@89 1249 zi->ci.pcrc_32_tab = get_crc_table();
cannam@89 1250 /*init_keys(password,zi->ci.keys,zi->ci.pcrc_32_tab);*/
cannam@89 1251
cannam@89 1252 sizeHead=crypthead(password,bufHead,RAND_HEAD_LEN,zi->ci.keys,zi->ci.pcrc_32_tab,crcForCrypting);
cannam@89 1253 zi->ci.crypt_header_size = sizeHead;
cannam@89 1254
cannam@89 1255 if (ZWRITE64(zi->z_filefunc,zi->filestream,bufHead,sizeHead) != sizeHead)
cannam@89 1256 err = ZIP_ERRNO;
cannam@89 1257 }
cannam@89 1258 # endif
cannam@89 1259
cannam@89 1260 if (err==Z_OK)
cannam@89 1261 zi->in_opened_file_inzip = 1;
cannam@89 1262 return err;
cannam@89 1263 }
cannam@89 1264
cannam@89 1265 extern int ZEXPORT zipOpenNewFileInZip4 (zipFile file, const char* filename, const zip_fileinfo* zipfi,
cannam@89 1266 const void* extrafield_local, uInt size_extrafield_local,
cannam@89 1267 const void* extrafield_global, uInt size_extrafield_global,
cannam@89 1268 const char* comment, int method, int level, int raw,
cannam@89 1269 int windowBits,int memLevel, int strategy,
cannam@89 1270 const char* password, uLong crcForCrypting,
cannam@89 1271 uLong versionMadeBy, uLong flagBase)
cannam@89 1272 {
cannam@89 1273 return zipOpenNewFileInZip4_64 (file, filename, zipfi,
cannam@89 1274 extrafield_local, size_extrafield_local,
cannam@89 1275 extrafield_global, size_extrafield_global,
cannam@89 1276 comment, method, level, raw,
cannam@89 1277 windowBits, memLevel, strategy,
cannam@89 1278 password, crcForCrypting, versionMadeBy, flagBase, 0);
cannam@89 1279 }
cannam@89 1280
cannam@89 1281 extern int ZEXPORT zipOpenNewFileInZip3 (zipFile file, const char* filename, const zip_fileinfo* zipfi,
cannam@89 1282 const void* extrafield_local, uInt size_extrafield_local,
cannam@89 1283 const void* extrafield_global, uInt size_extrafield_global,
cannam@89 1284 const char* comment, int method, int level, int raw,
cannam@89 1285 int windowBits,int memLevel, int strategy,
cannam@89 1286 const char* password, uLong crcForCrypting)
cannam@89 1287 {
cannam@89 1288 return zipOpenNewFileInZip4_64 (file, filename, zipfi,
cannam@89 1289 extrafield_local, size_extrafield_local,
cannam@89 1290 extrafield_global, size_extrafield_global,
cannam@89 1291 comment, method, level, raw,
cannam@89 1292 windowBits, memLevel, strategy,
cannam@89 1293 password, crcForCrypting, VERSIONMADEBY, 0, 0);
cannam@89 1294 }
cannam@89 1295
cannam@89 1296 extern int ZEXPORT zipOpenNewFileInZip3_64(zipFile file, const char* filename, const zip_fileinfo* zipfi,
cannam@89 1297 const void* extrafield_local, uInt size_extrafield_local,
cannam@89 1298 const void* extrafield_global, uInt size_extrafield_global,
cannam@89 1299 const char* comment, int method, int level, int raw,
cannam@89 1300 int windowBits,int memLevel, int strategy,
cannam@89 1301 const char* password, uLong crcForCrypting, int zip64)
cannam@89 1302 {
cannam@89 1303 return zipOpenNewFileInZip4_64 (file, filename, zipfi,
cannam@89 1304 extrafield_local, size_extrafield_local,
cannam@89 1305 extrafield_global, size_extrafield_global,
cannam@89 1306 comment, method, level, raw,
cannam@89 1307 windowBits, memLevel, strategy,
cannam@89 1308 password, crcForCrypting, VERSIONMADEBY, 0, zip64);
cannam@89 1309 }
cannam@89 1310
cannam@89 1311 extern int ZEXPORT zipOpenNewFileInZip2(zipFile file, const char* filename, const zip_fileinfo* zipfi,
cannam@89 1312 const void* extrafield_local, uInt size_extrafield_local,
cannam@89 1313 const void* extrafield_global, uInt size_extrafield_global,
cannam@89 1314 const char* comment, int method, int level, int raw)
cannam@89 1315 {
cannam@89 1316 return zipOpenNewFileInZip4_64 (file, filename, zipfi,
cannam@89 1317 extrafield_local, size_extrafield_local,
cannam@89 1318 extrafield_global, size_extrafield_global,
cannam@89 1319 comment, method, level, raw,
cannam@89 1320 -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
cannam@89 1321 NULL, 0, VERSIONMADEBY, 0, 0);
cannam@89 1322 }
cannam@89 1323
cannam@89 1324 extern int ZEXPORT zipOpenNewFileInZip2_64(zipFile file, const char* filename, const zip_fileinfo* zipfi,
cannam@89 1325 const void* extrafield_local, uInt size_extrafield_local,
cannam@89 1326 const void* extrafield_global, uInt size_extrafield_global,
cannam@89 1327 const char* comment, int method, int level, int raw, int zip64)
cannam@89 1328 {
cannam@89 1329 return zipOpenNewFileInZip4_64 (file, filename, zipfi,
cannam@89 1330 extrafield_local, size_extrafield_local,
cannam@89 1331 extrafield_global, size_extrafield_global,
cannam@89 1332 comment, method, level, raw,
cannam@89 1333 -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
cannam@89 1334 NULL, 0, VERSIONMADEBY, 0, zip64);
cannam@89 1335 }
cannam@89 1336
cannam@89 1337 extern int ZEXPORT zipOpenNewFileInZip64 (zipFile file, const char* filename, const zip_fileinfo* zipfi,
cannam@89 1338 const void* extrafield_local, uInt size_extrafield_local,
cannam@89 1339 const void*extrafield_global, uInt size_extrafield_global,
cannam@89 1340 const char* comment, int method, int level, int zip64)
cannam@89 1341 {
cannam@89 1342 return zipOpenNewFileInZip4_64 (file, filename, zipfi,
cannam@89 1343 extrafield_local, size_extrafield_local,
cannam@89 1344 extrafield_global, size_extrafield_global,
cannam@89 1345 comment, method, level, 0,
cannam@89 1346 -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
cannam@89 1347 NULL, 0, VERSIONMADEBY, 0, zip64);
cannam@89 1348 }
cannam@89 1349
cannam@89 1350 extern int ZEXPORT zipOpenNewFileInZip (zipFile file, const char* filename, const zip_fileinfo* zipfi,
cannam@89 1351 const void* extrafield_local, uInt size_extrafield_local,
cannam@89 1352 const void*extrafield_global, uInt size_extrafield_global,
cannam@89 1353 const char* comment, int method, int level)
cannam@89 1354 {
cannam@89 1355 return zipOpenNewFileInZip4_64 (file, filename, zipfi,
cannam@89 1356 extrafield_local, size_extrafield_local,
cannam@89 1357 extrafield_global, size_extrafield_global,
cannam@89 1358 comment, method, level, 0,
cannam@89 1359 -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
cannam@89 1360 NULL, 0, VERSIONMADEBY, 0, 0);
cannam@89 1361 }
cannam@89 1362
cannam@89 1363 local int zip64FlushWriteBuffer(zip64_internal* zi)
cannam@89 1364 {
cannam@89 1365 int err=ZIP_OK;
cannam@89 1366
cannam@89 1367 if (zi->ci.encrypt != 0)
cannam@89 1368 {
cannam@89 1369 #ifndef NOCRYPT
cannam@89 1370 uInt i;
cannam@89 1371 int t;
cannam@89 1372 for (i=0;i<zi->ci.pos_in_buffered_data;i++)
cannam@89 1373 zi->ci.buffered_data[i] = zencode(zi->ci.keys, zi->ci.pcrc_32_tab, zi->ci.buffered_data[i],t);
cannam@89 1374 #endif
cannam@89 1375 }
cannam@89 1376
cannam@89 1377 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 1378 err = ZIP_ERRNO;
cannam@89 1379
cannam@89 1380 zi->ci.totalCompressedData += zi->ci.pos_in_buffered_data;
cannam@89 1381
cannam@89 1382 #ifdef HAVE_BZIP2
cannam@89 1383 if(zi->ci.method == Z_BZIP2ED)
cannam@89 1384 {
cannam@89 1385 zi->ci.totalUncompressedData += zi->ci.bstream.total_in_lo32;
cannam@89 1386 zi->ci.bstream.total_in_lo32 = 0;
cannam@89 1387 zi->ci.bstream.total_in_hi32 = 0;
cannam@89 1388 }
cannam@89 1389 else
cannam@89 1390 #endif
cannam@89 1391 {
cannam@89 1392 zi->ci.totalUncompressedData += zi->ci.stream.total_in;
cannam@89 1393 zi->ci.stream.total_in = 0;
cannam@89 1394 }
cannam@89 1395
cannam@89 1396
cannam@89 1397 zi->ci.pos_in_buffered_data = 0;
cannam@89 1398
cannam@89 1399 return err;
cannam@89 1400 }
cannam@89 1401
cannam@89 1402 extern int ZEXPORT zipWriteInFileInZip (zipFile file,const void* buf,unsigned int len)
cannam@89 1403 {
cannam@89 1404 zip64_internal* zi;
cannam@89 1405 int err=ZIP_OK;
cannam@89 1406
cannam@89 1407 if (file == NULL)
cannam@89 1408 return ZIP_PARAMERROR;
cannam@89 1409 zi = (zip64_internal*)file;
cannam@89 1410
cannam@89 1411 if (zi->in_opened_file_inzip == 0)
cannam@89 1412 return ZIP_PARAMERROR;
cannam@89 1413
cannam@89 1414 zi->ci.crc32 = crc32(zi->ci.crc32,buf,(uInt)len);
cannam@89 1415
cannam@89 1416 #ifdef HAVE_BZIP2
cannam@89 1417 if(zi->ci.method == Z_BZIP2ED && (!zi->ci.raw))
cannam@89 1418 {
cannam@89 1419 zi->ci.bstream.next_in = (void*)buf;
cannam@89 1420 zi->ci.bstream.avail_in = len;
cannam@89 1421 err = BZ_RUN_OK;
cannam@89 1422
cannam@89 1423 while ((err==BZ_RUN_OK) && (zi->ci.bstream.avail_in>0))
cannam@89 1424 {
cannam@89 1425 if (zi->ci.bstream.avail_out == 0)
cannam@89 1426 {
cannam@89 1427 if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
cannam@89 1428 err = ZIP_ERRNO;
cannam@89 1429 zi->ci.bstream.avail_out = (uInt)Z_BUFSIZE;
cannam@89 1430 zi->ci.bstream.next_out = (char*)zi->ci.buffered_data;
cannam@89 1431 }
cannam@89 1432
cannam@89 1433
cannam@89 1434 if(err != BZ_RUN_OK)
cannam@89 1435 break;
cannam@89 1436
cannam@89 1437 if ((zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw))
cannam@89 1438 {
cannam@89 1439 uLong uTotalOutBefore_lo = zi->ci.bstream.total_out_lo32;
cannam@89 1440 // uLong uTotalOutBefore_hi = zi->ci.bstream.total_out_hi32;
cannam@89 1441 err=BZ2_bzCompress(&zi->ci.bstream, BZ_RUN);
cannam@89 1442
cannam@89 1443 zi->ci.pos_in_buffered_data += (uInt)(zi->ci.bstream.total_out_lo32 - uTotalOutBefore_lo) ;
cannam@89 1444 }
cannam@89 1445 }
cannam@89 1446
cannam@89 1447 if(err == BZ_RUN_OK)
cannam@89 1448 err = ZIP_OK;
cannam@89 1449 }
cannam@89 1450 else
cannam@89 1451 #endif
cannam@89 1452 {
cannam@89 1453 zi->ci.stream.next_in = (Bytef*)buf;
cannam@89 1454 zi->ci.stream.avail_in = len;
cannam@89 1455
cannam@89 1456 while ((err==ZIP_OK) && (zi->ci.stream.avail_in>0))
cannam@89 1457 {
cannam@89 1458 if (zi->ci.stream.avail_out == 0)
cannam@89 1459 {
cannam@89 1460 if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
cannam@89 1461 err = ZIP_ERRNO;
cannam@89 1462 zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
cannam@89 1463 zi->ci.stream.next_out = zi->ci.buffered_data;
cannam@89 1464 }
cannam@89 1465
cannam@89 1466
cannam@89 1467 if(err != ZIP_OK)
cannam@89 1468 break;
cannam@89 1469
cannam@89 1470 if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
cannam@89 1471 {
cannam@89 1472 uLong uTotalOutBefore = zi->ci.stream.total_out;
cannam@89 1473 err=deflate(&zi->ci.stream, Z_NO_FLUSH);
cannam@89 1474 if(uTotalOutBefore > zi->ci.stream.total_out)
cannam@89 1475 {
cannam@89 1476 int bBreak = 0;
cannam@89 1477 bBreak++;
cannam@89 1478 }
cannam@89 1479
cannam@89 1480 zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ;
cannam@89 1481 }
cannam@89 1482 else
cannam@89 1483 {
cannam@89 1484 uInt copy_this,i;
cannam@89 1485 if (zi->ci.stream.avail_in < zi->ci.stream.avail_out)
cannam@89 1486 copy_this = zi->ci.stream.avail_in;
cannam@89 1487 else
cannam@89 1488 copy_this = zi->ci.stream.avail_out;
cannam@89 1489
cannam@89 1490 for (i = 0; i < copy_this; i++)
cannam@89 1491 *(((char*)zi->ci.stream.next_out)+i) =
cannam@89 1492 *(((const char*)zi->ci.stream.next_in)+i);
cannam@89 1493 {
cannam@89 1494 zi->ci.stream.avail_in -= copy_this;
cannam@89 1495 zi->ci.stream.avail_out-= copy_this;
cannam@89 1496 zi->ci.stream.next_in+= copy_this;
cannam@89 1497 zi->ci.stream.next_out+= copy_this;
cannam@89 1498 zi->ci.stream.total_in+= copy_this;
cannam@89 1499 zi->ci.stream.total_out+= copy_this;
cannam@89 1500 zi->ci.pos_in_buffered_data += copy_this;
cannam@89 1501 }
cannam@89 1502 }
cannam@89 1503 }// while(...)
cannam@89 1504 }
cannam@89 1505
cannam@89 1506 return err;
cannam@89 1507 }
cannam@89 1508
cannam@89 1509 extern int ZEXPORT zipCloseFileInZipRaw (zipFile file, uLong uncompressed_size, uLong crc32)
cannam@89 1510 {
cannam@89 1511 return zipCloseFileInZipRaw64 (file, uncompressed_size, crc32);
cannam@89 1512 }
cannam@89 1513
cannam@89 1514 extern int ZEXPORT zipCloseFileInZipRaw64 (zipFile file, ZPOS64_T uncompressed_size, uLong crc32)
cannam@89 1515 {
cannam@89 1516 zip64_internal* zi;
cannam@89 1517 ZPOS64_T compressed_size;
cannam@89 1518 uLong invalidValue = 0xffffffff;
cannam@89 1519 short datasize = 0;
cannam@89 1520 int err=ZIP_OK;
cannam@89 1521
cannam@89 1522 if (file == NULL)
cannam@89 1523 return ZIP_PARAMERROR;
cannam@89 1524 zi = (zip64_internal*)file;
cannam@89 1525
cannam@89 1526 if (zi->in_opened_file_inzip == 0)
cannam@89 1527 return ZIP_PARAMERROR;
cannam@89 1528 zi->ci.stream.avail_in = 0;
cannam@89 1529
cannam@89 1530 if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
cannam@89 1531 {
cannam@89 1532 while (err==ZIP_OK)
cannam@89 1533 {
cannam@89 1534 uLong uTotalOutBefore;
cannam@89 1535 if (zi->ci.stream.avail_out == 0)
cannam@89 1536 {
cannam@89 1537 if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
cannam@89 1538 err = ZIP_ERRNO;
cannam@89 1539 zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
cannam@89 1540 zi->ci.stream.next_out = zi->ci.buffered_data;
cannam@89 1541 }
cannam@89 1542 uTotalOutBefore = zi->ci.stream.total_out;
cannam@89 1543 err=deflate(&zi->ci.stream, Z_FINISH);
cannam@89 1544 zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ;
cannam@89 1545 }
cannam@89 1546 }
cannam@89 1547 else if ((zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw))
cannam@89 1548 {
cannam@89 1549 #ifdef HAVE_BZIP2
cannam@89 1550 err = BZ_FINISH_OK;
cannam@89 1551 while (err==BZ_FINISH_OK)
cannam@89 1552 {
cannam@89 1553 uLong uTotalOutBefore;
cannam@89 1554 if (zi->ci.bstream.avail_out == 0)
cannam@89 1555 {
cannam@89 1556 if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
cannam@89 1557 err = ZIP_ERRNO;
cannam@89 1558 zi->ci.bstream.avail_out = (uInt)Z_BUFSIZE;
cannam@89 1559 zi->ci.bstream.next_out = (char*)zi->ci.buffered_data;
cannam@89 1560 }
cannam@89 1561 uTotalOutBefore = zi->ci.bstream.total_out_lo32;
cannam@89 1562 err=BZ2_bzCompress(&zi->ci.bstream, BZ_FINISH);
cannam@89 1563 if(err == BZ_STREAM_END)
cannam@89 1564 err = Z_STREAM_END;
cannam@89 1565
cannam@89 1566 zi->ci.pos_in_buffered_data += (uInt)(zi->ci.bstream.total_out_lo32 - uTotalOutBefore);
cannam@89 1567 }
cannam@89 1568
cannam@89 1569 if(err == BZ_FINISH_OK)
cannam@89 1570 err = ZIP_OK;
cannam@89 1571 #endif
cannam@89 1572 }
cannam@89 1573
cannam@89 1574 if (err==Z_STREAM_END)
cannam@89 1575 err=ZIP_OK; /* this is normal */
cannam@89 1576
cannam@89 1577 if ((zi->ci.pos_in_buffered_data>0) && (err==ZIP_OK))
cannam@89 1578 {
cannam@89 1579 if (zip64FlushWriteBuffer(zi)==ZIP_ERRNO)
cannam@89 1580 err = ZIP_ERRNO;
cannam@89 1581 }
cannam@89 1582
cannam@89 1583 if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
cannam@89 1584 {
cannam@89 1585 int tmp_err = deflateEnd(&zi->ci.stream);
cannam@89 1586 if (err == ZIP_OK)
cannam@89 1587 err = tmp_err;
cannam@89 1588 zi->ci.stream_initialised = 0;
cannam@89 1589 }
cannam@89 1590 #ifdef HAVE_BZIP2
cannam@89 1591 else if((zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw))
cannam@89 1592 {
cannam@89 1593 int tmperr = BZ2_bzCompressEnd(&zi->ci.bstream);
cannam@89 1594 if (err==ZIP_OK)
cannam@89 1595 err = tmperr;
cannam@89 1596 zi->ci.stream_initialised = 0;
cannam@89 1597 }
cannam@89 1598 #endif
cannam@89 1599
cannam@89 1600 if (!zi->ci.raw)
cannam@89 1601 {
cannam@89 1602 crc32 = (uLong)zi->ci.crc32;
cannam@89 1603 uncompressed_size = zi->ci.totalUncompressedData;
cannam@89 1604 }
cannam@89 1605 compressed_size = zi->ci.totalCompressedData;
cannam@89 1606
cannam@89 1607 # ifndef NOCRYPT
cannam@89 1608 compressed_size += zi->ci.crypt_header_size;
cannam@89 1609 # endif
cannam@89 1610
cannam@89 1611 // update Current Item crc and sizes,
cannam@89 1612 if(compressed_size >= 0xffffffff || uncompressed_size >= 0xffffffff || zi->ci.pos_local_header >= 0xffffffff)
cannam@89 1613 {
cannam@89 1614 /*version Made by*/
cannam@89 1615 zip64local_putValue_inmemory(zi->ci.central_header+4,(uLong)45,2);
cannam@89 1616 /*version needed*/
cannam@89 1617 zip64local_putValue_inmemory(zi->ci.central_header+6,(uLong)45,2);
cannam@89 1618
cannam@89 1619 }
cannam@89 1620
cannam@89 1621 zip64local_putValue_inmemory(zi->ci.central_header+16,crc32,4); /*crc*/
cannam@89 1622
cannam@89 1623
cannam@89 1624 if(compressed_size >= 0xffffffff)
cannam@89 1625 zip64local_putValue_inmemory(zi->ci.central_header+20, invalidValue,4); /*compr size*/
cannam@89 1626 else
cannam@89 1627 zip64local_putValue_inmemory(zi->ci.central_header+20, compressed_size,4); /*compr size*/
cannam@89 1628
cannam@89 1629 /// set internal file attributes field
cannam@89 1630 if (zi->ci.stream.data_type == Z_ASCII)
cannam@89 1631 zip64local_putValue_inmemory(zi->ci.central_header+36,(uLong)Z_ASCII,2);
cannam@89 1632
cannam@89 1633 if(uncompressed_size >= 0xffffffff)
cannam@89 1634 zip64local_putValue_inmemory(zi->ci.central_header+24, invalidValue,4); /*uncompr size*/
cannam@89 1635 else
cannam@89 1636 zip64local_putValue_inmemory(zi->ci.central_header+24, uncompressed_size,4); /*uncompr size*/
cannam@89 1637
cannam@89 1638 // Add ZIP64 extra info field for uncompressed size
cannam@89 1639 if(uncompressed_size >= 0xffffffff)
cannam@89 1640 datasize += 8;
cannam@89 1641
cannam@89 1642 // Add ZIP64 extra info field for compressed size
cannam@89 1643 if(compressed_size >= 0xffffffff)
cannam@89 1644 datasize += 8;
cannam@89 1645
cannam@89 1646 // Add ZIP64 extra info field for relative offset to local file header of current file
cannam@89 1647 if(zi->ci.pos_local_header >= 0xffffffff)
cannam@89 1648 datasize += 8;
cannam@89 1649
cannam@89 1650 if(datasize > 0)
cannam@89 1651 {
cannam@89 1652 char* p = NULL;
cannam@89 1653
cannam@89 1654 if((uLong)(datasize + 4) > zi->ci.size_centralExtraFree)
cannam@89 1655 {
cannam@89 1656 // we can not write more data to the buffer that we have room for.
cannam@89 1657 return ZIP_BADZIPFILE;
cannam@89 1658 }
cannam@89 1659
cannam@89 1660 p = zi->ci.central_header + zi->ci.size_centralheader;
cannam@89 1661
cannam@89 1662 // Add Extra Information Header for 'ZIP64 information'
cannam@89 1663 zip64local_putValue_inmemory(p, 0x0001, 2); // HeaderID
cannam@89 1664 p += 2;
cannam@89 1665 zip64local_putValue_inmemory(p, datasize, 2); // DataSize
cannam@89 1666 p += 2;
cannam@89 1667
cannam@89 1668 if(uncompressed_size >= 0xffffffff)
cannam@89 1669 {
cannam@89 1670 zip64local_putValue_inmemory(p, uncompressed_size, 8);
cannam@89 1671 p += 8;
cannam@89 1672 }
cannam@89 1673
cannam@89 1674 if(compressed_size >= 0xffffffff)
cannam@89 1675 {
cannam@89 1676 zip64local_putValue_inmemory(p, compressed_size, 8);
cannam@89 1677 p += 8;
cannam@89 1678 }
cannam@89 1679
cannam@89 1680 if(zi->ci.pos_local_header >= 0xffffffff)
cannam@89 1681 {
cannam@89 1682 zip64local_putValue_inmemory(p, zi->ci.pos_local_header, 8);
cannam@89 1683 p += 8;
cannam@89 1684 }
cannam@89 1685
cannam@89 1686 // Update how much extra free space we got in the memory buffer
cannam@89 1687 // and increase the centralheader size so the new ZIP64 fields are included
cannam@89 1688 // ( 4 below is the size of HeaderID and DataSize field )
cannam@89 1689 zi->ci.size_centralExtraFree -= datasize + 4;
cannam@89 1690 zi->ci.size_centralheader += datasize + 4;
cannam@89 1691
cannam@89 1692 // Update the extra info size field
cannam@89 1693 zi->ci.size_centralExtra += datasize + 4;
cannam@89 1694 zip64local_putValue_inmemory(zi->ci.central_header+30,(uLong)zi->ci.size_centralExtra,2);
cannam@89 1695 }
cannam@89 1696
cannam@89 1697 if (err==ZIP_OK)
cannam@89 1698 err = add_data_in_datablock(&zi->central_dir, zi->ci.central_header, (uLong)zi->ci.size_centralheader);
cannam@89 1699
cannam@89 1700 free(zi->ci.central_header);
cannam@89 1701
cannam@89 1702 if (err==ZIP_OK)
cannam@89 1703 {
cannam@89 1704 // Update the LocalFileHeader with the new values.
cannam@89 1705
cannam@89 1706 ZPOS64_T cur_pos_inzip = ZTELL64(zi->z_filefunc,zi->filestream);
cannam@89 1707
cannam@89 1708 if (ZSEEK64(zi->z_filefunc,zi->filestream, zi->ci.pos_local_header + 14,ZLIB_FILEFUNC_SEEK_SET)!=0)
cannam@89 1709 err = ZIP_ERRNO;
cannam@89 1710
cannam@89 1711 if (err==ZIP_OK)
cannam@89 1712 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,crc32,4); /* crc 32, unknown */
cannam@89 1713
cannam@89 1714 if(uncompressed_size >= 0xffffffff || compressed_size >= 0xffffffff )
cannam@89 1715 {
cannam@89 1716 if(zi->ci.pos_zip64extrainfo > 0)
cannam@89 1717 {
cannam@89 1718 // Update the size in the ZIP64 extended field.
cannam@89 1719 if (ZSEEK64(zi->z_filefunc,zi->filestream, zi->ci.pos_zip64extrainfo + 4,ZLIB_FILEFUNC_SEEK_SET)!=0)
cannam@89 1720 err = ZIP_ERRNO;
cannam@89 1721
cannam@89 1722 if (err==ZIP_OK) /* compressed size, unknown */
cannam@89 1723 err = zip64local_putValue(&zi->z_filefunc, zi->filestream, uncompressed_size, 8);
cannam@89 1724
cannam@89 1725 if (err==ZIP_OK) /* uncompressed size, unknown */
cannam@89 1726 err = zip64local_putValue(&zi->z_filefunc, zi->filestream, compressed_size, 8);
cannam@89 1727 }
cannam@89 1728 else
cannam@89 1729 err = ZIP_BADZIPFILE; // Caller passed zip64 = 0, so no room for zip64 info -> fatal
cannam@89 1730 }
cannam@89 1731 else
cannam@89 1732 {
cannam@89 1733 if (err==ZIP_OK) /* compressed size, unknown */
cannam@89 1734 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,compressed_size,4);
cannam@89 1735
cannam@89 1736 if (err==ZIP_OK) /* uncompressed size, unknown */
cannam@89 1737 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,uncompressed_size,4);
cannam@89 1738 }
cannam@89 1739
cannam@89 1740 if (ZSEEK64(zi->z_filefunc,zi->filestream, cur_pos_inzip,ZLIB_FILEFUNC_SEEK_SET)!=0)
cannam@89 1741 err = ZIP_ERRNO;
cannam@89 1742 }
cannam@89 1743
cannam@89 1744 zi->number_entry ++;
cannam@89 1745 zi->in_opened_file_inzip = 0;
cannam@89 1746
cannam@89 1747 return err;
cannam@89 1748 }
cannam@89 1749
cannam@89 1750 extern int ZEXPORT zipCloseFileInZip (zipFile file)
cannam@89 1751 {
cannam@89 1752 return zipCloseFileInZipRaw (file,0,0);
cannam@89 1753 }
cannam@89 1754
cannam@89 1755 int Write_Zip64EndOfCentralDirectoryLocator(zip64_internal* zi, ZPOS64_T zip64eocd_pos_inzip)
cannam@89 1756 {
cannam@89 1757 int err = ZIP_OK;
cannam@89 1758 ZPOS64_T pos = zip64eocd_pos_inzip - zi->add_position_when_writting_offset;
cannam@89 1759
cannam@89 1760 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)ZIP64ENDLOCHEADERMAGIC,4);
cannam@89 1761
cannam@89 1762 /*num disks*/
cannam@89 1763 if (err==ZIP_OK) /* number of the disk with the start of the central directory */
cannam@89 1764 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4);
cannam@89 1765
cannam@89 1766 /*relative offset*/
cannam@89 1767 if (err==ZIP_OK) /* Relative offset to the Zip64EndOfCentralDirectory */
cannam@89 1768 err = zip64local_putValue(&zi->z_filefunc,zi->filestream, pos,8);
cannam@89 1769
cannam@89 1770 /*total disks*/ /* Do not support spawning of disk so always say 1 here*/
cannam@89 1771 if (err==ZIP_OK) /* number of the disk with the start of the central directory */
cannam@89 1772 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)1,4);
cannam@89 1773
cannam@89 1774 return err;
cannam@89 1775 }
cannam@89 1776
cannam@89 1777 int Write_Zip64EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
cannam@89 1778 {
cannam@89 1779 int err = ZIP_OK;
cannam@89 1780
cannam@89 1781 uLong Zip64DataSize = 44;
cannam@89 1782
cannam@89 1783 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)ZIP64ENDHEADERMAGIC,4);
cannam@89 1784
cannam@89 1785 if (err==ZIP_OK) /* size of this 'zip64 end of central directory' */
cannam@89 1786 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(ZPOS64_T)Zip64DataSize,8); // why ZPOS64_T of this ?
cannam@89 1787
cannam@89 1788 if (err==ZIP_OK) /* version made by */
cannam@89 1789 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)45,2);
cannam@89 1790
cannam@89 1791 if (err==ZIP_OK) /* version needed */
cannam@89 1792 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)45,2);
cannam@89 1793
cannam@89 1794 if (err==ZIP_OK) /* number of this disk */
cannam@89 1795 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4);
cannam@89 1796
cannam@89 1797 if (err==ZIP_OK) /* number of the disk with the start of the central directory */
cannam@89 1798 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4);
cannam@89 1799
cannam@89 1800 if (err==ZIP_OK) /* total number of entries in the central dir on this disk */
cannam@89 1801 err = zip64local_putValue(&zi->z_filefunc, zi->filestream, zi->number_entry, 8);
cannam@89 1802
cannam@89 1803 if (err==ZIP_OK) /* total number of entries in the central dir */
cannam@89 1804 err = zip64local_putValue(&zi->z_filefunc, zi->filestream, zi->number_entry, 8);
cannam@89 1805
cannam@89 1806 if (err==ZIP_OK) /* size of the central directory */
cannam@89 1807 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(ZPOS64_T)size_centraldir,8);
cannam@89 1808
cannam@89 1809 if (err==ZIP_OK) /* offset of start of central directory with respect to the starting disk number */
cannam@89 1810 {
cannam@89 1811 ZPOS64_T pos = centraldir_pos_inzip - zi->add_position_when_writting_offset;
cannam@89 1812 err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (ZPOS64_T)pos,8);
cannam@89 1813 }
cannam@89 1814 return err;
cannam@89 1815 }
cannam@89 1816 int Write_EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
cannam@89 1817 {
cannam@89 1818 int err = ZIP_OK;
cannam@89 1819
cannam@89 1820 /*signature*/
cannam@89 1821 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)ENDHEADERMAGIC,4);
cannam@89 1822
cannam@89 1823 if (err==ZIP_OK) /* number of this disk */
cannam@89 1824 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,2);
cannam@89 1825
cannam@89 1826 if (err==ZIP_OK) /* number of the disk with the start of the central directory */
cannam@89 1827 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,2);
cannam@89 1828
cannam@89 1829 if (err==ZIP_OK) /* total number of entries in the central dir on this disk */
cannam@89 1830 {
cannam@89 1831 {
cannam@89 1832 if(zi->number_entry >= 0xFFFF)
cannam@89 1833 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0xffff,2); // use value in ZIP64 record
cannam@89 1834 else
cannam@89 1835 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->number_entry,2);
cannam@89 1836 }
cannam@89 1837 }
cannam@89 1838
cannam@89 1839 if (err==ZIP_OK) /* total number of entries in the central dir */
cannam@89 1840 {
cannam@89 1841 if(zi->number_entry >= 0xFFFF)
cannam@89 1842 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0xffff,2); // use value in ZIP64 record
cannam@89 1843 else
cannam@89 1844 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->number_entry,2);
cannam@89 1845 }
cannam@89 1846
cannam@89 1847 if (err==ZIP_OK) /* size of the central directory */
cannam@89 1848 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_centraldir,4);
cannam@89 1849
cannam@89 1850 if (err==ZIP_OK) /* offset of start of central directory with respect to the starting disk number */
cannam@89 1851 {
cannam@89 1852 ZPOS64_T pos = centraldir_pos_inzip - zi->add_position_when_writting_offset;
cannam@89 1853 if(pos >= 0xffffffff)
cannam@89 1854 {
cannam@89 1855 err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (uLong)0xffffffff,4);
cannam@89 1856 }
cannam@89 1857 else
cannam@89 1858 err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (uLong)(centraldir_pos_inzip - zi->add_position_when_writting_offset),4);
cannam@89 1859 }
cannam@89 1860
cannam@89 1861 return err;
cannam@89 1862 }
cannam@89 1863
cannam@89 1864 int Write_GlobalComment(zip64_internal* zi, const char* global_comment)
cannam@89 1865 {
cannam@89 1866 int err = ZIP_OK;
cannam@89 1867 uInt size_global_comment = 0;
cannam@89 1868
cannam@89 1869 if(global_comment != NULL)
cannam@89 1870 size_global_comment = (uInt)strlen(global_comment);
cannam@89 1871
cannam@89 1872 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_global_comment,2);
cannam@89 1873
cannam@89 1874 if (err == ZIP_OK && size_global_comment > 0)
cannam@89 1875 {
cannam@89 1876 if (ZWRITE64(zi->z_filefunc,zi->filestream, global_comment, size_global_comment) != size_global_comment)
cannam@89 1877 err = ZIP_ERRNO;
cannam@89 1878 }
cannam@89 1879 return err;
cannam@89 1880 }
cannam@89 1881
cannam@89 1882 extern int ZEXPORT zipClose (zipFile file, const char* global_comment)
cannam@89 1883 {
cannam@89 1884 zip64_internal* zi;
cannam@89 1885 int err = 0;
cannam@89 1886 uLong size_centraldir = 0;
cannam@89 1887 ZPOS64_T centraldir_pos_inzip;
cannam@89 1888 ZPOS64_T pos;
cannam@89 1889
cannam@89 1890 if (file == NULL)
cannam@89 1891 return ZIP_PARAMERROR;
cannam@89 1892
cannam@89 1893 zi = (zip64_internal*)file;
cannam@89 1894
cannam@89 1895 if (zi->in_opened_file_inzip == 1)
cannam@89 1896 {
cannam@89 1897 err = zipCloseFileInZip (file);
cannam@89 1898 }
cannam@89 1899
cannam@89 1900 #ifndef NO_ADDFILEINEXISTINGZIP
cannam@89 1901 if (global_comment==NULL)
cannam@89 1902 global_comment = zi->globalcomment;
cannam@89 1903 #endif
cannam@89 1904
cannam@89 1905 centraldir_pos_inzip = ZTELL64(zi->z_filefunc,zi->filestream);
cannam@89 1906
cannam@89 1907 if (err==ZIP_OK)
cannam@89 1908 {
cannam@89 1909 linkedlist_datablock_internal* ldi = zi->central_dir.first_block;
cannam@89 1910 while (ldi!=NULL)
cannam@89 1911 {
cannam@89 1912 if ((err==ZIP_OK) && (ldi->filled_in_this_block>0))
cannam@89 1913 {
cannam@89 1914 if (ZWRITE64(zi->z_filefunc,zi->filestream, ldi->data, ldi->filled_in_this_block) != ldi->filled_in_this_block)
cannam@89 1915 err = ZIP_ERRNO;
cannam@89 1916 }
cannam@89 1917
cannam@89 1918 size_centraldir += ldi->filled_in_this_block;
cannam@89 1919 ldi = ldi->next_datablock;
cannam@89 1920 }
cannam@89 1921 }
cannam@89 1922 free_linkedlist(&(zi->central_dir));
cannam@89 1923
cannam@89 1924 pos = centraldir_pos_inzip - zi->add_position_when_writting_offset;
cannam@89 1925 if(pos >= 0xffffffff || zi->number_entry > 0xFFFF)
cannam@89 1926 {
cannam@89 1927 ZPOS64_T Zip64EOCDpos = ZTELL64(zi->z_filefunc,zi->filestream);
cannam@89 1928 Write_Zip64EndOfCentralDirectoryRecord(zi, size_centraldir, centraldir_pos_inzip);
cannam@89 1929
cannam@89 1930 Write_Zip64EndOfCentralDirectoryLocator(zi, Zip64EOCDpos);
cannam@89 1931 }
cannam@89 1932
cannam@89 1933 if (err==ZIP_OK)
cannam@89 1934 err = Write_EndOfCentralDirectoryRecord(zi, size_centraldir, centraldir_pos_inzip);
cannam@89 1935
cannam@89 1936 if(err == ZIP_OK)
cannam@89 1937 err = Write_GlobalComment(zi, global_comment);
cannam@89 1938
cannam@89 1939 if (ZCLOSE64(zi->z_filefunc,zi->filestream) != 0)
cannam@89 1940 if (err == ZIP_OK)
cannam@89 1941 err = ZIP_ERRNO;
cannam@89 1942
cannam@89 1943 #ifndef NO_ADDFILEINEXISTINGZIP
cannam@89 1944 TRYFREE(zi->globalcomment);
cannam@89 1945 #endif
cannam@89 1946 TRYFREE(zi);
cannam@89 1947
cannam@89 1948 return err;
cannam@89 1949 }
cannam@89 1950
cannam@89 1951 extern int ZEXPORT zipRemoveExtraInfoBlock (char* pData, int* dataLen, short sHeader)
cannam@89 1952 {
cannam@89 1953 char* p = pData;
cannam@89 1954 int size = 0;
cannam@89 1955 char* pNewHeader;
cannam@89 1956 char* pTmp;
cannam@89 1957 short header;
cannam@89 1958 short dataSize;
cannam@89 1959
cannam@89 1960 int retVal = ZIP_OK;
cannam@89 1961
cannam@89 1962 if(pData == NULL || *dataLen < 4)
cannam@89 1963 return ZIP_PARAMERROR;
cannam@89 1964
cannam@89 1965 pNewHeader = (char*)ALLOC(*dataLen);
cannam@89 1966 pTmp = pNewHeader;
cannam@89 1967
cannam@89 1968 while(p < (pData + *dataLen))
cannam@89 1969 {
cannam@89 1970 header = *(short*)p;
cannam@89 1971 dataSize = *(((short*)p)+1);
cannam@89 1972
cannam@89 1973 if( header == sHeader ) // Header found.
cannam@89 1974 {
cannam@89 1975 p += dataSize + 4; // skip it. do not copy to temp buffer
cannam@89 1976 }
cannam@89 1977 else
cannam@89 1978 {
cannam@89 1979 // Extra Info block should not be removed, So copy it to the temp buffer.
cannam@89 1980 memcpy(pTmp, p, dataSize + 4);
cannam@89 1981 p += dataSize + 4;
cannam@89 1982 size += dataSize + 4;
cannam@89 1983 }
cannam@89 1984
cannam@89 1985 }
cannam@89 1986
cannam@89 1987 if(size < *dataLen)
cannam@89 1988 {
cannam@89 1989 // clean old extra info block.
cannam@89 1990 memset(pData,0, *dataLen);
cannam@89 1991
cannam@89 1992 // copy the new extra info block over the old
cannam@89 1993 if(size > 0)
cannam@89 1994 memcpy(pData, pNewHeader, size);
cannam@89 1995
cannam@89 1996 // set the new extra info size
cannam@89 1997 *dataLen = size;
cannam@89 1998
cannam@89 1999 retVal = ZIP_OK;
cannam@89 2000 }
cannam@89 2001 else
cannam@89 2002 retVal = ZIP_ERRNO;
cannam@89 2003
cannam@89 2004 TRYFREE(pNewHeader);
cannam@89 2005
cannam@89 2006 return retVal;
cannam@89 2007 }