Mercurial > hg > CbC > CbC_gcc
annotate zlib/contrib/minizip/mztools.c @ 51:ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
author | kent <kent@cr.ie.u-ryukyu.ac.jp> |
---|---|
date | Sun, 07 Feb 2010 18:27:48 +0900 |
parents | |
children | 04ced10e8804 |
rev | line source |
---|---|
51
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
1 /* |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
2 Additional tools for Minizip |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
3 Code: Xavier Roche '2004 |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
4 License: Same as ZLIB (www.gzip.org) |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
5 */ |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
6 |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
7 /* Code */ |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
8 #include <stdio.h> |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
9 #include <stdlib.h> |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
10 #include <string.h> |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
11 #include "zlib.h" |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
12 #include "unzip.h" |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
13 |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
14 #define READ_8(adr) ((unsigned char)*(adr)) |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
15 #define READ_16(adr) ( READ_8(adr) | (READ_8(adr+1) << 8) ) |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
16 #define READ_32(adr) ( READ_16(adr) | (READ_16((adr)+2) << 16) ) |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
17 |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
18 #define WRITE_8(buff, n) do { \ |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
19 *((unsigned char*)(buff)) = (unsigned char) ((n) & 0xff); \ |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
20 } while(0) |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
21 #define WRITE_16(buff, n) do { \ |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
22 WRITE_8((unsigned char*)(buff), n); \ |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
23 WRITE_8(((unsigned char*)(buff)) + 1, (n) >> 8); \ |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
24 } while(0) |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
25 #define WRITE_32(buff, n) do { \ |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
26 WRITE_16((unsigned char*)(buff), (n) & 0xffff); \ |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
27 WRITE_16((unsigned char*)(buff) + 2, (n) >> 16); \ |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
28 } while(0) |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
29 |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
30 extern int ZEXPORT unzRepair(file, fileOut, fileOutTmp, nRecovered, bytesRecovered) |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
31 const char* file; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
32 const char* fileOut; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
33 const char* fileOutTmp; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
34 uLong* nRecovered; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
35 uLong* bytesRecovered; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
36 { |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
37 int err = Z_OK; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
38 FILE* fpZip = fopen(file, "rb"); |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
39 FILE* fpOut = fopen(fileOut, "wb"); |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
40 FILE* fpOutCD = fopen(fileOutTmp, "wb"); |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
41 if (fpZip != NULL && fpOut != NULL) { |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
42 int entries = 0; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
43 uLong totalBytes = 0; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
44 char header[30]; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
45 char filename[256]; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
46 char extra[1024]; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
47 int offset = 0; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
48 int offsetCD = 0; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
49 while ( fread(header, 1, 30, fpZip) == 30 ) { |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
50 int currentOffset = offset; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
51 |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
52 /* File entry */ |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
53 if (READ_32(header) == 0x04034b50) { |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
54 unsigned int version = READ_16(header + 4); |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
55 unsigned int gpflag = READ_16(header + 6); |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
56 unsigned int method = READ_16(header + 8); |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
57 unsigned int filetime = READ_16(header + 10); |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
58 unsigned int filedate = READ_16(header + 12); |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
59 unsigned int crc = READ_32(header + 14); /* crc */ |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
60 unsigned int cpsize = READ_32(header + 18); /* compressed size */ |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
61 unsigned int uncpsize = READ_32(header + 22); /* uncompressed sz */ |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
62 unsigned int fnsize = READ_16(header + 26); /* file name length */ |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
63 unsigned int extsize = READ_16(header + 28); /* extra field length */ |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
64 filename[0] = extra[0] = '\0'; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
65 |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
66 /* Header */ |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
67 if (fwrite(header, 1, 30, fpOut) == 30) { |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
68 offset += 30; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
69 } else { |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
70 err = Z_ERRNO; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
71 break; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
72 } |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
73 |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
74 /* Filename */ |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
75 if (fnsize > 0) { |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
76 if (fread(filename, 1, fnsize, fpZip) == fnsize) { |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
77 if (fwrite(filename, 1, fnsize, fpOut) == fnsize) { |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
78 offset += fnsize; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
79 } else { |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
80 err = Z_ERRNO; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
81 break; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
82 } |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
83 } else { |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
84 err = Z_ERRNO; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
85 break; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
86 } |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
87 } else { |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
88 err = Z_STREAM_ERROR; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
89 break; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
90 } |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
91 |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
92 /* Extra field */ |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
93 if (extsize > 0) { |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
94 if (fread(extra, 1, extsize, fpZip) == extsize) { |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
95 if (fwrite(extra, 1, extsize, fpOut) == extsize) { |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
96 offset += extsize; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
97 } else { |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
98 err = Z_ERRNO; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
99 break; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
100 } |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
101 } else { |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
102 err = Z_ERRNO; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
103 break; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
104 } |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
105 } |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
106 |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
107 /* Data */ |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
108 { |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
109 int dataSize = cpsize; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
110 if (dataSize == 0) { |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
111 dataSize = uncpsize; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
112 } |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
113 if (dataSize > 0) { |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
114 char* data = malloc(dataSize); |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
115 if (data != NULL) { |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
116 if ((int)fread(data, 1, dataSize, fpZip) == dataSize) { |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
117 if ((int)fwrite(data, 1, dataSize, fpOut) == dataSize) { |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
118 offset += dataSize; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
119 totalBytes += dataSize; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
120 } else { |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
121 err = Z_ERRNO; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
122 } |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
123 } else { |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
124 err = Z_ERRNO; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
125 } |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
126 free(data); |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
127 if (err != Z_OK) { |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
128 break; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
129 } |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
130 } else { |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
131 err = Z_MEM_ERROR; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
132 break; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
133 } |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
134 } |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
135 } |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
136 |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
137 /* Central directory entry */ |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
138 { |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
139 char header[46]; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
140 char* comment = ""; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
141 int comsize = (int) strlen(comment); |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
142 WRITE_32(header, 0x02014b50); |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
143 WRITE_16(header + 4, version); |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
144 WRITE_16(header + 6, version); |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
145 WRITE_16(header + 8, gpflag); |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
146 WRITE_16(header + 10, method); |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
147 WRITE_16(header + 12, filetime); |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
148 WRITE_16(header + 14, filedate); |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
149 WRITE_32(header + 16, crc); |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
150 WRITE_32(header + 20, cpsize); |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
151 WRITE_32(header + 24, uncpsize); |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
152 WRITE_16(header + 28, fnsize); |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
153 WRITE_16(header + 30, extsize); |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
154 WRITE_16(header + 32, comsize); |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
155 WRITE_16(header + 34, 0); /* disk # */ |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
156 WRITE_16(header + 36, 0); /* int attrb */ |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
157 WRITE_32(header + 38, 0); /* ext attrb */ |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
158 WRITE_32(header + 42, currentOffset); |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
159 /* Header */ |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
160 if (fwrite(header, 1, 46, fpOutCD) == 46) { |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
161 offsetCD += 46; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
162 |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
163 /* Filename */ |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
164 if (fnsize > 0) { |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
165 if (fwrite(filename, 1, fnsize, fpOutCD) == fnsize) { |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
166 offsetCD += fnsize; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
167 } else { |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
168 err = Z_ERRNO; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
169 break; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
170 } |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
171 } else { |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
172 err = Z_STREAM_ERROR; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
173 break; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
174 } |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
175 |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
176 /* Extra field */ |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
177 if (extsize > 0) { |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
178 if (fwrite(extra, 1, extsize, fpOutCD) == extsize) { |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
179 offsetCD += extsize; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
180 } else { |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
181 err = Z_ERRNO; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
182 break; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
183 } |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
184 } |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
185 |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
186 /* Comment field */ |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
187 if (comsize > 0) { |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
188 if ((int)fwrite(comment, 1, comsize, fpOutCD) == comsize) { |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
189 offsetCD += comsize; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
190 } else { |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
191 err = Z_ERRNO; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
192 break; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
193 } |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
194 } |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
195 |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
196 |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
197 } else { |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
198 err = Z_ERRNO; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
199 break; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
200 } |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
201 } |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
202 |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
203 /* Success */ |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
204 entries++; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
205 |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
206 } else { |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
207 break; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
208 } |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
209 } |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
210 |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
211 /* Final central directory */ |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
212 { |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
213 int entriesZip = entries; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
214 char header[22]; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
215 char* comment = ""; // "ZIP File recovered by zlib/minizip/mztools"; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
216 int comsize = (int) strlen(comment); |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
217 if (entriesZip > 0xffff) { |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
218 entriesZip = 0xffff; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
219 } |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
220 WRITE_32(header, 0x06054b50); |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
221 WRITE_16(header + 4, 0); /* disk # */ |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
222 WRITE_16(header + 6, 0); /* disk # */ |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
223 WRITE_16(header + 8, entriesZip); /* hack */ |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
224 WRITE_16(header + 10, entriesZip); /* hack */ |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
225 WRITE_32(header + 12, offsetCD); /* size of CD */ |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
226 WRITE_32(header + 16, offset); /* offset to CD */ |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
227 WRITE_16(header + 20, comsize); /* comment */ |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
228 |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
229 /* Header */ |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
230 if (fwrite(header, 1, 22, fpOutCD) == 22) { |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
231 |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
232 /* Comment field */ |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
233 if (comsize > 0) { |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
234 if ((int)fwrite(comment, 1, comsize, fpOutCD) != comsize) { |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
235 err = Z_ERRNO; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
236 } |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
237 } |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
238 |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
239 } else { |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
240 err = Z_ERRNO; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
241 } |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
242 } |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
243 |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
244 /* Final merge (file + central directory) */ |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
245 fclose(fpOutCD); |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
246 if (err == Z_OK) { |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
247 fpOutCD = fopen(fileOutTmp, "rb"); |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
248 if (fpOutCD != NULL) { |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
249 int nRead; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
250 char buffer[8192]; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
251 while ( (nRead = (int)fread(buffer, 1, sizeof(buffer), fpOutCD)) > 0) { |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
252 if ((int)fwrite(buffer, 1, nRead, fpOut) != nRead) { |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
253 err = Z_ERRNO; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
254 break; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
255 } |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
256 } |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
257 fclose(fpOutCD); |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
258 } |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
259 } |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
260 |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
261 /* Close */ |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
262 fclose(fpZip); |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
263 fclose(fpOut); |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
264 |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
265 /* Wipe temporary file */ |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
266 (void)remove(fileOutTmp); |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
267 |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
268 /* Number of recovered entries */ |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
269 if (err == Z_OK) { |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
270 if (nRecovered != NULL) { |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
271 *nRecovered = entries; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
272 } |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
273 if (bytesRecovered != NULL) { |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
274 *bytesRecovered = totalBytes; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
275 } |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
276 } |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
277 } else { |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
278 err = Z_STREAM_ERROR; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
279 } |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
280 return err; |
ae3a4bfb450b
add some files of version 4.4.3 that have been forgotten.
kent <kent@cr.ie.u-ryukyu.ac.jp>
parents:
diff
changeset
|
281 } |