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
allocate_new_datablock()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
free_datablock(linkedlist_datablock_internal * ldi)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
init_linkedlist(linkedlist_data * ll)213 local void init_linkedlist(linkedlist_data* ll)
214 {
215 ll->first_block = ll->last_block = NULL;
216 }
217
free_linkedlist(linkedlist_data * ll)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
add_data_in_datablock(linkedlist_data * ll,const void * buf,uLong len)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));
zip64local_putValue(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));
zip64local_putValue_inmemory(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
zip64local_TmzDateToDosDate(const tm_zip * ptm)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
zip64local_getByte(const zlib_filefunc64_32_def * pzlib_filefunc_def,voidpf filestream,int * pi)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
zip64local_getShort(const zlib_filefunc64_32_def * pzlib_filefunc_def,voidpf filestream,uLong * pX)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
zip64local_getLong(const zlib_filefunc64_32_def * pzlib_filefunc_def,voidpf filestream,uLong * pX)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
zip64local_getLong64(const zlib_filefunc64_32_def * pzlib_filefunc_def,voidpf filestream,ZPOS64_T * pX)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
zip64local_SearchCentralDir(const zlib_filefunc64_32_def * pzlib_filefunc_def,voidpf filestream)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
zip64local_SearchCentralDir64(const zlib_filefunc64_32_def * pzlib_filefunc_def,voidpf filestream)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
LoadCentralDirectoryRecord(zip64_internal * pziinit)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 /************************************************************/
zipOpen3(const void * pathname,int append,zipcharpc * globalcomment,zlib_filefunc64_32_def * pzlib_filefunc64_32_def)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__
zipOpen2(const char * pathname,int append,zipcharpc * globalcomment,zlib_filefunc_def * pzlib_filefunc32_def)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
zipOpen2_64(const void * pathname,int append,zipcharpc * globalcomment,zlib_filefunc64_def * pzlib_filefunc_def)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
zipOpen(const char * pathname,int append)954 extern zipFile ZEXPORT zipOpen (const char* pathname, int append)
955 {
956 return zipOpen3((const void*)pathname,append,NULL,NULL);
957 }
958
zipOpen64(const void * pathname,int append)959 extern zipFile ZEXPORT zipOpen64 (const void* pathname, int append)
960 {
961 return zipOpen3(pathname,append,NULL,NULL);
962 }
963
Write_LocalFileHeader(zip64_internal * zi,const char * filename,uInt size_extrafield_local,const void * extrafield_local)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 */
zipOpenNewFileInZip4_64(zipFile file,const char * filename,const zip_fileinfo * zipfi,const void * extrafield_local,uInt size_extrafield_local,const void * extrafield_global,uInt size_extrafield_global,const char * comment,int method,int level,int raw,int windowBits,int memLevel,int strategy,const char * password,uLong crcForCrypting,uLong versionMadeBy,uLong flagBase,int zip64)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
zipOpenNewFileInZip4(zipFile file,const char * filename,const zip_fileinfo * zipfi,const void * extrafield_local,uInt size_extrafield_local,const void * extrafield_global,uInt size_extrafield_global,const char * comment,int method,int level,int raw,int windowBits,int memLevel,int strategy,const char * password,uLong crcForCrypting,uLong versionMadeBy,uLong flagBase)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
zipOpenNewFileInZip3(zipFile file,const char * filename,const zip_fileinfo * zipfi,const void * extrafield_local,uInt size_extrafield_local,const void * extrafield_global,uInt size_extrafield_global,const char * comment,int method,int level,int raw,int windowBits,int memLevel,int strategy,const char * password,uLong crcForCrypting)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
zipOpenNewFileInZip3_64(zipFile file,const char * filename,const zip_fileinfo * zipfi,const void * extrafield_local,uInt size_extrafield_local,const void * extrafield_global,uInt size_extrafield_global,const char * comment,int method,int level,int raw,int windowBits,int memLevel,int strategy,const char * password,uLong crcForCrypting,int zip64)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
zipOpenNewFileInZip2(zipFile file,const char * filename,const zip_fileinfo * zipfi,const void * extrafield_local,uInt size_extrafield_local,const void * extrafield_global,uInt size_extrafield_global,const char * comment,int method,int level,int raw)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
zipOpenNewFileInZip2_64(zipFile file,const char * filename,const zip_fileinfo * zipfi,const void * extrafield_local,uInt size_extrafield_local,const void * extrafield_global,uInt size_extrafield_global,const char * comment,int method,int level,int raw,int zip64)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
zipOpenNewFileInZip64(zipFile file,const char * filename,const zip_fileinfo * zipfi,const void * extrafield_local,uInt size_extrafield_local,const void * extrafield_global,uInt size_extrafield_global,const char * comment,int method,int level,int zip64)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
zipOpenNewFileInZip(zipFile file,const char * filename,const zip_fileinfo * zipfi,const void * extrafield_local,uInt size_extrafield_local,const void * extrafield_global,uInt size_extrafield_global,const char * comment,int method,int level)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
zip64FlushWriteBuffer(zip64_internal * zi)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
zipWriteInFileInZip(zipFile file,const void * buf,unsigned int len)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
1481 zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ;
1482 }
1483 else
1484 {
1485 uInt copy_this,i;
1486 if (zi->ci.stream.avail_in < zi->ci.stream.avail_out)
1487 copy_this = zi->ci.stream.avail_in;
1488 else
1489 copy_this = zi->ci.stream.avail_out;
1490
1491 for (i = 0; i < copy_this; i++)
1492 *(((char*)zi->ci.stream.next_out)+i) =
1493 *(((const char*)zi->ci.stream.next_in)+i);
1494 {
1495 zi->ci.stream.avail_in -= copy_this;
1496 zi->ci.stream.avail_out-= copy_this;
1497 zi->ci.stream.next_in+= copy_this;
1498 zi->ci.stream.next_out+= copy_this;
1499 zi->ci.stream.total_in+= copy_this;
1500 zi->ci.stream.total_out+= copy_this;
1501 zi->ci.pos_in_buffered_data += copy_this;
1502 }
1503 }
1504 }// while(...)
1505 }
1506
1507 return err;
1508 }
1509
zipCloseFileInZipRaw(zipFile file,uLong uncompressed_size,uLong crc32)1510 extern int ZEXPORT zipCloseFileInZipRaw (zipFile file, uLong uncompressed_size, uLong crc32)
1511 {
1512 return zipCloseFileInZipRaw64 (file, uncompressed_size, crc32);
1513 }
1514
zipCloseFileInZipRaw64(zipFile file,ZPOS64_T uncompressed_size,uLong crc32)1515 extern int ZEXPORT zipCloseFileInZipRaw64 (zipFile file, ZPOS64_T uncompressed_size, uLong crc32)
1516 {
1517 zip64_internal* zi;
1518 ZPOS64_T compressed_size;
1519 uLong invalidValue = 0xffffffff;
1520 unsigned datasize = 0;
1521 int err=ZIP_OK;
1522
1523 if (file == NULL)
1524 return ZIP_PARAMERROR;
1525 zi = (zip64_internal*)file;
1526
1527 if (zi->in_opened_file_inzip == 0)
1528 return ZIP_PARAMERROR;
1529 zi->ci.stream.avail_in = 0;
1530
1531 if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
1532 {
1533 while (err==ZIP_OK)
1534 {
1535 uLong uTotalOutBefore;
1536 if (zi->ci.stream.avail_out == 0)
1537 {
1538 if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
1539 err = ZIP_ERRNO;
1540 zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
1541 zi->ci.stream.next_out = zi->ci.buffered_data;
1542 }
1543 uTotalOutBefore = zi->ci.stream.total_out;
1544 err=deflate(&zi->ci.stream, Z_FINISH);
1545 zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ;
1546 }
1547 }
1548 else if ((zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw))
1549 {
1550 #ifdef HAVE_BZIP2
1551 err = BZ_FINISH_OK;
1552 while (err==BZ_FINISH_OK)
1553 {
1554 uLong uTotalOutBefore;
1555 if (zi->ci.bstream.avail_out == 0)
1556 {
1557 if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO)
1558 err = ZIP_ERRNO;
1559 zi->ci.bstream.avail_out = (uInt)Z_BUFSIZE;
1560 zi->ci.bstream.next_out = (char*)zi->ci.buffered_data;
1561 }
1562 uTotalOutBefore = zi->ci.bstream.total_out_lo32;
1563 err=BZ2_bzCompress(&zi->ci.bstream, BZ_FINISH);
1564 if(err == BZ_STREAM_END)
1565 err = Z_STREAM_END;
1566
1567 zi->ci.pos_in_buffered_data += (uInt)(zi->ci.bstream.total_out_lo32 - uTotalOutBefore);
1568 }
1569
1570 if(err == BZ_FINISH_OK)
1571 err = ZIP_OK;
1572 #endif
1573 }
1574
1575 if (err==Z_STREAM_END)
1576 err=ZIP_OK; /* this is normal */
1577
1578 if ((zi->ci.pos_in_buffered_data>0) && (err==ZIP_OK))
1579 {
1580 if (zip64FlushWriteBuffer(zi)==ZIP_ERRNO)
1581 err = ZIP_ERRNO;
1582 }
1583
1584 if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
1585 {
1586 int tmp_err = deflateEnd(&zi->ci.stream);
1587 if (err == ZIP_OK)
1588 err = tmp_err;
1589 zi->ci.stream_initialised = 0;
1590 }
1591 #ifdef HAVE_BZIP2
1592 else if((zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw))
1593 {
1594 int tmperr = BZ2_bzCompressEnd(&zi->ci.bstream);
1595 if (err==ZIP_OK)
1596 err = tmperr;
1597 zi->ci.stream_initialised = 0;
1598 }
1599 #endif
1600
1601 if (!zi->ci.raw)
1602 {
1603 crc32 = (uLong)zi->ci.crc32;
1604 uncompressed_size = zi->ci.totalUncompressedData;
1605 }
1606 compressed_size = zi->ci.totalCompressedData;
1607
1608 # ifndef NOCRYPT
1609 compressed_size += zi->ci.crypt_header_size;
1610 # endif
1611
1612 // update Current Item crc and sizes,
1613 if(compressed_size >= 0xffffffff || uncompressed_size >= 0xffffffff || zi->ci.pos_local_header >= 0xffffffff)
1614 {
1615 /*version Made by*/
1616 zip64local_putValue_inmemory(zi->ci.central_header+4,(uLong)45,2);
1617 /*version needed*/
1618 zip64local_putValue_inmemory(zi->ci.central_header+6,(uLong)45,2);
1619
1620 }
1621
1622 zip64local_putValue_inmemory(zi->ci.central_header+16,crc32,4); /*crc*/
1623
1624
1625 if(compressed_size >= 0xffffffff)
1626 zip64local_putValue_inmemory(zi->ci.central_header+20, invalidValue,4); /*compr size*/
1627 else
1628 zip64local_putValue_inmemory(zi->ci.central_header+20, compressed_size,4); /*compr size*/
1629
1630 /// set internal file attributes field
1631 if (zi->ci.stream.data_type == Z_ASCII)
1632 zip64local_putValue_inmemory(zi->ci.central_header+36,(uLong)Z_ASCII,2);
1633
1634 if(uncompressed_size >= 0xffffffff)
1635 zip64local_putValue_inmemory(zi->ci.central_header+24, invalidValue,4); /*uncompr size*/
1636 else
1637 zip64local_putValue_inmemory(zi->ci.central_header+24, uncompressed_size,4); /*uncompr size*/
1638
1639 // Add ZIP64 extra info field for uncompressed size
1640 if(uncompressed_size >= 0xffffffff)
1641 datasize += 8;
1642
1643 // Add ZIP64 extra info field for compressed size
1644 if(compressed_size >= 0xffffffff)
1645 datasize += 8;
1646
1647 // Add ZIP64 extra info field for relative offset to local file header of current file
1648 if(zi->ci.pos_local_header >= 0xffffffff)
1649 datasize += 8;
1650
1651 if(datasize > 0)
1652 {
1653 char* p = NULL;
1654
1655 if((uLong)(datasize + 4) > zi->ci.size_centralExtraFree)
1656 {
1657 // we can not write more data to the buffer that we have room for.
1658 return ZIP_BADZIPFILE;
1659 }
1660
1661 p = zi->ci.central_header + zi->ci.size_centralheader;
1662
1663 // Add Extra Information Header for 'ZIP64 information'
1664 zip64local_putValue_inmemory(p, 0x0001, 2); // HeaderID
1665 p += 2;
1666 zip64local_putValue_inmemory(p, datasize, 2); // DataSize
1667 p += 2;
1668
1669 if(uncompressed_size >= 0xffffffff)
1670 {
1671 zip64local_putValue_inmemory(p, uncompressed_size, 8);
1672 p += 8;
1673 }
1674
1675 if(compressed_size >= 0xffffffff)
1676 {
1677 zip64local_putValue_inmemory(p, compressed_size, 8);
1678 p += 8;
1679 }
1680
1681 if(zi->ci.pos_local_header >= 0xffffffff)
1682 {
1683 zip64local_putValue_inmemory(p, zi->ci.pos_local_header, 8);
1684 p += 8;
1685 }
1686
1687 // Update how much extra free space we got in the memory buffer
1688 // and increase the centralheader size so the new ZIP64 fields are included
1689 // ( 4 below is the size of HeaderID and DataSize field )
1690 zi->ci.size_centralExtraFree -= datasize + 4;
1691 zi->ci.size_centralheader += datasize + 4;
1692
1693 // Update the extra info size field
1694 zi->ci.size_centralExtra += datasize + 4;
1695 zip64local_putValue_inmemory(zi->ci.central_header+30,(uLong)zi->ci.size_centralExtra,2);
1696 }
1697
1698 if (err==ZIP_OK)
1699 err = add_data_in_datablock(&zi->central_dir, zi->ci.central_header, (uLong)zi->ci.size_centralheader);
1700
1701 free(zi->ci.central_header);
1702
1703 if (err==ZIP_OK)
1704 {
1705 // Update the LocalFileHeader with the new values.
1706
1707 ZPOS64_T cur_pos_inzip = ZTELL64(zi->z_filefunc,zi->filestream);
1708
1709 if (ZSEEK64(zi->z_filefunc,zi->filestream, zi->ci.pos_local_header + 14,ZLIB_FILEFUNC_SEEK_SET)!=0)
1710 err = ZIP_ERRNO;
1711
1712 if (err==ZIP_OK)
1713 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,crc32,4); /* crc 32, unknown */
1714
1715 if(uncompressed_size >= 0xffffffff || compressed_size >= 0xffffffff )
1716 {
1717 if(zi->ci.pos_zip64extrainfo > 0)
1718 {
1719 // Update the size in the ZIP64 extended field.
1720 if (ZSEEK64(zi->z_filefunc,zi->filestream, zi->ci.pos_zip64extrainfo + 4,ZLIB_FILEFUNC_SEEK_SET)!=0)
1721 err = ZIP_ERRNO;
1722
1723 if (err==ZIP_OK) /* compressed size, unknown */
1724 err = zip64local_putValue(&zi->z_filefunc, zi->filestream, uncompressed_size, 8);
1725
1726 if (err==ZIP_OK) /* uncompressed size, unknown */
1727 err = zip64local_putValue(&zi->z_filefunc, zi->filestream, compressed_size, 8);
1728 }
1729 else
1730 err = ZIP_BADZIPFILE; // Caller passed zip64 = 0, so no room for zip64 info -> fatal
1731 }
1732 else
1733 {
1734 if (err==ZIP_OK) /* compressed size, unknown */
1735 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,compressed_size,4);
1736
1737 if (err==ZIP_OK) /* uncompressed size, unknown */
1738 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,uncompressed_size,4);
1739 }
1740
1741 if (ZSEEK64(zi->z_filefunc,zi->filestream, cur_pos_inzip,ZLIB_FILEFUNC_SEEK_SET)!=0)
1742 err = ZIP_ERRNO;
1743 }
1744
1745 zi->number_entry ++;
1746 zi->in_opened_file_inzip = 0;
1747
1748 return err;
1749 }
1750
zipCloseFileInZip(zipFile file)1751 extern int ZEXPORT zipCloseFileInZip (zipFile file)
1752 {
1753 return zipCloseFileInZipRaw (file,0,0);
1754 }
1755
Write_Zip64EndOfCentralDirectoryLocator(zip64_internal * zi,ZPOS64_T zip64eocd_pos_inzip)1756 local int Write_Zip64EndOfCentralDirectoryLocator(zip64_internal* zi, ZPOS64_T zip64eocd_pos_inzip)
1757 {
1758 int err = ZIP_OK;
1759 ZPOS64_T pos = zip64eocd_pos_inzip - zi->add_position_when_writing_offset;
1760
1761 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)ZIP64ENDLOCHEADERMAGIC,4);
1762
1763 /*num disks*/
1764 if (err==ZIP_OK) /* number of the disk with the start of the central directory */
1765 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4);
1766
1767 /*relative offset*/
1768 if (err==ZIP_OK) /* Relative offset to the Zip64EndOfCentralDirectory */
1769 err = zip64local_putValue(&zi->z_filefunc,zi->filestream, pos,8);
1770
1771 /*total disks*/ /* Do not support spawning of disk so always say 1 here*/
1772 if (err==ZIP_OK) /* number of the disk with the start of the central directory */
1773 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)1,4);
1774
1775 return err;
1776 }
1777
Write_Zip64EndOfCentralDirectoryRecord(zip64_internal * zi,uLong size_centraldir,ZPOS64_T centraldir_pos_inzip)1778 local int Write_Zip64EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
1779 {
1780 int err = ZIP_OK;
1781
1782 uLong Zip64DataSize = 44;
1783
1784 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)ZIP64ENDHEADERMAGIC,4);
1785
1786 if (err==ZIP_OK) /* size of this 'zip64 end of central directory' */
1787 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(ZPOS64_T)Zip64DataSize,8); // why ZPOS64_T of this ?
1788
1789 if (err==ZIP_OK) /* version made by */
1790 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)45,2);
1791
1792 if (err==ZIP_OK) /* version needed */
1793 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)45,2);
1794
1795 if (err==ZIP_OK) /* number of this disk */
1796 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4);
1797
1798 if (err==ZIP_OK) /* number of the disk with the start of the central directory */
1799 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4);
1800
1801 if (err==ZIP_OK) /* total number of entries in the central dir on this disk */
1802 err = zip64local_putValue(&zi->z_filefunc, zi->filestream, zi->number_entry, 8);
1803
1804 if (err==ZIP_OK) /* total number of entries in the central dir */
1805 err = zip64local_putValue(&zi->z_filefunc, zi->filestream, zi->number_entry, 8);
1806
1807 if (err==ZIP_OK) /* size of the central directory */
1808 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(ZPOS64_T)size_centraldir,8);
1809
1810 if (err==ZIP_OK) /* offset of start of central directory with respect to the starting disk number */
1811 {
1812 ZPOS64_T pos = centraldir_pos_inzip - zi->add_position_when_writing_offset;
1813 err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (ZPOS64_T)pos,8);
1814 }
1815 return err;
1816 }
Write_EndOfCentralDirectoryRecord(zip64_internal * zi,uLong size_centraldir,ZPOS64_T centraldir_pos_inzip)1817 local int Write_EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
1818 {
1819 int err = ZIP_OK;
1820
1821 /*signature*/
1822 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)ENDHEADERMAGIC,4);
1823
1824 if (err==ZIP_OK) /* number of this disk */
1825 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,2);
1826
1827 if (err==ZIP_OK) /* number of the disk with the start of the central directory */
1828 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,2);
1829
1830 if (err==ZIP_OK) /* total number of entries in the central dir on this disk */
1831 {
1832 {
1833 if(zi->number_entry >= 0xFFFF)
1834 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0xffff,2); // use value in ZIP64 record
1835 else
1836 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->number_entry,2);
1837 }
1838 }
1839
1840 if (err==ZIP_OK) /* total number of entries in the central dir */
1841 {
1842 if(zi->number_entry >= 0xFFFF)
1843 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0xffff,2); // use value in ZIP64 record
1844 else
1845 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->number_entry,2);
1846 }
1847
1848 if (err==ZIP_OK) /* size of the central directory */
1849 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_centraldir,4);
1850
1851 if (err==ZIP_OK) /* offset of start of central directory with respect to the starting disk number */
1852 {
1853 ZPOS64_T pos = centraldir_pos_inzip - zi->add_position_when_writing_offset;
1854 if(pos >= 0xffffffff)
1855 {
1856 err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (uLong)0xffffffff,4);
1857 }
1858 else
1859 err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (uLong)(centraldir_pos_inzip - zi->add_position_when_writing_offset),4);
1860 }
1861
1862 return err;
1863 }
1864
Write_GlobalComment(zip64_internal * zi,const char * global_comment)1865 local int Write_GlobalComment(zip64_internal* zi, const char* global_comment)
1866 {
1867 int err = ZIP_OK;
1868 uInt size_global_comment = 0;
1869
1870 if(global_comment != NULL)
1871 size_global_comment = (uInt)strlen(global_comment);
1872
1873 err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_global_comment,2);
1874
1875 if (err == ZIP_OK && size_global_comment > 0)
1876 {
1877 if (ZWRITE64(zi->z_filefunc,zi->filestream, global_comment, size_global_comment) != size_global_comment)
1878 err = ZIP_ERRNO;
1879 }
1880 return err;
1881 }
1882
zipClose(zipFile file,const char * global_comment)1883 extern int ZEXPORT zipClose (zipFile file, const char* global_comment)
1884 {
1885 zip64_internal* zi;
1886 int err = 0;
1887 uLong size_centraldir = 0;
1888 ZPOS64_T centraldir_pos_inzip;
1889 ZPOS64_T pos;
1890
1891 if (file == NULL)
1892 return ZIP_PARAMERROR;
1893
1894 zi = (zip64_internal*)file;
1895
1896 if (zi->in_opened_file_inzip == 1)
1897 {
1898 err = zipCloseFileInZip (file);
1899 }
1900
1901 #ifndef NO_ADDFILEINEXISTINGZIP
1902 if (global_comment==NULL)
1903 global_comment = zi->globalcomment;
1904 #endif
1905
1906 centraldir_pos_inzip = ZTELL64(zi->z_filefunc,zi->filestream);
1907
1908 if (err==ZIP_OK)
1909 {
1910 linkedlist_datablock_internal* ldi = zi->central_dir.first_block;
1911 while (ldi!=NULL)
1912 {
1913 if ((err==ZIP_OK) && (ldi->filled_in_this_block>0))
1914 {
1915 if (ZWRITE64(zi->z_filefunc,zi->filestream, ldi->data, ldi->filled_in_this_block) != ldi->filled_in_this_block)
1916 err = ZIP_ERRNO;
1917 }
1918
1919 size_centraldir += ldi->filled_in_this_block;
1920 ldi = ldi->next_datablock;
1921 }
1922 }
1923 free_linkedlist(&(zi->central_dir));
1924
1925 pos = centraldir_pos_inzip - zi->add_position_when_writing_offset;
1926 if(pos >= 0xffffffff || zi->number_entry > 0xFFFF)
1927 {
1928 ZPOS64_T Zip64EOCDpos = ZTELL64(zi->z_filefunc,zi->filestream);
1929 Write_Zip64EndOfCentralDirectoryRecord(zi, size_centraldir, centraldir_pos_inzip);
1930
1931 Write_Zip64EndOfCentralDirectoryLocator(zi, Zip64EOCDpos);
1932 }
1933
1934 if (err==ZIP_OK)
1935 err = Write_EndOfCentralDirectoryRecord(zi, size_centraldir, centraldir_pos_inzip);
1936
1937 if(err == ZIP_OK)
1938 err = Write_GlobalComment(zi, global_comment);
1939
1940 if (ZCLOSE64(zi->z_filefunc,zi->filestream) != 0)
1941 if (err == ZIP_OK)
1942 err = ZIP_ERRNO;
1943
1944 #ifndef NO_ADDFILEINEXISTINGZIP
1945 TRYFREE(zi->globalcomment);
1946 #endif
1947 TRYFREE(zi);
1948
1949 return err;
1950 }
1951
zipRemoveExtraInfoBlock(char * pData,int * dataLen,short sHeader)1952 extern int ZEXPORT zipRemoveExtraInfoBlock (char* pData, int* dataLen, short sHeader)
1953 {
1954 char* p = pData;
1955 int size = 0;
1956 char* pNewHeader;
1957 char* pTmp;
1958 short header;
1959 short dataSize;
1960
1961 int retVal = ZIP_OK;
1962
1963 if(pData == NULL || dataLen == NULL || *dataLen < 4)
1964 return ZIP_PARAMERROR;
1965
1966 pNewHeader = (char*)ALLOC((unsigned)*dataLen);
1967 pTmp = pNewHeader;
1968
1969 while(p < (pData + *dataLen))
1970 {
1971 header = *(short*)p;
1972 dataSize = *(((short*)p)+1);
1973
1974 if( header == sHeader ) // Header found.
1975 {
1976 p += dataSize + 4; // skip it. do not copy to temp buffer
1977 }
1978 else
1979 {
1980 // Extra Info block should not be removed, So copy it to the temp buffer.
1981 memcpy(pTmp, p, dataSize + 4);
1982 p += dataSize + 4;
1983 size += dataSize + 4;
1984 }
1985
1986 }
1987
1988 if(size < *dataLen)
1989 {
1990 // clean old extra info block.
1991 memset(pData,0, *dataLen);
1992
1993 // copy the new extra info block over the old
1994 if(size > 0)
1995 memcpy(pData, pNewHeader, size);
1996
1997 // set the new extra info size
1998 *dataLen = size;
1999
2000 retVal = ZIP_OK;
2001 }
2002 else
2003 retVal = ZIP_ERRNO;
2004
2005 TRYFREE(pNewHeader);
2006
2007 return retVal;
2008 }
2009