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