xref: /minix/common/dist/zlib/contrib/minizip/zip.c (revision 44bedb31)
1*44bedb31SLionel Sambuc /*	$NetBSD: zip.c,v 1.1.1.1 2006/01/14 20:11:00 christos Exp $	*/
2*44bedb31SLionel Sambuc 
3*44bedb31SLionel Sambuc /* zip.c -- IO on .zip files using zlib
4*44bedb31SLionel Sambuc    Version 1.01e, February 12th, 2005
5*44bedb31SLionel Sambuc 
6*44bedb31SLionel Sambuc    27 Dec 2004 Rolf Kalbermatter
7*44bedb31SLionel Sambuc    Modification to zipOpen2 to support globalComment retrieval.
8*44bedb31SLionel Sambuc 
9*44bedb31SLionel Sambuc    Copyright (C) 1998-2005 Gilles Vollant
10*44bedb31SLionel Sambuc 
11*44bedb31SLionel Sambuc    Read zip.h for more info
12*44bedb31SLionel Sambuc */
13*44bedb31SLionel Sambuc 
14*44bedb31SLionel Sambuc 
15*44bedb31SLionel Sambuc #include <stdio.h>
16*44bedb31SLionel Sambuc #include <stdlib.h>
17*44bedb31SLionel Sambuc #include <string.h>
18*44bedb31SLionel Sambuc #include <time.h>
19*44bedb31SLionel Sambuc #include "zlib.h"
20*44bedb31SLionel Sambuc #include "zip.h"
21*44bedb31SLionel Sambuc 
22*44bedb31SLionel Sambuc #ifdef STDC
23*44bedb31SLionel Sambuc #  include <stddef.h>
24*44bedb31SLionel Sambuc #  include <string.h>
25*44bedb31SLionel Sambuc #  include <stdlib.h>
26*44bedb31SLionel Sambuc #endif
27*44bedb31SLionel Sambuc #ifdef NO_ERRNO_H
28*44bedb31SLionel Sambuc     extern int errno;
29*44bedb31SLionel Sambuc #else
30*44bedb31SLionel Sambuc #   include <errno.h>
31*44bedb31SLionel Sambuc #endif
32*44bedb31SLionel Sambuc 
33*44bedb31SLionel Sambuc 
34*44bedb31SLionel Sambuc #ifndef local
35*44bedb31SLionel Sambuc #  define local static
36*44bedb31SLionel Sambuc #endif
37*44bedb31SLionel Sambuc /* compile with -Dlocal if your debugger can't find static symbols */
38*44bedb31SLionel Sambuc 
39*44bedb31SLionel Sambuc #ifndef VERSIONMADEBY
40*44bedb31SLionel Sambuc # define VERSIONMADEBY   (0x0) /* platform depedent */
41*44bedb31SLionel Sambuc #endif
42*44bedb31SLionel Sambuc 
43*44bedb31SLionel Sambuc #ifndef Z_BUFSIZE
44*44bedb31SLionel Sambuc #define Z_BUFSIZE (16384)
45*44bedb31SLionel Sambuc #endif
46*44bedb31SLionel Sambuc 
47*44bedb31SLionel Sambuc #ifndef Z_MAXFILENAMEINZIP
48*44bedb31SLionel Sambuc #define Z_MAXFILENAMEINZIP (256)
49*44bedb31SLionel Sambuc #endif
50*44bedb31SLionel Sambuc 
51*44bedb31SLionel Sambuc #ifndef ALLOC
52*44bedb31SLionel Sambuc # define ALLOC(size) (malloc(size))
53*44bedb31SLionel Sambuc #endif
54*44bedb31SLionel Sambuc #ifndef TRYFREE
55*44bedb31SLionel Sambuc # define TRYFREE(p) {if (p) free(p);}
56*44bedb31SLionel Sambuc #endif
57*44bedb31SLionel Sambuc 
58*44bedb31SLionel Sambuc /*
59*44bedb31SLionel Sambuc #define SIZECENTRALDIRITEM (0x2e)
60*44bedb31SLionel Sambuc #define SIZEZIPLOCALHEADER (0x1e)
61*44bedb31SLionel Sambuc */
62*44bedb31SLionel Sambuc 
63*44bedb31SLionel Sambuc /* I've found an old Unix (a SunOS 4.1.3_U1) without all SEEK_* defined.... */
64*44bedb31SLionel Sambuc 
65*44bedb31SLionel Sambuc #ifndef SEEK_CUR
66*44bedb31SLionel Sambuc #define SEEK_CUR    1
67*44bedb31SLionel Sambuc #endif
68*44bedb31SLionel Sambuc 
69*44bedb31SLionel Sambuc #ifndef SEEK_END
70*44bedb31SLionel Sambuc #define SEEK_END    2
71*44bedb31SLionel Sambuc #endif
72*44bedb31SLionel Sambuc 
73*44bedb31SLionel Sambuc #ifndef SEEK_SET
74*44bedb31SLionel Sambuc #define SEEK_SET    0
75*44bedb31SLionel Sambuc #endif
76*44bedb31SLionel Sambuc 
77*44bedb31SLionel Sambuc #ifndef DEF_MEM_LEVEL
78*44bedb31SLionel Sambuc #if MAX_MEM_LEVEL >= 8
79*44bedb31SLionel Sambuc #  define DEF_MEM_LEVEL 8
80*44bedb31SLionel Sambuc #else
81*44bedb31SLionel Sambuc #  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
82*44bedb31SLionel Sambuc #endif
83*44bedb31SLionel Sambuc #endif
84*44bedb31SLionel Sambuc const char zip_copyright[] =
85*44bedb31SLionel Sambuc    " zip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";
86*44bedb31SLionel Sambuc 
87*44bedb31SLionel Sambuc 
88*44bedb31SLionel Sambuc #define SIZEDATA_INDATABLOCK (4096-(4*4))
89*44bedb31SLionel Sambuc 
90*44bedb31SLionel Sambuc #define LOCALHEADERMAGIC    (0x04034b50)
91*44bedb31SLionel Sambuc #define CENTRALHEADERMAGIC  (0x02014b50)
92*44bedb31SLionel Sambuc #define ENDHEADERMAGIC      (0x06054b50)
93*44bedb31SLionel Sambuc 
94*44bedb31SLionel Sambuc #define FLAG_LOCALHEADER_OFFSET (0x06)
95*44bedb31SLionel Sambuc #define CRC_LOCALHEADER_OFFSET  (0x0e)
96*44bedb31SLionel Sambuc 
97*44bedb31SLionel Sambuc #define SIZECENTRALHEADER (0x2e) /* 46 */
98*44bedb31SLionel Sambuc 
99*44bedb31SLionel Sambuc typedef struct linkedlist_datablock_internal_s
100*44bedb31SLionel Sambuc {
101*44bedb31SLionel Sambuc   struct linkedlist_datablock_internal_s* next_datablock;
102*44bedb31SLionel Sambuc   uLong  avail_in_this_block;
103*44bedb31SLionel Sambuc   uLong  filled_in_this_block;
104*44bedb31SLionel Sambuc   uLong  unused; /* for future use and alignement */
105*44bedb31SLionel Sambuc   unsigned char data[SIZEDATA_INDATABLOCK];
106*44bedb31SLionel Sambuc } linkedlist_datablock_internal;
107*44bedb31SLionel Sambuc 
108*44bedb31SLionel Sambuc typedef struct linkedlist_data_s
109*44bedb31SLionel Sambuc {
110*44bedb31SLionel Sambuc     linkedlist_datablock_internal* first_block;
111*44bedb31SLionel Sambuc     linkedlist_datablock_internal* last_block;
112*44bedb31SLionel Sambuc } linkedlist_data;
113*44bedb31SLionel Sambuc 
114*44bedb31SLionel Sambuc 
115*44bedb31SLionel Sambuc typedef struct
116*44bedb31SLionel Sambuc {
117*44bedb31SLionel Sambuc     z_stream stream;            /* zLib stream structure for inflate */
118*44bedb31SLionel Sambuc     int  stream_initialised;    /* 1 is stream is initialised */
119*44bedb31SLionel Sambuc     uInt pos_in_buffered_data;  /* last written byte in buffered_data */
120*44bedb31SLionel Sambuc 
121*44bedb31SLionel Sambuc     uLong pos_local_header;     /* offset of the local header of the file
122*44bedb31SLionel Sambuc                                      currenty writing */
123*44bedb31SLionel Sambuc     char* central_header;       /* central header data for the current file */
124*44bedb31SLionel Sambuc     uLong size_centralheader;   /* size of the central header for cur file */
125*44bedb31SLionel Sambuc     uLong flag;                 /* flag of the file currently writing */
126*44bedb31SLionel Sambuc 
127*44bedb31SLionel Sambuc     int  method;                /* compression method of file currenty wr.*/
128*44bedb31SLionel Sambuc     int  raw;                   /* 1 for directly writing raw data */
129*44bedb31SLionel Sambuc     Byte buffered_data[Z_BUFSIZE];/* buffer contain compressed data to be writ*/
130*44bedb31SLionel Sambuc     uLong dosDate;
131*44bedb31SLionel Sambuc     uLong crc32;
132*44bedb31SLionel Sambuc     int  encrypt;
133*44bedb31SLionel Sambuc #ifndef NOCRYPT
134*44bedb31SLionel Sambuc     unsigned long keys[3];     /* keys defining the pseudo-random sequence */
135*44bedb31SLionel Sambuc     const unsigned long* pcrc_32_tab;
136*44bedb31SLionel Sambuc     int crypt_header_size;
137*44bedb31SLionel Sambuc #endif
138*44bedb31SLionel Sambuc } curfile_info;
139*44bedb31SLionel Sambuc 
140*44bedb31SLionel Sambuc typedef struct
141*44bedb31SLionel Sambuc {
142*44bedb31SLionel Sambuc     zlib_filefunc_def z_filefunc;
143*44bedb31SLionel Sambuc     voidpf filestream;        /* io structore of the zipfile */
144*44bedb31SLionel Sambuc     linkedlist_data central_dir;/* datablock with central dir in construction*/
145*44bedb31SLionel Sambuc     int  in_opened_file_inzip;  /* 1 if a file in the zip is currently writ.*/
146*44bedb31SLionel Sambuc     curfile_info ci;            /* info on the file curretly writing */
147*44bedb31SLionel Sambuc 
148*44bedb31SLionel Sambuc     uLong begin_pos;            /* position of the beginning of the zipfile */
149*44bedb31SLionel Sambuc     uLong add_position_when_writting_offset;
150*44bedb31SLionel Sambuc     uLong number_entry;
151*44bedb31SLionel Sambuc #ifndef NO_ADDFILEINEXISTINGZIP
152*44bedb31SLionel Sambuc     char *globalcomment;
153*44bedb31SLionel Sambuc #endif
154*44bedb31SLionel Sambuc } zip_internal;
155*44bedb31SLionel Sambuc 
156*44bedb31SLionel Sambuc 
157*44bedb31SLionel Sambuc 
158*44bedb31SLionel Sambuc #ifndef NOCRYPT
159*44bedb31SLionel Sambuc #define INCLUDECRYPTINGCODE_IFCRYPTALLOWED
160*44bedb31SLionel Sambuc #include "crypt.h"
161*44bedb31SLionel Sambuc #endif
162*44bedb31SLionel Sambuc 
allocate_new_datablock()163*44bedb31SLionel Sambuc local linkedlist_datablock_internal* allocate_new_datablock()
164*44bedb31SLionel Sambuc {
165*44bedb31SLionel Sambuc     linkedlist_datablock_internal* ldi;
166*44bedb31SLionel Sambuc     ldi = (linkedlist_datablock_internal*)
167*44bedb31SLionel Sambuc                  ALLOC(sizeof(linkedlist_datablock_internal));
168*44bedb31SLionel Sambuc     if (ldi!=NULL)
169*44bedb31SLionel Sambuc     {
170*44bedb31SLionel Sambuc         ldi->next_datablock = NULL ;
171*44bedb31SLionel Sambuc         ldi->filled_in_this_block = 0 ;
172*44bedb31SLionel Sambuc         ldi->avail_in_this_block = SIZEDATA_INDATABLOCK ;
173*44bedb31SLionel Sambuc     }
174*44bedb31SLionel Sambuc     return ldi;
175*44bedb31SLionel Sambuc }
176*44bedb31SLionel Sambuc 
free_datablock(ldi)177*44bedb31SLionel Sambuc local void free_datablock(ldi)
178*44bedb31SLionel Sambuc     linkedlist_datablock_internal* ldi;
179*44bedb31SLionel Sambuc {
180*44bedb31SLionel Sambuc     while (ldi!=NULL)
181*44bedb31SLionel Sambuc     {
182*44bedb31SLionel Sambuc         linkedlist_datablock_internal* ldinext = ldi->next_datablock;
183*44bedb31SLionel Sambuc         TRYFREE(ldi);
184*44bedb31SLionel Sambuc         ldi = ldinext;
185*44bedb31SLionel Sambuc     }
186*44bedb31SLionel Sambuc }
187*44bedb31SLionel Sambuc 
init_linkedlist(ll)188*44bedb31SLionel Sambuc local void init_linkedlist(ll)
189*44bedb31SLionel Sambuc     linkedlist_data* ll;
190*44bedb31SLionel Sambuc {
191*44bedb31SLionel Sambuc     ll->first_block = ll->last_block = NULL;
192*44bedb31SLionel Sambuc }
193*44bedb31SLionel Sambuc 
free_linkedlist(ll)194*44bedb31SLionel Sambuc local void free_linkedlist(ll)
195*44bedb31SLionel Sambuc     linkedlist_data* ll;
196*44bedb31SLionel Sambuc {
197*44bedb31SLionel Sambuc     free_datablock(ll->first_block);
198*44bedb31SLionel Sambuc     ll->first_block = ll->last_block = NULL;
199*44bedb31SLionel Sambuc }
200*44bedb31SLionel Sambuc 
201*44bedb31SLionel Sambuc 
add_data_in_datablock(ll,buf,len)202*44bedb31SLionel Sambuc local int add_data_in_datablock(ll,buf,len)
203*44bedb31SLionel Sambuc     linkedlist_data* ll;
204*44bedb31SLionel Sambuc     const void* buf;
205*44bedb31SLionel Sambuc     uLong len;
206*44bedb31SLionel Sambuc {
207*44bedb31SLionel Sambuc     linkedlist_datablock_internal* ldi;
208*44bedb31SLionel Sambuc     const unsigned char* from_copy;
209*44bedb31SLionel Sambuc 
210*44bedb31SLionel Sambuc     if (ll==NULL)
211*44bedb31SLionel Sambuc         return ZIP_INTERNALERROR;
212*44bedb31SLionel Sambuc 
213*44bedb31SLionel Sambuc     if (ll->last_block == NULL)
214*44bedb31SLionel Sambuc     {
215*44bedb31SLionel Sambuc         ll->first_block = ll->last_block = allocate_new_datablock();
216*44bedb31SLionel Sambuc         if (ll->first_block == NULL)
217*44bedb31SLionel Sambuc             return ZIP_INTERNALERROR;
218*44bedb31SLionel Sambuc     }
219*44bedb31SLionel Sambuc 
220*44bedb31SLionel Sambuc     ldi = ll->last_block;
221*44bedb31SLionel Sambuc     from_copy = (unsigned char*)buf;
222*44bedb31SLionel Sambuc 
223*44bedb31SLionel Sambuc     while (len>0)
224*44bedb31SLionel Sambuc     {
225*44bedb31SLionel Sambuc         uInt copy_this;
226*44bedb31SLionel Sambuc         uInt i;
227*44bedb31SLionel Sambuc         unsigned char* to_copy;
228*44bedb31SLionel Sambuc 
229*44bedb31SLionel Sambuc         if (ldi->avail_in_this_block==0)
230*44bedb31SLionel Sambuc         {
231*44bedb31SLionel Sambuc             ldi->next_datablock = allocate_new_datablock();
232*44bedb31SLionel Sambuc             if (ldi->next_datablock == NULL)
233*44bedb31SLionel Sambuc                 return ZIP_INTERNALERROR;
234*44bedb31SLionel Sambuc             ldi = ldi->next_datablock ;
235*44bedb31SLionel Sambuc             ll->last_block = ldi;
236*44bedb31SLionel Sambuc         }
237*44bedb31SLionel Sambuc 
238*44bedb31SLionel Sambuc         if (ldi->avail_in_this_block < len)
239*44bedb31SLionel Sambuc             copy_this = (uInt)ldi->avail_in_this_block;
240*44bedb31SLionel Sambuc         else
241*44bedb31SLionel Sambuc             copy_this = (uInt)len;
242*44bedb31SLionel Sambuc 
243*44bedb31SLionel Sambuc         to_copy = &(ldi->data[ldi->filled_in_this_block]);
244*44bedb31SLionel Sambuc 
245*44bedb31SLionel Sambuc         for (i=0;i<copy_this;i++)
246*44bedb31SLionel Sambuc             *(to_copy+i)=*(from_copy+i);
247*44bedb31SLionel Sambuc 
248*44bedb31SLionel Sambuc         ldi->filled_in_this_block += copy_this;
249*44bedb31SLionel Sambuc         ldi->avail_in_this_block -= copy_this;
250*44bedb31SLionel Sambuc         from_copy += copy_this ;
251*44bedb31SLionel Sambuc         len -= copy_this;
252*44bedb31SLionel Sambuc     }
253*44bedb31SLionel Sambuc     return ZIP_OK;
254*44bedb31SLionel Sambuc }
255*44bedb31SLionel Sambuc 
256*44bedb31SLionel Sambuc 
257*44bedb31SLionel Sambuc 
258*44bedb31SLionel Sambuc /****************************************************************************/
259*44bedb31SLionel Sambuc 
260*44bedb31SLionel Sambuc #ifndef NO_ADDFILEINEXISTINGZIP
261*44bedb31SLionel Sambuc /* ===========================================================================
262*44bedb31SLionel Sambuc    Inputs a long in LSB order to the given file
263*44bedb31SLionel Sambuc    nbByte == 1, 2 or 4 (byte, short or long)
264*44bedb31SLionel Sambuc */
265*44bedb31SLionel Sambuc 
266*44bedb31SLionel Sambuc local int ziplocal_putValue OF((const zlib_filefunc_def* pzlib_filefunc_def,
267*44bedb31SLionel Sambuc                                 voidpf filestream, uLong x, int nbByte));
ziplocal_putValue(pzlib_filefunc_def,filestream,x,nbByte)268*44bedb31SLionel Sambuc local int ziplocal_putValue (pzlib_filefunc_def, filestream, x, nbByte)
269*44bedb31SLionel Sambuc     const zlib_filefunc_def* pzlib_filefunc_def;
270*44bedb31SLionel Sambuc     voidpf filestream;
271*44bedb31SLionel Sambuc     uLong x;
272*44bedb31SLionel Sambuc     int nbByte;
273*44bedb31SLionel Sambuc {
274*44bedb31SLionel Sambuc     unsigned char buf[4];
275*44bedb31SLionel Sambuc     int n;
276*44bedb31SLionel Sambuc     for (n = 0; n < nbByte; n++)
277*44bedb31SLionel Sambuc     {
278*44bedb31SLionel Sambuc         buf[n] = (unsigned char)(x & 0xff);
279*44bedb31SLionel Sambuc         x >>= 8;
280*44bedb31SLionel Sambuc     }
281*44bedb31SLionel Sambuc     if (x != 0)
282*44bedb31SLionel Sambuc       {     /* data overflow - hack for ZIP64 (X Roche) */
283*44bedb31SLionel Sambuc       for (n = 0; n < nbByte; n++)
284*44bedb31SLionel Sambuc         {
285*44bedb31SLionel Sambuc           buf[n] = 0xff;
286*44bedb31SLionel Sambuc         }
287*44bedb31SLionel Sambuc       }
288*44bedb31SLionel Sambuc 
289*44bedb31SLionel Sambuc     if (ZWRITE(*pzlib_filefunc_def,filestream,buf,nbByte)!=(uLong)nbByte)
290*44bedb31SLionel Sambuc         return ZIP_ERRNO;
291*44bedb31SLionel Sambuc     else
292*44bedb31SLionel Sambuc         return ZIP_OK;
293*44bedb31SLionel Sambuc }
294*44bedb31SLionel Sambuc 
295*44bedb31SLionel Sambuc local void ziplocal_putValue_inmemory OF((void* dest, uLong x, int nbByte));
ziplocal_putValue_inmemory(dest,x,nbByte)296*44bedb31SLionel Sambuc local void ziplocal_putValue_inmemory (dest, x, nbByte)
297*44bedb31SLionel Sambuc     void* dest;
298*44bedb31SLionel Sambuc     uLong x;
299*44bedb31SLionel Sambuc     int nbByte;
300*44bedb31SLionel Sambuc {
301*44bedb31SLionel Sambuc     unsigned char* buf=(unsigned char*)dest;
302*44bedb31SLionel Sambuc     int n;
303*44bedb31SLionel Sambuc     for (n = 0; n < nbByte; n++) {
304*44bedb31SLionel Sambuc         buf[n] = (unsigned char)(x & 0xff);
305*44bedb31SLionel Sambuc         x >>= 8;
306*44bedb31SLionel Sambuc     }
307*44bedb31SLionel Sambuc 
308*44bedb31SLionel Sambuc     if (x != 0)
309*44bedb31SLionel Sambuc     {     /* data overflow - hack for ZIP64 */
310*44bedb31SLionel Sambuc        for (n = 0; n < nbByte; n++)
311*44bedb31SLionel Sambuc        {
312*44bedb31SLionel Sambuc           buf[n] = 0xff;
313*44bedb31SLionel Sambuc        }
314*44bedb31SLionel Sambuc     }
315*44bedb31SLionel Sambuc }
316*44bedb31SLionel Sambuc 
317*44bedb31SLionel Sambuc /****************************************************************************/
318*44bedb31SLionel Sambuc 
319*44bedb31SLionel Sambuc 
ziplocal_TmzDateToDosDate(ptm,dosDate)320*44bedb31SLionel Sambuc local uLong ziplocal_TmzDateToDosDate(ptm,dosDate)
321*44bedb31SLionel Sambuc     const tm_zip* ptm;
322*44bedb31SLionel Sambuc     uLong dosDate;
323*44bedb31SLionel Sambuc {
324*44bedb31SLionel Sambuc     uLong year = (uLong)ptm->tm_year;
325*44bedb31SLionel Sambuc     if (year>1980)
326*44bedb31SLionel Sambuc         year-=1980;
327*44bedb31SLionel Sambuc     else if (year>80)
328*44bedb31SLionel Sambuc         year-=80;
329*44bedb31SLionel Sambuc     return
330*44bedb31SLionel Sambuc       (uLong) (((ptm->tm_mday) + (32 * (ptm->tm_mon+1)) + (512 * year)) << 16) |
331*44bedb31SLionel Sambuc         ((ptm->tm_sec/2) + (32* ptm->tm_min) + (2048 * (uLong)ptm->tm_hour));
332*44bedb31SLionel Sambuc }
333*44bedb31SLionel Sambuc 
334*44bedb31SLionel Sambuc 
335*44bedb31SLionel Sambuc /****************************************************************************/
336*44bedb31SLionel Sambuc 
337*44bedb31SLionel Sambuc local int ziplocal_getByte OF((
338*44bedb31SLionel Sambuc     const zlib_filefunc_def* pzlib_filefunc_def,
339*44bedb31SLionel Sambuc     voidpf filestream,
340*44bedb31SLionel Sambuc     int *pi));
341*44bedb31SLionel Sambuc 
ziplocal_getByte(pzlib_filefunc_def,filestream,pi)342*44bedb31SLionel Sambuc local int ziplocal_getByte(pzlib_filefunc_def,filestream,pi)
343*44bedb31SLionel Sambuc     const zlib_filefunc_def* pzlib_filefunc_def;
344*44bedb31SLionel Sambuc     voidpf filestream;
345*44bedb31SLionel Sambuc     int *pi;
346*44bedb31SLionel Sambuc {
347*44bedb31SLionel Sambuc     unsigned char c;
348*44bedb31SLionel Sambuc     int err = (int)ZREAD(*pzlib_filefunc_def,filestream,&c,1);
349*44bedb31SLionel Sambuc     if (err==1)
350*44bedb31SLionel Sambuc     {
351*44bedb31SLionel Sambuc         *pi = (int)c;
352*44bedb31SLionel Sambuc         return ZIP_OK;
353*44bedb31SLionel Sambuc     }
354*44bedb31SLionel Sambuc     else
355*44bedb31SLionel Sambuc     {
356*44bedb31SLionel Sambuc         if (ZERROR(*pzlib_filefunc_def,filestream))
357*44bedb31SLionel Sambuc             return ZIP_ERRNO;
358*44bedb31SLionel Sambuc         else
359*44bedb31SLionel Sambuc             return ZIP_EOF;
360*44bedb31SLionel Sambuc     }
361*44bedb31SLionel Sambuc }
362*44bedb31SLionel Sambuc 
363*44bedb31SLionel Sambuc 
364*44bedb31SLionel Sambuc /* ===========================================================================
365*44bedb31SLionel Sambuc    Reads a long in LSB order from the given gz_stream. Sets
366*44bedb31SLionel Sambuc */
367*44bedb31SLionel Sambuc local int ziplocal_getShort OF((
368*44bedb31SLionel Sambuc     const zlib_filefunc_def* pzlib_filefunc_def,
369*44bedb31SLionel Sambuc     voidpf filestream,
370*44bedb31SLionel Sambuc     uLong *pX));
371*44bedb31SLionel Sambuc 
ziplocal_getShort(pzlib_filefunc_def,filestream,pX)372*44bedb31SLionel Sambuc local int ziplocal_getShort (pzlib_filefunc_def,filestream,pX)
373*44bedb31SLionel Sambuc     const zlib_filefunc_def* pzlib_filefunc_def;
374*44bedb31SLionel Sambuc     voidpf filestream;
375*44bedb31SLionel Sambuc     uLong *pX;
376*44bedb31SLionel Sambuc {
377*44bedb31SLionel Sambuc     uLong x ;
378*44bedb31SLionel Sambuc     int i;
379*44bedb31SLionel Sambuc     int err;
380*44bedb31SLionel Sambuc 
381*44bedb31SLionel Sambuc     err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i);
382*44bedb31SLionel Sambuc     x = (uLong)i;
383*44bedb31SLionel Sambuc 
384*44bedb31SLionel Sambuc     if (err==ZIP_OK)
385*44bedb31SLionel Sambuc         err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i);
386*44bedb31SLionel Sambuc     x += ((uLong)i)<<8;
387*44bedb31SLionel Sambuc 
388*44bedb31SLionel Sambuc     if (err==ZIP_OK)
389*44bedb31SLionel Sambuc         *pX = x;
390*44bedb31SLionel Sambuc     else
391*44bedb31SLionel Sambuc         *pX = 0;
392*44bedb31SLionel Sambuc     return err;
393*44bedb31SLionel Sambuc }
394*44bedb31SLionel Sambuc 
395*44bedb31SLionel Sambuc local int ziplocal_getLong OF((
396*44bedb31SLionel Sambuc     const zlib_filefunc_def* pzlib_filefunc_def,
397*44bedb31SLionel Sambuc     voidpf filestream,
398*44bedb31SLionel Sambuc     uLong *pX));
399*44bedb31SLionel Sambuc 
ziplocal_getLong(pzlib_filefunc_def,filestream,pX)400*44bedb31SLionel Sambuc local int ziplocal_getLong (pzlib_filefunc_def,filestream,pX)
401*44bedb31SLionel Sambuc     const zlib_filefunc_def* pzlib_filefunc_def;
402*44bedb31SLionel Sambuc     voidpf filestream;
403*44bedb31SLionel Sambuc     uLong *pX;
404*44bedb31SLionel Sambuc {
405*44bedb31SLionel Sambuc     uLong x ;
406*44bedb31SLionel Sambuc     int i;
407*44bedb31SLionel Sambuc     int err;
408*44bedb31SLionel Sambuc 
409*44bedb31SLionel Sambuc     err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i);
410*44bedb31SLionel Sambuc     x = (uLong)i;
411*44bedb31SLionel Sambuc 
412*44bedb31SLionel Sambuc     if (err==ZIP_OK)
413*44bedb31SLionel Sambuc         err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i);
414*44bedb31SLionel Sambuc     x += ((uLong)i)<<8;
415*44bedb31SLionel Sambuc 
416*44bedb31SLionel Sambuc     if (err==ZIP_OK)
417*44bedb31SLionel Sambuc         err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i);
418*44bedb31SLionel Sambuc     x += ((uLong)i)<<16;
419*44bedb31SLionel Sambuc 
420*44bedb31SLionel Sambuc     if (err==ZIP_OK)
421*44bedb31SLionel Sambuc         err = ziplocal_getByte(pzlib_filefunc_def,filestream,&i);
422*44bedb31SLionel Sambuc     x += ((uLong)i)<<24;
423*44bedb31SLionel Sambuc 
424*44bedb31SLionel Sambuc     if (err==ZIP_OK)
425*44bedb31SLionel Sambuc         *pX = x;
426*44bedb31SLionel Sambuc     else
427*44bedb31SLionel Sambuc         *pX = 0;
428*44bedb31SLionel Sambuc     return err;
429*44bedb31SLionel Sambuc }
430*44bedb31SLionel Sambuc 
431*44bedb31SLionel Sambuc #ifndef BUFREADCOMMENT
432*44bedb31SLionel Sambuc #define BUFREADCOMMENT (0x400)
433*44bedb31SLionel Sambuc #endif
434*44bedb31SLionel Sambuc /*
435*44bedb31SLionel Sambuc   Locate the Central directory of a zipfile (at the end, just before
436*44bedb31SLionel Sambuc     the global comment)
437*44bedb31SLionel Sambuc */
438*44bedb31SLionel Sambuc local uLong ziplocal_SearchCentralDir OF((
439*44bedb31SLionel Sambuc     const zlib_filefunc_def* pzlib_filefunc_def,
440*44bedb31SLionel Sambuc     voidpf filestream));
441*44bedb31SLionel Sambuc 
ziplocal_SearchCentralDir(pzlib_filefunc_def,filestream)442*44bedb31SLionel Sambuc local uLong ziplocal_SearchCentralDir(pzlib_filefunc_def,filestream)
443*44bedb31SLionel Sambuc     const zlib_filefunc_def* pzlib_filefunc_def;
444*44bedb31SLionel Sambuc     voidpf filestream;
445*44bedb31SLionel Sambuc {
446*44bedb31SLionel Sambuc     unsigned char* buf;
447*44bedb31SLionel Sambuc     uLong uSizeFile;
448*44bedb31SLionel Sambuc     uLong uBackRead;
449*44bedb31SLionel Sambuc     uLong uMaxBack=0xffff; /* maximum size of global comment */
450*44bedb31SLionel Sambuc     uLong uPosFound=0;
451*44bedb31SLionel Sambuc 
452*44bedb31SLionel Sambuc     if (ZSEEK(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
453*44bedb31SLionel Sambuc         return 0;
454*44bedb31SLionel Sambuc 
455*44bedb31SLionel Sambuc 
456*44bedb31SLionel Sambuc     uSizeFile = ZTELL(*pzlib_filefunc_def,filestream);
457*44bedb31SLionel Sambuc 
458*44bedb31SLionel Sambuc     if (uMaxBack>uSizeFile)
459*44bedb31SLionel Sambuc         uMaxBack = uSizeFile;
460*44bedb31SLionel Sambuc 
461*44bedb31SLionel Sambuc     buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
462*44bedb31SLionel Sambuc     if (buf==NULL)
463*44bedb31SLionel Sambuc         return 0;
464*44bedb31SLionel Sambuc 
465*44bedb31SLionel Sambuc     uBackRead = 4;
466*44bedb31SLionel Sambuc     while (uBackRead<uMaxBack)
467*44bedb31SLionel Sambuc     {
468*44bedb31SLionel Sambuc         uLong uReadSize,uReadPos ;
469*44bedb31SLionel Sambuc         int i;
470*44bedb31SLionel Sambuc         if (uBackRead+BUFREADCOMMENT>uMaxBack)
471*44bedb31SLionel Sambuc             uBackRead = uMaxBack;
472*44bedb31SLionel Sambuc         else
473*44bedb31SLionel Sambuc             uBackRead+=BUFREADCOMMENT;
474*44bedb31SLionel Sambuc         uReadPos = uSizeFile-uBackRead ;
475*44bedb31SLionel Sambuc 
476*44bedb31SLionel Sambuc         uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
477*44bedb31SLionel Sambuc                      (BUFREADCOMMENT+4) : (uSizeFile-uReadPos);
478*44bedb31SLionel Sambuc         if (ZSEEK(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
479*44bedb31SLionel Sambuc             break;
480*44bedb31SLionel Sambuc 
481*44bedb31SLionel Sambuc         if (ZREAD(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
482*44bedb31SLionel Sambuc             break;
483*44bedb31SLionel Sambuc 
484*44bedb31SLionel Sambuc         for (i=(int)uReadSize-3; (i--)>0;)
485*44bedb31SLionel Sambuc             if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&
486*44bedb31SLionel Sambuc                 ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))
487*44bedb31SLionel Sambuc             {
488*44bedb31SLionel Sambuc                 uPosFound = uReadPos+i;
489*44bedb31SLionel Sambuc                 break;
490*44bedb31SLionel Sambuc             }
491*44bedb31SLionel Sambuc 
492*44bedb31SLionel Sambuc         if (uPosFound!=0)
493*44bedb31SLionel Sambuc             break;
494*44bedb31SLionel Sambuc     }
495*44bedb31SLionel Sambuc     TRYFREE(buf);
496*44bedb31SLionel Sambuc     return uPosFound;
497*44bedb31SLionel Sambuc }
498*44bedb31SLionel Sambuc #endif /* !NO_ADDFILEINEXISTINGZIP*/
499*44bedb31SLionel Sambuc 
500*44bedb31SLionel Sambuc /************************************************************/
501*44bedb31SLionel Sambuc extern zipFile ZEXPORT zipOpen2 (pathname, append, globalcomment, pzlib_filefunc_def)
502*44bedb31SLionel Sambuc     const char *pathname;
503*44bedb31SLionel Sambuc     int append;
504*44bedb31SLionel Sambuc     zipcharpc* globalcomment;
505*44bedb31SLionel Sambuc     zlib_filefunc_def* pzlib_filefunc_def;
506*44bedb31SLionel Sambuc {
507*44bedb31SLionel Sambuc     zip_internal ziinit;
508*44bedb31SLionel Sambuc     zip_internal* zi;
509*44bedb31SLionel Sambuc     int err=ZIP_OK;
510*44bedb31SLionel Sambuc 
511*44bedb31SLionel Sambuc 
512*44bedb31SLionel Sambuc     if (pzlib_filefunc_def==NULL)
513*44bedb31SLionel Sambuc         fill_fopen_filefunc(&ziinit.z_filefunc);
514*44bedb31SLionel Sambuc     else
515*44bedb31SLionel Sambuc         ziinit.z_filefunc = *pzlib_filefunc_def;
516*44bedb31SLionel Sambuc 
517*44bedb31SLionel Sambuc     ziinit.filestream = (*(ziinit.z_filefunc.zopen_file))
518*44bedb31SLionel Sambuc                  (ziinit.z_filefunc.opaque,
519*44bedb31SLionel Sambuc                   pathname,
520*44bedb31SLionel Sambuc                   (append == APPEND_STATUS_CREATE) ?
521*44bedb31SLionel Sambuc                   (ZLIB_FILEFUNC_MODE_READ | ZLIB_FILEFUNC_MODE_WRITE | ZLIB_FILEFUNC_MODE_CREATE) :
522*44bedb31SLionel Sambuc                     (ZLIB_FILEFUNC_MODE_READ | ZLIB_FILEFUNC_MODE_WRITE | ZLIB_FILEFUNC_MODE_EXISTING));
523*44bedb31SLionel Sambuc 
524*44bedb31SLionel Sambuc     if (ziinit.filestream == NULL)
525*44bedb31SLionel Sambuc         return NULL;
526*44bedb31SLionel Sambuc     ziinit.begin_pos = ZTELL(ziinit.z_filefunc,ziinit.filestream);
527*44bedb31SLionel Sambuc     ziinit.in_opened_file_inzip = 0;
528*44bedb31SLionel Sambuc     ziinit.ci.stream_initialised = 0;
529*44bedb31SLionel Sambuc     ziinit.number_entry = 0;
530*44bedb31SLionel Sambuc     ziinit.add_position_when_writting_offset = 0;
531*44bedb31SLionel Sambuc     init_linkedlist(&(ziinit.central_dir));
532*44bedb31SLionel Sambuc 
533*44bedb31SLionel Sambuc 
534*44bedb31SLionel Sambuc     zi = (zip_internal*)ALLOC(sizeof(zip_internal));
535*44bedb31SLionel Sambuc     if (zi==NULL)
536*44bedb31SLionel Sambuc     {
537*44bedb31SLionel Sambuc         ZCLOSE(ziinit.z_filefunc,ziinit.filestream);
538*44bedb31SLionel Sambuc         return NULL;
539*44bedb31SLionel Sambuc     }
540*44bedb31SLionel Sambuc 
541*44bedb31SLionel Sambuc     /* now we add file in a zipfile */
542*44bedb31SLionel Sambuc #    ifndef NO_ADDFILEINEXISTINGZIP
543*44bedb31SLionel Sambuc     ziinit.globalcomment = NULL;
544*44bedb31SLionel Sambuc     if (append == APPEND_STATUS_ADDINZIP)
545*44bedb31SLionel Sambuc     {
546*44bedb31SLionel Sambuc         uLong byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
547*44bedb31SLionel Sambuc 
548*44bedb31SLionel Sambuc         uLong size_central_dir;     /* size of the central directory  */
549*44bedb31SLionel Sambuc         uLong offset_central_dir;   /* offset of start of central directory */
550*44bedb31SLionel Sambuc         uLong central_pos,uL;
551*44bedb31SLionel Sambuc 
552*44bedb31SLionel Sambuc         uLong number_disk;          /* number of the current dist, used for
553*44bedb31SLionel Sambuc                                     spaning ZIP, unsupported, always 0*/
554*44bedb31SLionel Sambuc         uLong number_disk_with_CD;  /* number the the disk with central dir, used
555*44bedb31SLionel Sambuc                                     for spaning ZIP, unsupported, always 0*/
556*44bedb31SLionel Sambuc         uLong number_entry;
557*44bedb31SLionel Sambuc         uLong number_entry_CD;      /* total number of entries in
558*44bedb31SLionel Sambuc                                     the central dir
559*44bedb31SLionel Sambuc                                     (same than number_entry on nospan) */
560*44bedb31SLionel Sambuc         uLong size_comment;
561*44bedb31SLionel Sambuc 
562*44bedb31SLionel Sambuc         central_pos = ziplocal_SearchCentralDir(&ziinit.z_filefunc,ziinit.filestream);
563*44bedb31SLionel Sambuc         if (central_pos==0)
564*44bedb31SLionel Sambuc             err=ZIP_ERRNO;
565*44bedb31SLionel Sambuc 
566*44bedb31SLionel Sambuc         if (ZSEEK(ziinit.z_filefunc, ziinit.filestream,
567*44bedb31SLionel Sambuc                                         central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)
568*44bedb31SLionel Sambuc             err=ZIP_ERRNO;
569*44bedb31SLionel Sambuc 
570*44bedb31SLionel Sambuc         /* the signature, already checked */
571*44bedb31SLionel Sambuc         if (ziplocal_getLong(&ziinit.z_filefunc, ziinit.filestream,&uL)!=ZIP_OK)
572*44bedb31SLionel Sambuc             err=ZIP_ERRNO;
573*44bedb31SLionel Sambuc 
574*44bedb31SLionel Sambuc         /* number of this disk */
575*44bedb31SLionel Sambuc         if (ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&number_disk)!=ZIP_OK)
576*44bedb31SLionel Sambuc             err=ZIP_ERRNO;
577*44bedb31SLionel Sambuc 
578*44bedb31SLionel Sambuc         /* number of the disk with the start of the central directory */
579*44bedb31SLionel Sambuc         if (ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&number_disk_with_CD)!=ZIP_OK)
580*44bedb31SLionel Sambuc             err=ZIP_ERRNO;
581*44bedb31SLionel Sambuc 
582*44bedb31SLionel Sambuc         /* total number of entries in the central dir on this disk */
583*44bedb31SLionel Sambuc         if (ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&number_entry)!=ZIP_OK)
584*44bedb31SLionel Sambuc             err=ZIP_ERRNO;
585*44bedb31SLionel Sambuc 
586*44bedb31SLionel Sambuc         /* total number of entries in the central dir */
587*44bedb31SLionel Sambuc         if (ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&number_entry_CD)!=ZIP_OK)
588*44bedb31SLionel Sambuc             err=ZIP_ERRNO;
589*44bedb31SLionel Sambuc 
590*44bedb31SLionel Sambuc         if ((number_entry_CD!=number_entry) ||
591*44bedb31SLionel Sambuc             (number_disk_with_CD!=0) ||
592*44bedb31SLionel Sambuc             (number_disk!=0))
593*44bedb31SLionel Sambuc             err=ZIP_BADZIPFILE;
594*44bedb31SLionel Sambuc 
595*44bedb31SLionel Sambuc         /* size of the central directory */
596*44bedb31SLionel Sambuc         if (ziplocal_getLong(&ziinit.z_filefunc, ziinit.filestream,&size_central_dir)!=ZIP_OK)
597*44bedb31SLionel Sambuc             err=ZIP_ERRNO;
598*44bedb31SLionel Sambuc 
599*44bedb31SLionel Sambuc         /* offset of start of central directory with respect to the
600*44bedb31SLionel Sambuc             starting disk number */
601*44bedb31SLionel Sambuc         if (ziplocal_getLong(&ziinit.z_filefunc, ziinit.filestream,&offset_central_dir)!=ZIP_OK)
602*44bedb31SLionel Sambuc             err=ZIP_ERRNO;
603*44bedb31SLionel Sambuc 
604*44bedb31SLionel Sambuc         /* zipfile global comment length */
605*44bedb31SLionel Sambuc         if (ziplocal_getShort(&ziinit.z_filefunc, ziinit.filestream,&size_comment)!=ZIP_OK)
606*44bedb31SLionel Sambuc             err=ZIP_ERRNO;
607*44bedb31SLionel Sambuc 
608*44bedb31SLionel Sambuc         if ((central_pos<offset_central_dir+size_central_dir) &&
609*44bedb31SLionel Sambuc             (err==ZIP_OK))
610*44bedb31SLionel Sambuc             err=ZIP_BADZIPFILE;
611*44bedb31SLionel Sambuc 
612*44bedb31SLionel Sambuc         if (err!=ZIP_OK)
613*44bedb31SLionel Sambuc         {
614*44bedb31SLionel Sambuc             ZCLOSE(ziinit.z_filefunc, ziinit.filestream);
615*44bedb31SLionel Sambuc             return NULL;
616*44bedb31SLionel Sambuc         }
617*44bedb31SLionel Sambuc 
618*44bedb31SLionel Sambuc         if (size_comment>0)
619*44bedb31SLionel Sambuc         {
620*44bedb31SLionel Sambuc             ziinit.globalcomment = ALLOC(size_comment+1);
621*44bedb31SLionel Sambuc             if (ziinit.globalcomment)
622*44bedb31SLionel Sambuc             {
623*44bedb31SLionel Sambuc                size_comment = ZREAD(ziinit.z_filefunc, ziinit.filestream,ziinit.globalcomment,size_comment);
624*44bedb31SLionel Sambuc                ziinit.globalcomment[size_comment]=0;
625*44bedb31SLionel Sambuc             }
626*44bedb31SLionel Sambuc         }
627*44bedb31SLionel Sambuc 
628*44bedb31SLionel Sambuc         byte_before_the_zipfile = central_pos -
629*44bedb31SLionel Sambuc                                 (offset_central_dir+size_central_dir);
630*44bedb31SLionel Sambuc         ziinit.add_position_when_writting_offset = byte_before_the_zipfile;
631*44bedb31SLionel Sambuc 
632*44bedb31SLionel Sambuc         {
633*44bedb31SLionel Sambuc             uLong size_central_dir_to_read = size_central_dir;
634*44bedb31SLionel Sambuc             size_t buf_size = SIZEDATA_INDATABLOCK;
635*44bedb31SLionel Sambuc             void* buf_read = (void*)ALLOC(buf_size);
636*44bedb31SLionel Sambuc             if (ZSEEK(ziinit.z_filefunc, ziinit.filestream,
637*44bedb31SLionel Sambuc                   offset_central_dir + byte_before_the_zipfile,
638*44bedb31SLionel Sambuc                   ZLIB_FILEFUNC_SEEK_SET) != 0)
639*44bedb31SLionel Sambuc                   err=ZIP_ERRNO;
640*44bedb31SLionel Sambuc 
641*44bedb31SLionel Sambuc             while ((size_central_dir_to_read>0) && (err==ZIP_OK))
642*44bedb31SLionel Sambuc             {
643*44bedb31SLionel Sambuc                 uLong read_this = SIZEDATA_INDATABLOCK;
644*44bedb31SLionel Sambuc                 if (read_this > size_central_dir_to_read)
645*44bedb31SLionel Sambuc                     read_this = size_central_dir_to_read;
646*44bedb31SLionel Sambuc                 if (ZREAD(ziinit.z_filefunc, ziinit.filestream,buf_read,read_this) != read_this)
647*44bedb31SLionel Sambuc                     err=ZIP_ERRNO;
648*44bedb31SLionel Sambuc 
649*44bedb31SLionel Sambuc                 if (err==ZIP_OK)
650*44bedb31SLionel Sambuc                     err = add_data_in_datablock(&ziinit.central_dir,buf_read,
651*44bedb31SLionel Sambuc                                                 (uLong)read_this);
652*44bedb31SLionel Sambuc                 size_central_dir_to_read-=read_this;
653*44bedb31SLionel Sambuc             }
654*44bedb31SLionel Sambuc             TRYFREE(buf_read);
655*44bedb31SLionel Sambuc         }
656*44bedb31SLionel Sambuc         ziinit.begin_pos = byte_before_the_zipfile;
657*44bedb31SLionel Sambuc         ziinit.number_entry = number_entry_CD;
658*44bedb31SLionel Sambuc 
659*44bedb31SLionel Sambuc         if (ZSEEK(ziinit.z_filefunc, ziinit.filestream,
660*44bedb31SLionel Sambuc                   offset_central_dir+byte_before_the_zipfile,ZLIB_FILEFUNC_SEEK_SET)!=0)
661*44bedb31SLionel Sambuc             err=ZIP_ERRNO;
662*44bedb31SLionel Sambuc     }
663*44bedb31SLionel Sambuc 
664*44bedb31SLionel Sambuc     if (globalcomment)
665*44bedb31SLionel Sambuc     {
666*44bedb31SLionel Sambuc       *globalcomment = ziinit.globalcomment;
667*44bedb31SLionel Sambuc     }
668*44bedb31SLionel Sambuc #    endif /* !NO_ADDFILEINEXISTINGZIP*/
669*44bedb31SLionel Sambuc 
670*44bedb31SLionel Sambuc     if (err != ZIP_OK)
671*44bedb31SLionel Sambuc     {
672*44bedb31SLionel Sambuc #    ifndef NO_ADDFILEINEXISTINGZIP
673*44bedb31SLionel Sambuc         TRYFREE(ziinit.globalcomment);
674*44bedb31SLionel Sambuc #    endif /* !NO_ADDFILEINEXISTINGZIP*/
675*44bedb31SLionel Sambuc         TRYFREE(zi);
676*44bedb31SLionel Sambuc         return NULL;
677*44bedb31SLionel Sambuc     }
678*44bedb31SLionel Sambuc     else
679*44bedb31SLionel Sambuc     {
680*44bedb31SLionel Sambuc         *zi = ziinit;
681*44bedb31SLionel Sambuc         return (zipFile)zi;
682*44bedb31SLionel Sambuc     }
683*44bedb31SLionel Sambuc }
684*44bedb31SLionel Sambuc 
685*44bedb31SLionel Sambuc extern zipFile ZEXPORT zipOpen (pathname, append)
686*44bedb31SLionel Sambuc     const char *pathname;
687*44bedb31SLionel Sambuc     int append;
688*44bedb31SLionel Sambuc {
689*44bedb31SLionel Sambuc     return zipOpen2(pathname,append,NULL,NULL);
690*44bedb31SLionel Sambuc }
691*44bedb31SLionel Sambuc 
692*44bedb31SLionel Sambuc extern int ZEXPORT zipOpenNewFileInZip3 (file, filename, zipfi,
693*44bedb31SLionel Sambuc                                          extrafield_local, size_extrafield_local,
694*44bedb31SLionel Sambuc                                          extrafield_global, size_extrafield_global,
695*44bedb31SLionel Sambuc                                          comment, method, level, raw,
696*44bedb31SLionel Sambuc                                          windowBits, memLevel, strategy,
697*44bedb31SLionel Sambuc                                          password, crcForCrypting)
698*44bedb31SLionel Sambuc     zipFile file;
699*44bedb31SLionel Sambuc     const char* filename;
700*44bedb31SLionel Sambuc     const zip_fileinfo* zipfi;
701*44bedb31SLionel Sambuc     const void* extrafield_local;
702*44bedb31SLionel Sambuc     uInt size_extrafield_local;
703*44bedb31SLionel Sambuc     const void* extrafield_global;
704*44bedb31SLionel Sambuc     uInt size_extrafield_global;
705*44bedb31SLionel Sambuc     const char* comment;
706*44bedb31SLionel Sambuc     int method;
707*44bedb31SLionel Sambuc     int level;
708*44bedb31SLionel Sambuc     int raw;
709*44bedb31SLionel Sambuc     int windowBits;
710*44bedb31SLionel Sambuc     int memLevel;
711*44bedb31SLionel Sambuc     int strategy;
712*44bedb31SLionel Sambuc     const char* password;
713*44bedb31SLionel Sambuc     uLong crcForCrypting;
714*44bedb31SLionel Sambuc {
715*44bedb31SLionel Sambuc     zip_internal* zi;
716*44bedb31SLionel Sambuc     uInt size_filename;
717*44bedb31SLionel Sambuc     uInt size_comment;
718*44bedb31SLionel Sambuc     uInt i;
719*44bedb31SLionel Sambuc     int err = ZIP_OK;
720*44bedb31SLionel Sambuc 
721*44bedb31SLionel Sambuc #    ifdef NOCRYPT
722*44bedb31SLionel Sambuc     if (password != NULL)
723*44bedb31SLionel Sambuc         return ZIP_PARAMERROR;
724*44bedb31SLionel Sambuc #    endif
725*44bedb31SLionel Sambuc 
726*44bedb31SLionel Sambuc     if (file == NULL)
727*44bedb31SLionel Sambuc         return ZIP_PARAMERROR;
728*44bedb31SLionel Sambuc     if ((method!=0) && (method!=Z_DEFLATED))
729*44bedb31SLionel Sambuc         return ZIP_PARAMERROR;
730*44bedb31SLionel Sambuc 
731*44bedb31SLionel Sambuc     zi = (zip_internal*)file;
732*44bedb31SLionel Sambuc 
733*44bedb31SLionel Sambuc     if (zi->in_opened_file_inzip == 1)
734*44bedb31SLionel Sambuc     {
735*44bedb31SLionel Sambuc         err = zipCloseFileInZip (file);
736*44bedb31SLionel Sambuc         if (err != ZIP_OK)
737*44bedb31SLionel Sambuc             return err;
738*44bedb31SLionel Sambuc     }
739*44bedb31SLionel Sambuc 
740*44bedb31SLionel Sambuc 
741*44bedb31SLionel Sambuc     if (filename==NULL)
742*44bedb31SLionel Sambuc         filename="-";
743*44bedb31SLionel Sambuc 
744*44bedb31SLionel Sambuc     if (comment==NULL)
745*44bedb31SLionel Sambuc         size_comment = 0;
746*44bedb31SLionel Sambuc     else
747*44bedb31SLionel Sambuc         size_comment = (uInt)strlen(comment);
748*44bedb31SLionel Sambuc 
749*44bedb31SLionel Sambuc     size_filename = (uInt)strlen(filename);
750*44bedb31SLionel Sambuc 
751*44bedb31SLionel Sambuc     if (zipfi == NULL)
752*44bedb31SLionel Sambuc         zi->ci.dosDate = 0;
753*44bedb31SLionel Sambuc     else
754*44bedb31SLionel Sambuc     {
755*44bedb31SLionel Sambuc         if (zipfi->dosDate != 0)
756*44bedb31SLionel Sambuc             zi->ci.dosDate = zipfi->dosDate;
757*44bedb31SLionel Sambuc         else zi->ci.dosDate = ziplocal_TmzDateToDosDate(&zipfi->tmz_date,zipfi->dosDate);
758*44bedb31SLionel Sambuc     }
759*44bedb31SLionel Sambuc 
760*44bedb31SLionel Sambuc     zi->ci.flag = 0;
761*44bedb31SLionel Sambuc     if ((level==8) || (level==9))
762*44bedb31SLionel Sambuc       zi->ci.flag |= 2;
763*44bedb31SLionel Sambuc     if ((level==2))
764*44bedb31SLionel Sambuc       zi->ci.flag |= 4;
765*44bedb31SLionel Sambuc     if ((level==1))
766*44bedb31SLionel Sambuc       zi->ci.flag |= 6;
767*44bedb31SLionel Sambuc     if (password != NULL)
768*44bedb31SLionel Sambuc       zi->ci.flag |= 1;
769*44bedb31SLionel Sambuc 
770*44bedb31SLionel Sambuc     zi->ci.crc32 = 0;
771*44bedb31SLionel Sambuc     zi->ci.method = method;
772*44bedb31SLionel Sambuc     zi->ci.encrypt = 0;
773*44bedb31SLionel Sambuc     zi->ci.stream_initialised = 0;
774*44bedb31SLionel Sambuc     zi->ci.pos_in_buffered_data = 0;
775*44bedb31SLionel Sambuc     zi->ci.raw = raw;
776*44bedb31SLionel Sambuc     zi->ci.pos_local_header = ZTELL(zi->z_filefunc,zi->filestream) ;
777*44bedb31SLionel Sambuc     zi->ci.size_centralheader = SIZECENTRALHEADER + size_filename +
778*44bedb31SLionel Sambuc                                       size_extrafield_global + size_comment;
779*44bedb31SLionel Sambuc     zi->ci.central_header = (char*)ALLOC((uInt)zi->ci.size_centralheader);
780*44bedb31SLionel Sambuc 
781*44bedb31SLionel Sambuc     ziplocal_putValue_inmemory(zi->ci.central_header,(uLong)CENTRALHEADERMAGIC,4);
782*44bedb31SLionel Sambuc     /* version info */
783*44bedb31SLionel Sambuc     ziplocal_putValue_inmemory(zi->ci.central_header+4,(uLong)VERSIONMADEBY,2);
784*44bedb31SLionel Sambuc     ziplocal_putValue_inmemory(zi->ci.central_header+6,(uLong)20,2);
785*44bedb31SLionel Sambuc     ziplocal_putValue_inmemory(zi->ci.central_header+8,(uLong)zi->ci.flag,2);
786*44bedb31SLionel Sambuc     ziplocal_putValue_inmemory(zi->ci.central_header+10,(uLong)zi->ci.method,2);
787*44bedb31SLionel Sambuc     ziplocal_putValue_inmemory(zi->ci.central_header+12,(uLong)zi->ci.dosDate,4);
788*44bedb31SLionel Sambuc     ziplocal_putValue_inmemory(zi->ci.central_header+16,(uLong)0,4); /*crc*/
789*44bedb31SLionel Sambuc     ziplocal_putValue_inmemory(zi->ci.central_header+20,(uLong)0,4); /*compr size*/
790*44bedb31SLionel Sambuc     ziplocal_putValue_inmemory(zi->ci.central_header+24,(uLong)0,4); /*uncompr size*/
791*44bedb31SLionel Sambuc     ziplocal_putValue_inmemory(zi->ci.central_header+28,(uLong)size_filename,2);
792*44bedb31SLionel Sambuc     ziplocal_putValue_inmemory(zi->ci.central_header+30,(uLong)size_extrafield_global,2);
793*44bedb31SLionel Sambuc     ziplocal_putValue_inmemory(zi->ci.central_header+32,(uLong)size_comment,2);
794*44bedb31SLionel Sambuc     ziplocal_putValue_inmemory(zi->ci.central_header+34,(uLong)0,2); /*disk nm start*/
795*44bedb31SLionel Sambuc 
796*44bedb31SLionel Sambuc     if (zipfi==NULL)
797*44bedb31SLionel Sambuc         ziplocal_putValue_inmemory(zi->ci.central_header+36,(uLong)0,2);
798*44bedb31SLionel Sambuc     else
799*44bedb31SLionel Sambuc         ziplocal_putValue_inmemory(zi->ci.central_header+36,(uLong)zipfi->internal_fa,2);
800*44bedb31SLionel Sambuc 
801*44bedb31SLionel Sambuc     if (zipfi==NULL)
802*44bedb31SLionel Sambuc         ziplocal_putValue_inmemory(zi->ci.central_header+38,(uLong)0,4);
803*44bedb31SLionel Sambuc     else
804*44bedb31SLionel Sambuc         ziplocal_putValue_inmemory(zi->ci.central_header+38,(uLong)zipfi->external_fa,4);
805*44bedb31SLionel Sambuc 
806*44bedb31SLionel Sambuc     ziplocal_putValue_inmemory(zi->ci.central_header+42,(uLong)zi->ci.pos_local_header- zi->add_position_when_writting_offset,4);
807*44bedb31SLionel Sambuc 
808*44bedb31SLionel Sambuc     for (i=0;i<size_filename;i++)
809*44bedb31SLionel Sambuc         *(zi->ci.central_header+SIZECENTRALHEADER+i) = *(filename+i);
810*44bedb31SLionel Sambuc 
811*44bedb31SLionel Sambuc     for (i=0;i<size_extrafield_global;i++)
812*44bedb31SLionel Sambuc         *(zi->ci.central_header+SIZECENTRALHEADER+size_filename+i) =
813*44bedb31SLionel Sambuc               *(((const char*)extrafield_global)+i);
814*44bedb31SLionel Sambuc 
815*44bedb31SLionel Sambuc     for (i=0;i<size_comment;i++)
816*44bedb31SLionel Sambuc         *(zi->ci.central_header+SIZECENTRALHEADER+size_filename+
817*44bedb31SLionel Sambuc               size_extrafield_global+i) = *(comment+i);
818*44bedb31SLionel Sambuc     if (zi->ci.central_header == NULL)
819*44bedb31SLionel Sambuc         return ZIP_INTERNALERROR;
820*44bedb31SLionel Sambuc 
821*44bedb31SLionel Sambuc     /* write the local header */
822*44bedb31SLionel Sambuc     err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)LOCALHEADERMAGIC,4);
823*44bedb31SLionel Sambuc 
824*44bedb31SLionel Sambuc     if (err==ZIP_OK)
825*44bedb31SLionel Sambuc         err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)20,2);/* version needed to extract */
826*44bedb31SLionel Sambuc     if (err==ZIP_OK)
827*44bedb31SLionel Sambuc         err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.flag,2);
828*44bedb31SLionel Sambuc 
829*44bedb31SLionel Sambuc     if (err==ZIP_OK)
830*44bedb31SLionel Sambuc         err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.method,2);
831*44bedb31SLionel Sambuc 
832*44bedb31SLionel Sambuc     if (err==ZIP_OK)
833*44bedb31SLionel Sambuc         err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->ci.dosDate,4);
834*44bedb31SLionel Sambuc 
835*44bedb31SLionel Sambuc     if (err==ZIP_OK)
836*44bedb31SLionel Sambuc         err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* crc 32, unknown */
837*44bedb31SLionel Sambuc     if (err==ZIP_OK)
838*44bedb31SLionel Sambuc         err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* compressed size, unknown */
839*44bedb31SLionel Sambuc     if (err==ZIP_OK)
840*44bedb31SLionel Sambuc         err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4); /* uncompressed size, unknown */
841*44bedb31SLionel Sambuc 
842*44bedb31SLionel Sambuc     if (err==ZIP_OK)
843*44bedb31SLionel Sambuc         err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_filename,2);
844*44bedb31SLionel Sambuc 
845*44bedb31SLionel Sambuc     if (err==ZIP_OK)
846*44bedb31SLionel Sambuc         err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_extrafield_local,2);
847*44bedb31SLionel Sambuc 
848*44bedb31SLionel Sambuc     if ((err==ZIP_OK) && (size_filename>0))
849*44bedb31SLionel Sambuc         if (ZWRITE(zi->z_filefunc,zi->filestream,filename,size_filename)!=size_filename)
850*44bedb31SLionel Sambuc                 err = ZIP_ERRNO;
851*44bedb31SLionel Sambuc 
852*44bedb31SLionel Sambuc     if ((err==ZIP_OK) && (size_extrafield_local>0))
853*44bedb31SLionel Sambuc         if (ZWRITE(zi->z_filefunc,zi->filestream,extrafield_local,size_extrafield_local)
854*44bedb31SLionel Sambuc                                                                            !=size_extrafield_local)
855*44bedb31SLionel Sambuc                 err = ZIP_ERRNO;
856*44bedb31SLionel Sambuc 
857*44bedb31SLionel Sambuc     zi->ci.stream.avail_in = (uInt)0;
858*44bedb31SLionel Sambuc     zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
859*44bedb31SLionel Sambuc     zi->ci.stream.next_out = zi->ci.buffered_data;
860*44bedb31SLionel Sambuc     zi->ci.stream.total_in = 0;
861*44bedb31SLionel Sambuc     zi->ci.stream.total_out = 0;
862*44bedb31SLionel Sambuc 
863*44bedb31SLionel Sambuc     if ((err==ZIP_OK) && (zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
864*44bedb31SLionel Sambuc     {
865*44bedb31SLionel Sambuc         zi->ci.stream.zalloc = (alloc_func)0;
866*44bedb31SLionel Sambuc         zi->ci.stream.zfree = (free_func)0;
867*44bedb31SLionel Sambuc         zi->ci.stream.opaque = (voidpf)0;
868*44bedb31SLionel Sambuc 
869*44bedb31SLionel Sambuc         if (windowBits>0)
870*44bedb31SLionel Sambuc             windowBits = -windowBits;
871*44bedb31SLionel Sambuc 
872*44bedb31SLionel Sambuc         err = deflateInit2(&zi->ci.stream, level,
873*44bedb31SLionel Sambuc                Z_DEFLATED, windowBits, memLevel, strategy);
874*44bedb31SLionel Sambuc 
875*44bedb31SLionel Sambuc         if (err==Z_OK)
876*44bedb31SLionel Sambuc             zi->ci.stream_initialised = 1;
877*44bedb31SLionel Sambuc     }
878*44bedb31SLionel Sambuc #    ifndef NOCRYPT
879*44bedb31SLionel Sambuc     zi->ci.crypt_header_size = 0;
880*44bedb31SLionel Sambuc     if ((err==Z_OK) && (password != NULL))
881*44bedb31SLionel Sambuc     {
882*44bedb31SLionel Sambuc         unsigned char bufHead[RAND_HEAD_LEN];
883*44bedb31SLionel Sambuc         unsigned int sizeHead;
884*44bedb31SLionel Sambuc         zi->ci.encrypt = 1;
885*44bedb31SLionel Sambuc         zi->ci.pcrc_32_tab = get_crc_table();
886*44bedb31SLionel Sambuc         /*init_keys(password,zi->ci.keys,zi->ci.pcrc_32_tab);*/
887*44bedb31SLionel Sambuc 
888*44bedb31SLionel Sambuc         sizeHead=crypthead(password,bufHead,RAND_HEAD_LEN,zi->ci.keys,zi->ci.pcrc_32_tab,crcForCrypting);
889*44bedb31SLionel Sambuc         zi->ci.crypt_header_size = sizeHead;
890*44bedb31SLionel Sambuc 
891*44bedb31SLionel Sambuc         if (ZWRITE(zi->z_filefunc,zi->filestream,bufHead,sizeHead) != sizeHead)
892*44bedb31SLionel Sambuc                 err = ZIP_ERRNO;
893*44bedb31SLionel Sambuc     }
894*44bedb31SLionel Sambuc #    endif
895*44bedb31SLionel Sambuc 
896*44bedb31SLionel Sambuc     if (err==Z_OK)
897*44bedb31SLionel Sambuc         zi->in_opened_file_inzip = 1;
898*44bedb31SLionel Sambuc     return err;
899*44bedb31SLionel Sambuc }
900*44bedb31SLionel Sambuc 
901*44bedb31SLionel Sambuc extern int ZEXPORT zipOpenNewFileInZip2(file, filename, zipfi,
902*44bedb31SLionel Sambuc                                         extrafield_local, size_extrafield_local,
903*44bedb31SLionel Sambuc                                         extrafield_global, size_extrafield_global,
904*44bedb31SLionel Sambuc                                         comment, method, level, raw)
905*44bedb31SLionel Sambuc     zipFile file;
906*44bedb31SLionel Sambuc     const char* filename;
907*44bedb31SLionel Sambuc     const zip_fileinfo* zipfi;
908*44bedb31SLionel Sambuc     const void* extrafield_local;
909*44bedb31SLionel Sambuc     uInt size_extrafield_local;
910*44bedb31SLionel Sambuc     const void* extrafield_global;
911*44bedb31SLionel Sambuc     uInt size_extrafield_global;
912*44bedb31SLionel Sambuc     const char* comment;
913*44bedb31SLionel Sambuc     int method;
914*44bedb31SLionel Sambuc     int level;
915*44bedb31SLionel Sambuc     int raw;
916*44bedb31SLionel Sambuc {
917*44bedb31SLionel Sambuc     return zipOpenNewFileInZip3 (file, filename, zipfi,
918*44bedb31SLionel Sambuc                                  extrafield_local, size_extrafield_local,
919*44bedb31SLionel Sambuc                                  extrafield_global, size_extrafield_global,
920*44bedb31SLionel Sambuc                                  comment, method, level, raw,
921*44bedb31SLionel Sambuc                                  -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY,
922*44bedb31SLionel Sambuc                                  NULL, 0);
923*44bedb31SLionel Sambuc }
924*44bedb31SLionel Sambuc 
925*44bedb31SLionel Sambuc extern int ZEXPORT zipOpenNewFileInZip (file, filename, zipfi,
926*44bedb31SLionel Sambuc                                         extrafield_local, size_extrafield_local,
927*44bedb31SLionel Sambuc                                         extrafield_global, size_extrafield_global,
928*44bedb31SLionel Sambuc                                         comment, method, level)
929*44bedb31SLionel Sambuc     zipFile file;
930*44bedb31SLionel Sambuc     const char* filename;
931*44bedb31SLionel Sambuc     const zip_fileinfo* zipfi;
932*44bedb31SLionel Sambuc     const void* extrafield_local;
933*44bedb31SLionel Sambuc     uInt size_extrafield_local;
934*44bedb31SLionel Sambuc     const void* extrafield_global;
935*44bedb31SLionel Sambuc     uInt size_extrafield_global;
936*44bedb31SLionel Sambuc     const char* comment;
937*44bedb31SLionel Sambuc     int method;
938*44bedb31SLionel Sambuc     int level;
939*44bedb31SLionel Sambuc {
940*44bedb31SLionel Sambuc     return zipOpenNewFileInZip2 (file, filename, zipfi,
941*44bedb31SLionel Sambuc                                  extrafield_local, size_extrafield_local,
942*44bedb31SLionel Sambuc                                  extrafield_global, size_extrafield_global,
943*44bedb31SLionel Sambuc                                  comment, method, level, 0);
944*44bedb31SLionel Sambuc }
945*44bedb31SLionel Sambuc 
zipFlushWriteBuffer(zi)946*44bedb31SLionel Sambuc local int zipFlushWriteBuffer(zi)
947*44bedb31SLionel Sambuc   zip_internal* zi;
948*44bedb31SLionel Sambuc {
949*44bedb31SLionel Sambuc     int err=ZIP_OK;
950*44bedb31SLionel Sambuc 
951*44bedb31SLionel Sambuc     if (zi->ci.encrypt != 0)
952*44bedb31SLionel Sambuc     {
953*44bedb31SLionel Sambuc #ifndef NOCRYPT
954*44bedb31SLionel Sambuc         uInt i;
955*44bedb31SLionel Sambuc         int t;
956*44bedb31SLionel Sambuc         for (i=0;i<zi->ci.pos_in_buffered_data;i++)
957*44bedb31SLionel Sambuc             zi->ci.buffered_data[i] = zencode(zi->ci.keys, zi->ci.pcrc_32_tab,
958*44bedb31SLionel Sambuc                                        zi->ci.buffered_data[i],t);
959*44bedb31SLionel Sambuc #endif
960*44bedb31SLionel Sambuc     }
961*44bedb31SLionel Sambuc     if (ZWRITE(zi->z_filefunc,zi->filestream,zi->ci.buffered_data,zi->ci.pos_in_buffered_data)
962*44bedb31SLionel Sambuc                                                                     !=zi->ci.pos_in_buffered_data)
963*44bedb31SLionel Sambuc       err = ZIP_ERRNO;
964*44bedb31SLionel Sambuc     zi->ci.pos_in_buffered_data = 0;
965*44bedb31SLionel Sambuc     return err;
966*44bedb31SLionel Sambuc }
967*44bedb31SLionel Sambuc 
968*44bedb31SLionel Sambuc extern int ZEXPORT zipWriteInFileInZip (file, buf, len)
969*44bedb31SLionel Sambuc     zipFile file;
970*44bedb31SLionel Sambuc     const void* buf;
971*44bedb31SLionel Sambuc     unsigned len;
972*44bedb31SLionel Sambuc {
973*44bedb31SLionel Sambuc     zip_internal* zi;
974*44bedb31SLionel Sambuc     int err=ZIP_OK;
975*44bedb31SLionel Sambuc 
976*44bedb31SLionel Sambuc     if (file == NULL)
977*44bedb31SLionel Sambuc         return ZIP_PARAMERROR;
978*44bedb31SLionel Sambuc     zi = (zip_internal*)file;
979*44bedb31SLionel Sambuc 
980*44bedb31SLionel Sambuc     if (zi->in_opened_file_inzip == 0)
981*44bedb31SLionel Sambuc         return ZIP_PARAMERROR;
982*44bedb31SLionel Sambuc 
983*44bedb31SLionel Sambuc     zi->ci.stream.next_in = (void*)buf;
984*44bedb31SLionel Sambuc     zi->ci.stream.avail_in = len;
985*44bedb31SLionel Sambuc     zi->ci.crc32 = crc32(zi->ci.crc32,buf,len);
986*44bedb31SLionel Sambuc 
987*44bedb31SLionel Sambuc     while ((err==ZIP_OK) && (zi->ci.stream.avail_in>0))
988*44bedb31SLionel Sambuc     {
989*44bedb31SLionel Sambuc         if (zi->ci.stream.avail_out == 0)
990*44bedb31SLionel Sambuc         {
991*44bedb31SLionel Sambuc             if (zipFlushWriteBuffer(zi) == ZIP_ERRNO)
992*44bedb31SLionel Sambuc                 err = ZIP_ERRNO;
993*44bedb31SLionel Sambuc             zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
994*44bedb31SLionel Sambuc             zi->ci.stream.next_out = zi->ci.buffered_data;
995*44bedb31SLionel Sambuc         }
996*44bedb31SLionel Sambuc 
997*44bedb31SLionel Sambuc 
998*44bedb31SLionel Sambuc         if(err != ZIP_OK)
999*44bedb31SLionel Sambuc             break;
1000*44bedb31SLionel Sambuc 
1001*44bedb31SLionel Sambuc         if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
1002*44bedb31SLionel Sambuc         {
1003*44bedb31SLionel Sambuc             uLong uTotalOutBefore = zi->ci.stream.total_out;
1004*44bedb31SLionel Sambuc             err=deflate(&zi->ci.stream,  Z_NO_FLUSH);
1005*44bedb31SLionel Sambuc             zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ;
1006*44bedb31SLionel Sambuc 
1007*44bedb31SLionel Sambuc         }
1008*44bedb31SLionel Sambuc         else
1009*44bedb31SLionel Sambuc         {
1010*44bedb31SLionel Sambuc             uInt copy_this,i;
1011*44bedb31SLionel Sambuc             if (zi->ci.stream.avail_in < zi->ci.stream.avail_out)
1012*44bedb31SLionel Sambuc                 copy_this = zi->ci.stream.avail_in;
1013*44bedb31SLionel Sambuc             else
1014*44bedb31SLionel Sambuc                 copy_this = zi->ci.stream.avail_out;
1015*44bedb31SLionel Sambuc             for (i=0;i<copy_this;i++)
1016*44bedb31SLionel Sambuc                 *(((char*)zi->ci.stream.next_out)+i) =
1017*44bedb31SLionel Sambuc                     *(((const char*)zi->ci.stream.next_in)+i);
1018*44bedb31SLionel Sambuc             {
1019*44bedb31SLionel Sambuc                 zi->ci.stream.avail_in -= copy_this;
1020*44bedb31SLionel Sambuc                 zi->ci.stream.avail_out-= copy_this;
1021*44bedb31SLionel Sambuc                 zi->ci.stream.next_in+= copy_this;
1022*44bedb31SLionel Sambuc                 zi->ci.stream.next_out+= copy_this;
1023*44bedb31SLionel Sambuc                 zi->ci.stream.total_in+= copy_this;
1024*44bedb31SLionel Sambuc                 zi->ci.stream.total_out+= copy_this;
1025*44bedb31SLionel Sambuc                 zi->ci.pos_in_buffered_data += copy_this;
1026*44bedb31SLionel Sambuc             }
1027*44bedb31SLionel Sambuc         }
1028*44bedb31SLionel Sambuc     }
1029*44bedb31SLionel Sambuc 
1030*44bedb31SLionel Sambuc     return err;
1031*44bedb31SLionel Sambuc }
1032*44bedb31SLionel Sambuc 
1033*44bedb31SLionel Sambuc extern int ZEXPORT zipCloseFileInZipRaw (file, uncompressed_size, crc32)
1034*44bedb31SLionel Sambuc     zipFile file;
1035*44bedb31SLionel Sambuc     uLong uncompressed_size;
1036*44bedb31SLionel Sambuc     uLong crc32;
1037*44bedb31SLionel Sambuc {
1038*44bedb31SLionel Sambuc     zip_internal* zi;
1039*44bedb31SLionel Sambuc     uLong compressed_size;
1040*44bedb31SLionel Sambuc     int err=ZIP_OK;
1041*44bedb31SLionel Sambuc 
1042*44bedb31SLionel Sambuc     if (file == NULL)
1043*44bedb31SLionel Sambuc         return ZIP_PARAMERROR;
1044*44bedb31SLionel Sambuc     zi = (zip_internal*)file;
1045*44bedb31SLionel Sambuc 
1046*44bedb31SLionel Sambuc     if (zi->in_opened_file_inzip == 0)
1047*44bedb31SLionel Sambuc         return ZIP_PARAMERROR;
1048*44bedb31SLionel Sambuc     zi->ci.stream.avail_in = 0;
1049*44bedb31SLionel Sambuc 
1050*44bedb31SLionel Sambuc     if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
1051*44bedb31SLionel Sambuc         while (err==ZIP_OK)
1052*44bedb31SLionel Sambuc     {
1053*44bedb31SLionel Sambuc         uLong uTotalOutBefore;
1054*44bedb31SLionel Sambuc         if (zi->ci.stream.avail_out == 0)
1055*44bedb31SLionel Sambuc         {
1056*44bedb31SLionel Sambuc             if (zipFlushWriteBuffer(zi) == ZIP_ERRNO)
1057*44bedb31SLionel Sambuc                 err = ZIP_ERRNO;
1058*44bedb31SLionel Sambuc             zi->ci.stream.avail_out = (uInt)Z_BUFSIZE;
1059*44bedb31SLionel Sambuc             zi->ci.stream.next_out = zi->ci.buffered_data;
1060*44bedb31SLionel Sambuc         }
1061*44bedb31SLionel Sambuc         uTotalOutBefore = zi->ci.stream.total_out;
1062*44bedb31SLionel Sambuc         err=deflate(&zi->ci.stream,  Z_FINISH);
1063*44bedb31SLionel Sambuc         zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ;
1064*44bedb31SLionel Sambuc     }
1065*44bedb31SLionel Sambuc 
1066*44bedb31SLionel Sambuc     if (err==Z_STREAM_END)
1067*44bedb31SLionel Sambuc         err=ZIP_OK; /* this is normal */
1068*44bedb31SLionel Sambuc 
1069*44bedb31SLionel Sambuc     if ((zi->ci.pos_in_buffered_data>0) && (err==ZIP_OK))
1070*44bedb31SLionel Sambuc         if (zipFlushWriteBuffer(zi)==ZIP_ERRNO)
1071*44bedb31SLionel Sambuc             err = ZIP_ERRNO;
1072*44bedb31SLionel Sambuc 
1073*44bedb31SLionel Sambuc     if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw))
1074*44bedb31SLionel Sambuc     {
1075*44bedb31SLionel Sambuc         err=deflateEnd(&zi->ci.stream);
1076*44bedb31SLionel Sambuc         zi->ci.stream_initialised = 0;
1077*44bedb31SLionel Sambuc     }
1078*44bedb31SLionel Sambuc 
1079*44bedb31SLionel Sambuc     if (!zi->ci.raw)
1080*44bedb31SLionel Sambuc     {
1081*44bedb31SLionel Sambuc         crc32 = (uLong)zi->ci.crc32;
1082*44bedb31SLionel Sambuc         uncompressed_size = (uLong)zi->ci.stream.total_in;
1083*44bedb31SLionel Sambuc     }
1084*44bedb31SLionel Sambuc     compressed_size = (uLong)zi->ci.stream.total_out;
1085*44bedb31SLionel Sambuc #    ifndef NOCRYPT
1086*44bedb31SLionel Sambuc     compressed_size += zi->ci.crypt_header_size;
1087*44bedb31SLionel Sambuc #    endif
1088*44bedb31SLionel Sambuc 
1089*44bedb31SLionel Sambuc     ziplocal_putValue_inmemory(zi->ci.central_header+16,crc32,4); /*crc*/
1090*44bedb31SLionel Sambuc     ziplocal_putValue_inmemory(zi->ci.central_header+20,
1091*44bedb31SLionel Sambuc                                 compressed_size,4); /*compr size*/
1092*44bedb31SLionel Sambuc     if (zi->ci.stream.data_type == Z_ASCII)
1093*44bedb31SLionel Sambuc         ziplocal_putValue_inmemory(zi->ci.central_header+36,(uLong)Z_ASCII,2);
1094*44bedb31SLionel Sambuc     ziplocal_putValue_inmemory(zi->ci.central_header+24,
1095*44bedb31SLionel Sambuc                                 uncompressed_size,4); /*uncompr size*/
1096*44bedb31SLionel Sambuc 
1097*44bedb31SLionel Sambuc     if (err==ZIP_OK)
1098*44bedb31SLionel Sambuc         err = add_data_in_datablock(&zi->central_dir,zi->ci.central_header,
1099*44bedb31SLionel Sambuc                                        (uLong)zi->ci.size_centralheader);
1100*44bedb31SLionel Sambuc     free(zi->ci.central_header);
1101*44bedb31SLionel Sambuc 
1102*44bedb31SLionel Sambuc     if (err==ZIP_OK)
1103*44bedb31SLionel Sambuc     {
1104*44bedb31SLionel Sambuc         long cur_pos_inzip = ZTELL(zi->z_filefunc,zi->filestream);
1105*44bedb31SLionel Sambuc         if (ZSEEK(zi->z_filefunc,zi->filestream,
1106*44bedb31SLionel Sambuc                   zi->ci.pos_local_header + 14,ZLIB_FILEFUNC_SEEK_SET)!=0)
1107*44bedb31SLionel Sambuc             err = ZIP_ERRNO;
1108*44bedb31SLionel Sambuc 
1109*44bedb31SLionel Sambuc         if (err==ZIP_OK)
1110*44bedb31SLionel Sambuc             err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,crc32,4); /* crc 32, unknown */
1111*44bedb31SLionel Sambuc 
1112*44bedb31SLionel Sambuc         if (err==ZIP_OK) /* compressed size, unknown */
1113*44bedb31SLionel Sambuc             err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,compressed_size,4);
1114*44bedb31SLionel Sambuc 
1115*44bedb31SLionel Sambuc         if (err==ZIP_OK) /* uncompressed size, unknown */
1116*44bedb31SLionel Sambuc             err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,uncompressed_size,4);
1117*44bedb31SLionel Sambuc 
1118*44bedb31SLionel Sambuc         if (ZSEEK(zi->z_filefunc,zi->filestream,
1119*44bedb31SLionel Sambuc                   cur_pos_inzip,ZLIB_FILEFUNC_SEEK_SET)!=0)
1120*44bedb31SLionel Sambuc             err = ZIP_ERRNO;
1121*44bedb31SLionel Sambuc     }
1122*44bedb31SLionel Sambuc 
1123*44bedb31SLionel Sambuc     zi->number_entry ++;
1124*44bedb31SLionel Sambuc     zi->in_opened_file_inzip = 0;
1125*44bedb31SLionel Sambuc 
1126*44bedb31SLionel Sambuc     return err;
1127*44bedb31SLionel Sambuc }
1128*44bedb31SLionel Sambuc 
1129*44bedb31SLionel Sambuc extern int ZEXPORT zipCloseFileInZip (file)
1130*44bedb31SLionel Sambuc     zipFile file;
1131*44bedb31SLionel Sambuc {
1132*44bedb31SLionel Sambuc     return zipCloseFileInZipRaw (file,0,0);
1133*44bedb31SLionel Sambuc }
1134*44bedb31SLionel Sambuc 
1135*44bedb31SLionel Sambuc extern int ZEXPORT zipClose (file, global_comment)
1136*44bedb31SLionel Sambuc     zipFile file;
1137*44bedb31SLionel Sambuc     const char* global_comment;
1138*44bedb31SLionel Sambuc {
1139*44bedb31SLionel Sambuc     zip_internal* zi;
1140*44bedb31SLionel Sambuc     int err = 0;
1141*44bedb31SLionel Sambuc     uLong size_centraldir = 0;
1142*44bedb31SLionel Sambuc     uLong centraldir_pos_inzip;
1143*44bedb31SLionel Sambuc     uInt size_global_comment;
1144*44bedb31SLionel Sambuc     if (file == NULL)
1145*44bedb31SLionel Sambuc         return ZIP_PARAMERROR;
1146*44bedb31SLionel Sambuc     zi = (zip_internal*)file;
1147*44bedb31SLionel Sambuc 
1148*44bedb31SLionel Sambuc     if (zi->in_opened_file_inzip == 1)
1149*44bedb31SLionel Sambuc     {
1150*44bedb31SLionel Sambuc         err = zipCloseFileInZip (file);
1151*44bedb31SLionel Sambuc     }
1152*44bedb31SLionel Sambuc 
1153*44bedb31SLionel Sambuc #ifndef NO_ADDFILEINEXISTINGZIP
1154*44bedb31SLionel Sambuc     if (global_comment==NULL)
1155*44bedb31SLionel Sambuc         global_comment = zi->globalcomment;
1156*44bedb31SLionel Sambuc #endif
1157*44bedb31SLionel Sambuc     if (global_comment==NULL)
1158*44bedb31SLionel Sambuc         size_global_comment = 0;
1159*44bedb31SLionel Sambuc     else
1160*44bedb31SLionel Sambuc         size_global_comment = (uInt)strlen(global_comment);
1161*44bedb31SLionel Sambuc 
1162*44bedb31SLionel Sambuc     centraldir_pos_inzip = ZTELL(zi->z_filefunc,zi->filestream);
1163*44bedb31SLionel Sambuc     if (err==ZIP_OK)
1164*44bedb31SLionel Sambuc     {
1165*44bedb31SLionel Sambuc         linkedlist_datablock_internal* ldi = zi->central_dir.first_block ;
1166*44bedb31SLionel Sambuc         while (ldi!=NULL)
1167*44bedb31SLionel Sambuc         {
1168*44bedb31SLionel Sambuc             if ((err==ZIP_OK) && (ldi->filled_in_this_block>0))
1169*44bedb31SLionel Sambuc                 if (ZWRITE(zi->z_filefunc,zi->filestream,
1170*44bedb31SLionel Sambuc                            ldi->data,ldi->filled_in_this_block)
1171*44bedb31SLionel Sambuc                               !=ldi->filled_in_this_block )
1172*44bedb31SLionel Sambuc                     err = ZIP_ERRNO;
1173*44bedb31SLionel Sambuc 
1174*44bedb31SLionel Sambuc             size_centraldir += ldi->filled_in_this_block;
1175*44bedb31SLionel Sambuc             ldi = ldi->next_datablock;
1176*44bedb31SLionel Sambuc         }
1177*44bedb31SLionel Sambuc     }
1178*44bedb31SLionel Sambuc     free_datablock(zi->central_dir.first_block);
1179*44bedb31SLionel Sambuc 
1180*44bedb31SLionel Sambuc     if (err==ZIP_OK) /* Magic End */
1181*44bedb31SLionel Sambuc         err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)ENDHEADERMAGIC,4);
1182*44bedb31SLionel Sambuc 
1183*44bedb31SLionel Sambuc     if (err==ZIP_OK) /* number of this disk */
1184*44bedb31SLionel Sambuc         err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,2);
1185*44bedb31SLionel Sambuc 
1186*44bedb31SLionel Sambuc     if (err==ZIP_OK) /* number of the disk with the start of the central directory */
1187*44bedb31SLionel Sambuc         err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,2);
1188*44bedb31SLionel Sambuc 
1189*44bedb31SLionel Sambuc     if (err==ZIP_OK) /* total number of entries in the central dir on this disk */
1190*44bedb31SLionel Sambuc         err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->number_entry,2);
1191*44bedb31SLionel Sambuc 
1192*44bedb31SLionel Sambuc     if (err==ZIP_OK) /* total number of entries in the central dir */
1193*44bedb31SLionel Sambuc         err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)zi->number_entry,2);
1194*44bedb31SLionel Sambuc 
1195*44bedb31SLionel Sambuc     if (err==ZIP_OK) /* size of the central directory */
1196*44bedb31SLionel Sambuc         err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_centraldir,4);
1197*44bedb31SLionel Sambuc 
1198*44bedb31SLionel Sambuc     if (err==ZIP_OK) /* offset of start of central directory with respect to the
1199*44bedb31SLionel Sambuc                             starting disk number */
1200*44bedb31SLionel Sambuc         err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,
1201*44bedb31SLionel Sambuc                                 (uLong)(centraldir_pos_inzip - zi->add_position_when_writting_offset),4);
1202*44bedb31SLionel Sambuc 
1203*44bedb31SLionel Sambuc     if (err==ZIP_OK) /* zipfile comment length */
1204*44bedb31SLionel Sambuc         err = ziplocal_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_global_comment,2);
1205*44bedb31SLionel Sambuc 
1206*44bedb31SLionel Sambuc     if ((err==ZIP_OK) && (size_global_comment>0))
1207*44bedb31SLionel Sambuc         if (ZWRITE(zi->z_filefunc,zi->filestream,
1208*44bedb31SLionel Sambuc                    global_comment,size_global_comment) != size_global_comment)
1209*44bedb31SLionel Sambuc                 err = ZIP_ERRNO;
1210*44bedb31SLionel Sambuc 
1211*44bedb31SLionel Sambuc     if (ZCLOSE(zi->z_filefunc,zi->filestream) != 0)
1212*44bedb31SLionel Sambuc         if (err == ZIP_OK)
1213*44bedb31SLionel Sambuc             err = ZIP_ERRNO;
1214*44bedb31SLionel Sambuc 
1215*44bedb31SLionel Sambuc #ifndef NO_ADDFILEINEXISTINGZIP
1216*44bedb31SLionel Sambuc     TRYFREE(zi->globalcomment);
1217*44bedb31SLionel Sambuc #endif
1218*44bedb31SLionel Sambuc     TRYFREE(zi);
1219*44bedb31SLionel Sambuc 
1220*44bedb31SLionel Sambuc     return err;
1221*44bedb31SLionel Sambuc }
1222