author | Ryan C. Gordon <icculus@icculus.org> |
Thu, 25 Feb 2016 01:16:42 -0500 | |
changeset 1371 | da48b9ff4c9b |
parent 1369 | 07608593ec07 |
child 1372 | 1a64a2857a0c |
permissions | -rw-r--r-- |
17
7337737f5120
Moved from root source dir.
Ryan C. Gordon <icculus@icculus.org>
parents:
diff
changeset
|
1 |
/* |
7337737f5120
Moved from root source dir.
Ryan C. Gordon <icculus@icculus.org>
parents:
diff
changeset
|
2 |
* ZIP support routines for PhysicsFS. |
7337737f5120
Moved from root source dir.
Ryan C. Gordon <icculus@icculus.org>
parents:
diff
changeset
|
3 |
* |
809
116b8fe30371
Renamed LICENSE to LICENSE.txt
Ryan C. Gordon <icculus@icculus.org>
parents:
808
diff
changeset
|
4 |
* Please see the file LICENSE.txt in the source's root directory. |
17
7337737f5120
Moved from root source dir.
Ryan C. Gordon <icculus@icculus.org>
parents:
diff
changeset
|
5 |
* |
337 | 6 |
* This file written by Ryan C. Gordon, with some peeking at "unzip.c" |
7 |
* by Gilles Vollant. |
|
17
7337737f5120
Moved from root source dir.
Ryan C. Gordon <icculus@icculus.org>
parents:
diff
changeset
|
8 |
*/ |
7337737f5120
Moved from root source dir.
Ryan C. Gordon <icculus@icculus.org>
parents:
diff
changeset
|
9 |
|
1258
074d08049aa7
Changed so that this builds a reasonable default with no command line #defines.
Ryan C. Gordon <icculus@icculus.org>
parents:
1247
diff
changeset
|
10 |
#define __PHYSICSFS_INTERNAL__ |
074d08049aa7
Changed so that this builds a reasonable default with no command line #defines.
Ryan C. Gordon <icculus@icculus.org>
parents:
1247
diff
changeset
|
11 |
#include "physfs_internal.h" |
074d08049aa7
Changed so that this builds a reasonable default with no command line #defines.
Ryan C. Gordon <icculus@icculus.org>
parents:
1247
diff
changeset
|
12 |
|
074d08049aa7
Changed so that this builds a reasonable default with no command line #defines.
Ryan C. Gordon <icculus@icculus.org>
parents:
1247
diff
changeset
|
13 |
#if PHYSFS_SUPPORTS_ZIP |
214
19846c18071b
Initial autoconf support.
Ryan C. Gordon <icculus@icculus.org>
parents:
194
diff
changeset
|
14 |
|
504
3420d82f9b01
Some cleanups for PocketPC port.
Ryan C. Gordon <icculus@icculus.org>
parents:
494
diff
changeset
|
15 |
#include <errno.h> |
254
c66bbbe50f14
Implemeted getLastModTime method.
Ryan C. Gordon <icculus@icculus.org>
parents:
240
diff
changeset
|
16 |
#include <time.h> |
1129
d81afe4b0a97
Cleaned up some #includes.
Ryan C. Gordon <icculus@icculus.org>
parents:
1125
diff
changeset
|
17 |
|
1207
42e2aad5ab02
Replaced zlib with a hacked up copy of miniz: http://code.google.com/p/miniz/
Ryan C. Gordon <icculus@icculus.org>
parents:
1206
diff
changeset
|
18 |
#include "physfs_miniz.h" |
42e2aad5ab02
Replaced zlib with a hacked up copy of miniz: http://code.google.com/p/miniz/
Ryan C. Gordon <icculus@icculus.org>
parents:
1206
diff
changeset
|
19 |
|
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
20 |
/* |
691
71d9affe0d8a
All memory management now goes through allocation hooks instead of directly to
Ryan C. Gordon <icculus@icculus.org>
parents:
658
diff
changeset
|
21 |
* A buffer of ZIP_READBUFSIZE is allocated for each compressed file opened, |
71d9affe0d8a
All memory management now goes through allocation hooks instead of directly to
Ryan C. Gordon <icculus@icculus.org>
parents:
658
diff
changeset
|
22 |
* and is freed when you close the file; compressed data is read into |
337 | 23 |
* this buffer, and then is decompressed into the buffer passed to |
24 |
* PHYSFS_read(). |
|
25 |
* |
|
26 |
* Uncompressed entries in a zipfile do not allocate this buffer; they just |
|
27 |
* read data directly into the buffer passed to PHYSFS_read(). |
|
28 |
* |
|
29 |
* Depending on your speed and memory requirements, you should tweak this |
|
30 |
* value. |
|
31 |
*/ |
|
32 |
#define ZIP_READBUFSIZE (16 * 1024) |
|
33 |
||
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
34 |
|
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
35 |
/* |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
36 |
* Entries are "unresolved" until they are first opened. At that time, |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
37 |
* local file headers parsed/validated, data offsets will be updated to look |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
38 |
* at the actual file data instead of the header, and symlinks will be |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
39 |
* followed and optimized. This means that we don't seek and read around the |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
40 |
* archive until forced to do so, and after the first time, we had to do |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
41 |
* less reading and parsing, which is very CD-ROM friendly. |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
42 |
*/ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
43 |
typedef enum |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
44 |
{ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
45 |
ZIP_UNRESOLVED_FILE, |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
46 |
ZIP_UNRESOLVED_SYMLINK, |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
47 |
ZIP_RESOLVING, |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
48 |
ZIP_RESOLVED, |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
49 |
ZIP_BROKEN_FILE, |
538
8752e3c0dbf9
Now compiles on CodeWarrior 6 for MacOS Classic again.
Ryan C. Gordon <icculus@icculus.org>
parents:
504
diff
changeset
|
50 |
ZIP_BROKEN_SYMLINK |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
51 |
} ZipResolveType; |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
52 |
|
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
53 |
|
337 | 54 |
/* |
55 |
* One ZIPentry is kept for each file in an open ZIP archive. |
|
56 |
*/ |
|
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
57 |
typedef struct _ZIPentry |
32
09a8197fad3b
Initial work on ZIPfile support. Not complete. Not very pleased with this
Ryan C. Gordon <icculus@icculus.org>
parents:
29
diff
changeset
|
58 |
{ |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
59 |
char *name; /* Name of file in archive */ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
60 |
struct _ZIPentry *symlink; /* NULL or file we symlink to */ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
61 |
ZipResolveType resolved; /* Have we resolved file/symlink? */ |
1283
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
62 |
PHYSFS_uint64 offset; /* offset of data in archive */ |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
63 |
PHYSFS_uint16 version; /* version made by */ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
64 |
PHYSFS_uint16 version_needed; /* version needed to extract */ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
65 |
PHYSFS_uint16 compression_method; /* compression method */ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
66 |
PHYSFS_uint32 crc; /* crc-32 */ |
1283
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
67 |
PHYSFS_uint64 compressed_size; /* compressed size */ |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
68 |
PHYSFS_uint64 uncompressed_size; /* uncompressed size */ |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
69 |
PHYSFS_sint64 last_mod_time; /* last file mod time */ |
53
6c3c990f006e
ZIP entries are now cached at openArchive time, which cleans up the race
Ryan C. Gordon <icculus@icculus.org>
parents:
52
diff
changeset
|
70 |
} ZIPentry; |
6c3c990f006e
ZIP entries are now cached at openArchive time, which cleans up the race
Ryan C. Gordon <icculus@icculus.org>
parents:
52
diff
changeset
|
71 |
|
337 | 72 |
/* |
73 |
* One ZIPinfo is kept for each open ZIP archive. |
|
74 |
*/ |
|
75 |
typedef struct |
|
76 |
{ |
|
1368
83e1fbf94f30
Added a minor comment.
Ryan C. Gordon <icculus@icculus.org>
parents:
1345
diff
changeset
|
77 |
PHYSFS_Io *io; /* the i/o interface for this archive. */ |
1283
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
78 |
int zip64; /* non-zero if this is a Zip64 archive. */ |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
79 |
PHYSFS_uint64 entryCount; /* Number of files in ZIP. */ |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
80 |
ZIPentry *entries; /* info on all files in ZIP. */ |
337 | 81 |
} ZIPinfo; |
82 |
||
83 |
/* |
|
84 |
* One ZIPfileinfo is kept for each open file in a ZIP archive. |
|
85 |
*/ |
|
53
6c3c990f006e
ZIP entries are now cached at openArchive time, which cleans up the race
Ryan C. Gordon <icculus@icculus.org>
parents:
52
diff
changeset
|
86 |
typedef struct |
6c3c990f006e
ZIP entries are now cached at openArchive time, which cleans up the race
Ryan C. Gordon <icculus@icculus.org>
parents:
52
diff
changeset
|
87 |
{ |
337 | 88 |
ZIPentry *entry; /* Info on file. */ |
1118
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
89 |
PHYSFS_Io *io; /* physical file handle. */ |
337 | 90 |
PHYSFS_uint32 compressed_position; /* offset in compressed data. */ |
91 |
PHYSFS_uint32 uncompressed_position; /* tell() position. */ |
|
92 |
PHYSFS_uint8 *buffer; /* decompression buffer. */ |
|
93 |
z_stream stream; /* zlib stream state. */ |
|
94 |
} ZIPfileinfo; |
|
95 |
||
32
09a8197fad3b
Initial work on ZIPfile support. Not complete. Not very pleased with this
Ryan C. Gordon <icculus@icculus.org>
parents:
29
diff
changeset
|
96 |
|
337 | 97 |
/* Magic numbers... */ |
1283
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
98 |
#define ZIP_LOCAL_FILE_SIG 0x04034b50 |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
99 |
#define ZIP_CENTRAL_DIR_SIG 0x02014b50 |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
100 |
#define ZIP_END_OF_CENTRAL_DIR_SIG 0x06054b50 |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
101 |
#define ZIP64_END_OF_CENTRAL_DIR_SIG 0x06064b50 |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
102 |
#define ZIP64_END_OF_CENTRAL_DIRECTORY_LOCATOR_SIG 0x07064b50 |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
103 |
#define ZIP64_EXTENDED_INFO_EXTRA_FIELD_SIG 0x0001 |
337 | 104 |
|
105 |
/* compression methods... */ |
|
106 |
#define COMPMETH_NONE 0 |
|
107 |
/* ...and others... */ |
|
108 |
||
109 |
||
342
cef50576cb0b
Fixed symlink detection.
Ryan C. Gordon <icculus@icculus.org>
parents:
340
diff
changeset
|
110 |
#define UNIX_FILETYPE_MASK 0170000 |
cef50576cb0b
Fixed symlink detection.
Ryan C. Gordon <icculus@icculus.org>
parents:
340
diff
changeset
|
111 |
#define UNIX_FILETYPE_SYMLINK 0120000 |
cef50576cb0b
Fixed symlink detection.
Ryan C. Gordon <icculus@icculus.org>
parents:
340
diff
changeset
|
112 |
|
cef50576cb0b
Fixed symlink detection.
Ryan C. Gordon <icculus@icculus.org>
parents:
340
diff
changeset
|
113 |
|
644
1cb5533d369c
Initial structure for replacable allocator work.
Ryan C. Gordon <icculus@icculus.org>
parents:
579
diff
changeset
|
114 |
/* |
1cb5533d369c
Initial structure for replacable allocator work.
Ryan C. Gordon <icculus@icculus.org>
parents:
579
diff
changeset
|
115 |
* Bridge physfs allocation functions to zlib's format... |
1cb5533d369c
Initial structure for replacable allocator work.
Ryan C. Gordon <icculus@icculus.org>
parents:
579
diff
changeset
|
116 |
*/ |
1cb5533d369c
Initial structure for replacable allocator work.
Ryan C. Gordon <icculus@icculus.org>
parents:
579
diff
changeset
|
117 |
static voidpf zlibPhysfsAlloc(voidpf opaque, uInt items, uInt size) |
1cb5533d369c
Initial structure for replacable allocator work.
Ryan C. Gordon <icculus@icculus.org>
parents:
579
diff
changeset
|
118 |
{ |
1016
957c97389257
Cleaned up returns that look like function calls for my updated coding style.
Ryan C. Gordon <icculus@icculus.org>
parents:
997
diff
changeset
|
119 |
return ((PHYSFS_Allocator *) opaque)->Malloc(items * size); |
644
1cb5533d369c
Initial structure for replacable allocator work.
Ryan C. Gordon <icculus@icculus.org>
parents:
579
diff
changeset
|
120 |
} /* zlibPhysfsAlloc */ |
1cb5533d369c
Initial structure for replacable allocator work.
Ryan C. Gordon <icculus@icculus.org>
parents:
579
diff
changeset
|
121 |
|
1cb5533d369c
Initial structure for replacable allocator work.
Ryan C. Gordon <icculus@icculus.org>
parents:
579
diff
changeset
|
122 |
/* |
1cb5533d369c
Initial structure for replacable allocator work.
Ryan C. Gordon <icculus@icculus.org>
parents:
579
diff
changeset
|
123 |
* Bridge physfs allocation functions to zlib's format... |
1cb5533d369c
Initial structure for replacable allocator work.
Ryan C. Gordon <icculus@icculus.org>
parents:
579
diff
changeset
|
124 |
*/ |
1cb5533d369c
Initial structure for replacable allocator work.
Ryan C. Gordon <icculus@icculus.org>
parents:
579
diff
changeset
|
125 |
static void zlibPhysfsFree(voidpf opaque, voidpf address) |
1cb5533d369c
Initial structure for replacable allocator work.
Ryan C. Gordon <icculus@icculus.org>
parents:
579
diff
changeset
|
126 |
{ |
691
71d9affe0d8a
All memory management now goes through allocation hooks instead of directly to
Ryan C. Gordon <icculus@icculus.org>
parents:
658
diff
changeset
|
127 |
((PHYSFS_Allocator *) opaque)->Free(address); |
644
1cb5533d369c
Initial structure for replacable allocator work.
Ryan C. Gordon <icculus@icculus.org>
parents:
579
diff
changeset
|
128 |
} /* zlibPhysfsFree */ |
1cb5533d369c
Initial structure for replacable allocator work.
Ryan C. Gordon <icculus@icculus.org>
parents:
579
diff
changeset
|
129 |
|
1cb5533d369c
Initial structure for replacable allocator work.
Ryan C. Gordon <icculus@icculus.org>
parents:
579
diff
changeset
|
130 |
|
1cb5533d369c
Initial structure for replacable allocator work.
Ryan C. Gordon <icculus@icculus.org>
parents:
579
diff
changeset
|
131 |
/* |
1cb5533d369c
Initial structure for replacable allocator work.
Ryan C. Gordon <icculus@icculus.org>
parents:
579
diff
changeset
|
132 |
* Construct a new z_stream to a sane state. |
1cb5533d369c
Initial structure for replacable allocator work.
Ryan C. Gordon <icculus@icculus.org>
parents:
579
diff
changeset
|
133 |
*/ |
1cb5533d369c
Initial structure for replacable allocator work.
Ryan C. Gordon <icculus@icculus.org>
parents:
579
diff
changeset
|
134 |
static void initializeZStream(z_stream *pstr) |
1cb5533d369c
Initial structure for replacable allocator work.
Ryan C. Gordon <icculus@icculus.org>
parents:
579
diff
changeset
|
135 |
{ |
1cb5533d369c
Initial structure for replacable allocator work.
Ryan C. Gordon <icculus@icculus.org>
parents:
579
diff
changeset
|
136 |
memset(pstr, '\0', sizeof (z_stream)); |
1cb5533d369c
Initial structure for replacable allocator work.
Ryan C. Gordon <icculus@icculus.org>
parents:
579
diff
changeset
|
137 |
pstr->zalloc = zlibPhysfsAlloc; |
1cb5533d369c
Initial structure for replacable allocator work.
Ryan C. Gordon <icculus@icculus.org>
parents:
579
diff
changeset
|
138 |
pstr->zfree = zlibPhysfsFree; |
691
71d9affe0d8a
All memory management now goes through allocation hooks instead of directly to
Ryan C. Gordon <icculus@icculus.org>
parents:
658
diff
changeset
|
139 |
pstr->opaque = &allocator; |
644
1cb5533d369c
Initial structure for replacable allocator work.
Ryan C. Gordon <icculus@icculus.org>
parents:
579
diff
changeset
|
140 |
} /* initializeZStream */ |
1cb5533d369c
Initial structure for replacable allocator work.
Ryan C. Gordon <icculus@icculus.org>
parents:
579
diff
changeset
|
141 |
|
1cb5533d369c
Initial structure for replacable allocator work.
Ryan C. Gordon <icculus@icculus.org>
parents:
579
diff
changeset
|
142 |
|
1240
22d4d1bd4e21
Reworked the error reporting API. Now we use error codes instead of strings.
Ryan C. Gordon <icculus@icculus.org>
parents:
1220
diff
changeset
|
143 |
static PHYSFS_ErrorCode zlib_error_code(int rc) |
427
c38ace41039f
Natural language #defines and build system support.
Ryan C. Gordon <icculus@icculus.org>
parents:
413
diff
changeset
|
144 |
{ |
c38ace41039f
Natural language #defines and build system support.
Ryan C. Gordon <icculus@icculus.org>
parents:
413
diff
changeset
|
145 |
switch (rc) |
c38ace41039f
Natural language #defines and build system support.
Ryan C. Gordon <icculus@icculus.org>
parents:
413
diff
changeset
|
146 |
{ |
1240
22d4d1bd4e21
Reworked the error reporting API. Now we use error codes instead of strings.
Ryan C. Gordon <icculus@icculus.org>
parents:
1220
diff
changeset
|
147 |
case Z_OK: return PHYSFS_ERR_OK; /* not an error. */ |
22d4d1bd4e21
Reworked the error reporting API. Now we use error codes instead of strings.
Ryan C. Gordon <icculus@icculus.org>
parents:
1220
diff
changeset
|
148 |
case Z_STREAM_END: return PHYSFS_ERR_OK; /* not an error. */ |
22d4d1bd4e21
Reworked the error reporting API. Now we use error codes instead of strings.
Ryan C. Gordon <icculus@icculus.org>
parents:
1220
diff
changeset
|
149 |
case Z_ERRNO: return PHYSFS_ERR_IO; |
22d4d1bd4e21
Reworked the error reporting API. Now we use error codes instead of strings.
Ryan C. Gordon <icculus@icculus.org>
parents:
1220
diff
changeset
|
150 |
case Z_MEM_ERROR: return PHYSFS_ERR_OUT_OF_MEMORY; |
22d4d1bd4e21
Reworked the error reporting API. Now we use error codes instead of strings.
Ryan C. Gordon <icculus@icculus.org>
parents:
1220
diff
changeset
|
151 |
default: return PHYSFS_ERR_CORRUPT; |
427
c38ace41039f
Natural language #defines and build system support.
Ryan C. Gordon <icculus@icculus.org>
parents:
413
diff
changeset
|
152 |
} /* switch */ |
c38ace41039f
Natural language #defines and build system support.
Ryan C. Gordon <icculus@icculus.org>
parents:
413
diff
changeset
|
153 |
} /* zlib_error_string */ |
c38ace41039f
Natural language #defines and build system support.
Ryan C. Gordon <icculus@icculus.org>
parents:
413
diff
changeset
|
154 |
|
c38ace41039f
Natural language #defines and build system support.
Ryan C. Gordon <icculus@icculus.org>
parents:
413
diff
changeset
|
155 |
|
337 | 156 |
/* |
157 |
* Wrap all zlib calls in this, so the physfs error state is set appropriately. |
|
158 |
*/ |
|
1240
22d4d1bd4e21
Reworked the error reporting API. Now we use error codes instead of strings.
Ryan C. Gordon <icculus@icculus.org>
parents:
1220
diff
changeset
|
159 |
static int zlib_err(const int rc) |
337 | 160 |
{ |
1328
a5314f07614a
Remove __PHYSFS_setError(), use the new public API instead.
Ryan C. Gordon <icculus@icculus.org>
parents:
1327
diff
changeset
|
161 |
PHYSFS_setErrorCode(zlib_error_code(rc)); |
1016
957c97389257
Cleaned up returns that look like function calls for my updated coding style.
Ryan C. Gordon <icculus@icculus.org>
parents:
997
diff
changeset
|
162 |
return rc; |
337 | 163 |
} /* zlib_err */ |
164 |
||
165 |
||
166 |
/* |
|
1283
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
167 |
* Read an unsigned 64-bit int and swap to native byte order. |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
168 |
*/ |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
169 |
static int readui64(PHYSFS_Io *io, PHYSFS_uint64 *val) |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
170 |
{ |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
171 |
PHYSFS_uint64 v; |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
172 |
BAIL_IF_MACRO(!__PHYSFS_readAll(io, &v, sizeof (v)), ERRPASS, 0); |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
173 |
*val = PHYSFS_swapULE64(v); |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
174 |
return 1; |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
175 |
} /* readui64 */ |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
176 |
|
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
177 |
/* |
337 | 178 |
* Read an unsigned 32-bit int and swap to native byte order. |
179 |
*/ |
|
1118
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
180 |
static int readui32(PHYSFS_Io *io, PHYSFS_uint32 *val) |
337 | 181 |
{ |
182 |
PHYSFS_uint32 v; |
|
1240
22d4d1bd4e21
Reworked the error reporting API. Now we use error codes instead of strings.
Ryan C. Gordon <icculus@icculus.org>
parents:
1220
diff
changeset
|
183 |
BAIL_IF_MACRO(!__PHYSFS_readAll(io, &v, sizeof (v)), ERRPASS, 0); |
337 | 184 |
*val = PHYSFS_swapULE32(v); |
1016
957c97389257
Cleaned up returns that look like function calls for my updated coding style.
Ryan C. Gordon <icculus@icculus.org>
parents:
997
diff
changeset
|
185 |
return 1; |
337 | 186 |
} /* readui32 */ |
187 |
||
188 |
||
189 |
/* |
|
190 |
* Read an unsigned 16-bit int and swap to native byte order. |
|
191 |
*/ |
|
1118
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
192 |
static int readui16(PHYSFS_Io *io, PHYSFS_uint16 *val) |
337 | 193 |
{ |
194 |
PHYSFS_uint16 v; |
|
1240
22d4d1bd4e21
Reworked the error reporting API. Now we use error codes instead of strings.
Ryan C. Gordon <icculus@icculus.org>
parents:
1220
diff
changeset
|
195 |
BAIL_IF_MACRO(!__PHYSFS_readAll(io, &v, sizeof (v)), ERRPASS, 0); |
337 | 196 |
*val = PHYSFS_swapULE16(v); |
1016
957c97389257
Cleaned up returns that look like function calls for my updated coding style.
Ryan C. Gordon <icculus@icculus.org>
parents:
997
diff
changeset
|
197 |
return 1; |
337 | 198 |
} /* readui16 */ |
199 |
||
200 |
||
1118
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
201 |
static PHYSFS_sint64 ZIP_read(PHYSFS_Io *_io, void *buf, PHYSFS_uint64 len) |
20
efdde0d21521
Implementation compiles and links with no actual archive support. No test
Ryan C. Gordon <icculus@icculus.org>
parents:
17
diff
changeset
|
202 |
{ |
1118
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
203 |
ZIPfileinfo *finfo = (ZIPfileinfo *) _io->opaque; |
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
204 |
PHYSFS_Io *io = finfo->io; |
337 | 205 |
ZIPentry *entry = finfo->entry; |
206 |
PHYSFS_sint64 retval = 0; |
|
1098
4e86cec1143f
Moved all the file i/o from stdio-style to POSIX-style.
Ryan C. Gordon <icculus@icculus.org>
parents:
1085
diff
changeset
|
207 |
PHYSFS_sint64 maxread = (PHYSFS_sint64) len; |
337 | 208 |
PHYSFS_sint64 avail = entry->uncompressed_size - |
209 |
finfo->uncompressed_position; |
|
210 |
||
1098
4e86cec1143f
Moved all the file i/o from stdio-style to POSIX-style.
Ryan C. Gordon <icculus@icculus.org>
parents:
1085
diff
changeset
|
211 |
if (avail < maxread) |
4e86cec1143f
Moved all the file i/o from stdio-style to POSIX-style.
Ryan C. Gordon <icculus@icculus.org>
parents:
1085
diff
changeset
|
212 |
maxread = avail; |
4e86cec1143f
Moved all the file i/o from stdio-style to POSIX-style.
Ryan C. Gordon <icculus@icculus.org>
parents:
1085
diff
changeset
|
213 |
|
1240
22d4d1bd4e21
Reworked the error reporting API. Now we use error codes instead of strings.
Ryan C. Gordon <icculus@icculus.org>
parents:
1220
diff
changeset
|
214 |
BAIL_IF_MACRO(maxread == 0, ERRPASS, 0); /* quick rejection. */ |
337 | 215 |
|
216 |
if (entry->compression_method == COMPMETH_NONE) |
|
1118
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
217 |
retval = io->read(io, buf, maxread); |
337 | 218 |
else |
219 |
{ |
|
220 |
finfo->stream.next_out = buf; |
|
1208
3edcb015089a
Fixed some compiler warnings.
Ryan C. Gordon <icculus@icculus.org>
parents:
1207
diff
changeset
|
221 |
finfo->stream.avail_out = (uInt) maxread; |
337 | 222 |
|
223 |
while (retval < maxread) |
|
224 |
{ |
|
225 |
PHYSFS_uint32 before = finfo->stream.total_out; |
|
226 |
int rc; |
|
50
989b413188e5
Added individual file i/o code. Untested.
Ryan C. Gordon <icculus@icculus.org>
parents:
46
diff
changeset
|
227 |
|
337 | 228 |
if (finfo->stream.avail_in == 0) |
229 |
{ |
|
230 |
PHYSFS_sint64 br; |
|
231 |
||
232 |
br = entry->compressed_size - finfo->compressed_position; |
|
233 |
if (br > 0) |
|
234 |
{ |
|
235 |
if (br > ZIP_READBUFSIZE) |
|
236 |
br = ZIP_READBUFSIZE; |
|
237 |
||
1118
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
238 |
br = io->read(io, finfo->buffer, (PHYSFS_uint64) br); |
337 | 239 |
if (br <= 0) |
240 |
break; |
|
50
989b413188e5
Added individual file i/o code. Untested.
Ryan C. Gordon <icculus@icculus.org>
parents:
46
diff
changeset
|
241 |
|
540
a6b6f0a54cd2
Attempt at type correctness.
Ryan C. Gordon <icculus@icculus.org>
parents:
538
diff
changeset
|
242 |
finfo->compressed_position += (PHYSFS_uint32) br; |
337 | 243 |
finfo->stream.next_in = finfo->buffer; |
540
a6b6f0a54cd2
Attempt at type correctness.
Ryan C. Gordon <icculus@icculus.org>
parents:
538
diff
changeset
|
244 |
finfo->stream.avail_in = (PHYSFS_uint32) br; |
337 | 245 |
} /* if */ |
246 |
} /* if */ |
|
247 |
||
248 |
rc = zlib_err(inflate(&finfo->stream, Z_SYNC_FLUSH)); |
|
249 |
retval += (finfo->stream.total_out - before); |
|
250 |
||
251 |
if (rc != Z_OK) |
|
252 |
break; |
|
253 |
} /* while */ |
|
254 |
} /* else */ |
|
255 |
||
256 |
if (retval > 0) |
|
1098
4e86cec1143f
Moved all the file i/o from stdio-style to POSIX-style.
Ryan C. Gordon <icculus@icculus.org>
parents:
1085
diff
changeset
|
257 |
finfo->uncompressed_position += (PHYSFS_uint32) retval; |
337 | 258 |
|
1016
957c97389257
Cleaned up returns that look like function calls for my updated coding style.
Ryan C. Gordon <icculus@icculus.org>
parents:
997
diff
changeset
|
259 |
return retval; |
20
efdde0d21521
Implementation compiles and links with no actual archive support. No test
Ryan C. Gordon <icculus@icculus.org>
parents:
17
diff
changeset
|
260 |
} /* ZIP_read */ |
efdde0d21521
Implementation compiles and links with no actual archive support. No test
Ryan C. Gordon <icculus@icculus.org>
parents:
17
diff
changeset
|
261 |
|
efdde0d21521
Implementation compiles and links with no actual archive support. No test
Ryan C. Gordon <icculus@icculus.org>
parents:
17
diff
changeset
|
262 |
|
1118
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
263 |
static PHYSFS_sint64 ZIP_write(PHYSFS_Io *io, const void *b, PHYSFS_uint64 len) |
467
99664d9842cb
Bunch of tedious corrections, optimizations, and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
464
diff
changeset
|
264 |
{ |
1247
4ea4710d4863
Removed a FIXME: use correct error code for writing to read-only archives.
Ryan C. Gordon <icculus@icculus.org>
parents:
1240
diff
changeset
|
265 |
BAIL_MACRO(PHYSFS_ERR_READ_ONLY, -1); |
467
99664d9842cb
Bunch of tedious corrections, optimizations, and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
464
diff
changeset
|
266 |
} /* ZIP_write */ |
99664d9842cb
Bunch of tedious corrections, optimizations, and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
464
diff
changeset
|
267 |
|
99664d9842cb
Bunch of tedious corrections, optimizations, and cleanups.
Ryan C. Gordon <icculus@icculus.org>
parents:
464
diff
changeset
|
268 |
|
1118
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
269 |
static PHYSFS_sint64 ZIP_tell(PHYSFS_Io *io) |
20
efdde0d21521
Implementation compiles and links with no actual archive support. No test
Ryan C. Gordon <icculus@icculus.org>
parents:
17
diff
changeset
|
270 |
{ |
1118
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
271 |
return ((ZIPfileinfo *) io->opaque)->uncompressed_position; |
20
efdde0d21521
Implementation compiles and links with no actual archive support. No test
Ryan C. Gordon <icculus@icculus.org>
parents:
17
diff
changeset
|
272 |
} /* ZIP_tell */ |
efdde0d21521
Implementation compiles and links with no actual archive support. No test
Ryan C. Gordon <icculus@icculus.org>
parents:
17
diff
changeset
|
273 |
|
efdde0d21521
Implementation compiles and links with no actual archive support. No test
Ryan C. Gordon <icculus@icculus.org>
parents:
17
diff
changeset
|
274 |
|
1118
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
275 |
static int ZIP_seek(PHYSFS_Io *_io, PHYSFS_uint64 offset) |
20
efdde0d21521
Implementation compiles and links with no actual archive support. No test
Ryan C. Gordon <icculus@icculus.org>
parents:
17
diff
changeset
|
276 |
{ |
1118
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
277 |
ZIPfileinfo *finfo = (ZIPfileinfo *) _io->opaque; |
337 | 278 |
ZIPentry *entry = finfo->entry; |
1118
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
279 |
PHYSFS_Io *io = finfo->io; |
337 | 280 |
|
1240
22d4d1bd4e21
Reworked the error reporting API. Now we use error codes instead of strings.
Ryan C. Gordon <icculus@icculus.org>
parents:
1220
diff
changeset
|
281 |
BAIL_IF_MACRO(offset > entry->uncompressed_size, PHYSFS_ERR_PAST_EOF, 0); |
50
989b413188e5
Added individual file i/o code. Untested.
Ryan C. Gordon <icculus@icculus.org>
parents:
46
diff
changeset
|
282 |
|
337 | 283 |
if (entry->compression_method == COMPMETH_NONE) |
284 |
{ |
|
1118
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
285 |
const PHYSFS_sint64 newpos = offset + entry->offset; |
1240
22d4d1bd4e21
Reworked the error reporting API. Now we use error codes instead of strings.
Ryan C. Gordon <icculus@icculus.org>
parents:
1220
diff
changeset
|
286 |
BAIL_IF_MACRO(!io->seek(io, newpos), ERRPASS, 0); |
551
f0fc464fd51b
Fixed seeking in uncompressed zip entries and handle Java-created JAR files.
Ryan C. Gordon <icculus@icculus.org>
parents:
541
diff
changeset
|
287 |
finfo->uncompressed_position = (PHYSFS_uint32) offset; |
337 | 288 |
} /* if */ |
50
989b413188e5
Added individual file i/o code. Untested.
Ryan C. Gordon <icculus@icculus.org>
parents:
46
diff
changeset
|
289 |
|
337 | 290 |
else |
50
989b413188e5
Added individual file i/o code. Untested.
Ryan C. Gordon <icculus@icculus.org>
parents:
46
diff
changeset
|
291 |
{ |
337 | 292 |
/* |
293 |
* If seeking backwards, we need to redecode the file |
|
294 |
* from the start and throw away the compressed bits until we hit |
|
295 |
* the offset we need. If seeking forward, we still need to |
|
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
296 |
* decode, but we don't rewind first. |
337 | 297 |
*/ |
298 |
if (offset < finfo->uncompressed_position) |
|
299 |
{ |
|
300 |
/* we do a copy so state is sane if inflateInit2() fails. */ |
|
301 |
z_stream str; |
|
644
1cb5533d369c
Initial structure for replacable allocator work.
Ryan C. Gordon <icculus@icculus.org>
parents:
579
diff
changeset
|
302 |
initializeZStream(&str); |
337 | 303 |
if (zlib_err(inflateInit2(&str, -MAX_WBITS)) != Z_OK) |
1016
957c97389257
Cleaned up returns that look like function calls for my updated coding style.
Ryan C. Gordon <icculus@icculus.org>
parents:
997
diff
changeset
|
304 |
return 0; |
50
989b413188e5
Added individual file i/o code. Untested.
Ryan C. Gordon <icculus@icculus.org>
parents:
46
diff
changeset
|
305 |
|
1118
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
306 |
if (!io->seek(io, entry->offset)) |
1016
957c97389257
Cleaned up returns that look like function calls for my updated coding style.
Ryan C. Gordon <icculus@icculus.org>
parents:
997
diff
changeset
|
307 |
return 0; |
345
cbcb27547864
Seeking backwards in ZIP_seek() works now.
Ryan C. Gordon <icculus@icculus.org>
parents:
342
diff
changeset
|
308 |
|
337 | 309 |
inflateEnd(&finfo->stream); |
310 |
memcpy(&finfo->stream, &str, sizeof (z_stream)); |
|
311 |
finfo->uncompressed_position = finfo->compressed_position = 0; |
|
312 |
} /* if */ |
|
50
989b413188e5
Added individual file i/o code. Untested.
Ryan C. Gordon <icculus@icculus.org>
parents:
46
diff
changeset
|
313 |
|
337 | 314 |
while (finfo->uncompressed_position != offset) |
315 |
{ |
|
316 |
PHYSFS_uint8 buf[512]; |
|
540
a6b6f0a54cd2
Attempt at type correctness.
Ryan C. Gordon <icculus@icculus.org>
parents:
538
diff
changeset
|
317 |
PHYSFS_uint32 maxread; |
a6b6f0a54cd2
Attempt at type correctness.
Ryan C. Gordon <icculus@icculus.org>
parents:
538
diff
changeset
|
318 |
|
a6b6f0a54cd2
Attempt at type correctness.
Ryan C. Gordon <icculus@icculus.org>
parents:
538
diff
changeset
|
319 |
maxread = (PHYSFS_uint32) (offset - finfo->uncompressed_position); |
337 | 320 |
if (maxread > sizeof (buf)) |
321 |
maxread = sizeof (buf); |
|
322 |
||
1118
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
323 |
if (ZIP_read(_io, buf, maxread) != maxread) |
1016
957c97389257
Cleaned up returns that look like function calls for my updated coding style.
Ryan C. Gordon <icculus@icculus.org>
parents:
997
diff
changeset
|
324 |
return 0; |
337 | 325 |
} /* while */ |
326 |
} /* else */ |
|
327 |
||
1016
957c97389257
Cleaned up returns that look like function calls for my updated coding style.
Ryan C. Gordon <icculus@icculus.org>
parents:
997
diff
changeset
|
328 |
return 1; |
20
efdde0d21521
Implementation compiles and links with no actual archive support. No test
Ryan C. Gordon <icculus@icculus.org>
parents:
17
diff
changeset
|
329 |
} /* ZIP_seek */ |
efdde0d21521
Implementation compiles and links with no actual archive support. No test
Ryan C. Gordon <icculus@icculus.org>
parents:
17
diff
changeset
|
330 |
|
efdde0d21521
Implementation compiles and links with no actual archive support. No test
Ryan C. Gordon <icculus@icculus.org>
parents:
17
diff
changeset
|
331 |
|
1118
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
332 |
static PHYSFS_sint64 ZIP_length(PHYSFS_Io *io) |
28
529214f57d1b
Added PHYSFS_fileLength(). Bleh.
Ryan C. Gordon <icculus@icculus.org>
parents:
22
diff
changeset
|
333 |
{ |
1118
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
334 |
const ZIPfileinfo *finfo = (ZIPfileinfo *) io->opaque; |
1283
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
335 |
return (PHYSFS_sint64) finfo->entry->uncompressed_size; |
1118
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
336 |
} /* ZIP_length */ |
28
529214f57d1b
Added PHYSFS_fileLength(). Bleh.
Ryan C. Gordon <icculus@icculus.org>
parents:
22
diff
changeset
|
337 |
|
529214f57d1b
Added PHYSFS_fileLength(). Bleh.
Ryan C. Gordon <icculus@icculus.org>
parents:
22
diff
changeset
|
338 |
|
1118
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
339 |
static PHYSFS_Io *zip_get_io(PHYSFS_Io *io, ZIPinfo *inf, ZIPentry *entry); |
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
340 |
|
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
341 |
static PHYSFS_Io *ZIP_duplicate(PHYSFS_Io *io) |
20
efdde0d21521
Implementation compiles and links with no actual archive support. No test
Ryan C. Gordon <icculus@icculus.org>
parents:
17
diff
changeset
|
342 |
{ |
1118
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
343 |
ZIPfileinfo *origfinfo = (ZIPfileinfo *) io->opaque; |
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
344 |
PHYSFS_Io *retval = (PHYSFS_Io *) allocator.Malloc(sizeof (PHYSFS_Io)); |
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
345 |
ZIPfileinfo *finfo = (ZIPfileinfo *) allocator.Malloc(sizeof (ZIPfileinfo)); |
1269 | 346 |
GOTO_IF_MACRO(!retval, PHYSFS_ERR_OUT_OF_MEMORY, failed); |
347 |
GOTO_IF_MACRO(!finfo, PHYSFS_ERR_OUT_OF_MEMORY, failed); |
|
1118
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
348 |
memset(finfo, '\0', sizeof (*finfo)); |
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
349 |
|
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
350 |
finfo->entry = origfinfo->entry; |
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
351 |
finfo->io = zip_get_io(origfinfo->io, NULL, finfo->entry); |
1269 | 352 |
GOTO_IF_MACRO(!finfo->io, ERRPASS, failed); |
1118
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
353 |
|
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
354 |
if (finfo->entry->compression_method != COMPMETH_NONE) |
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
355 |
{ |
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
356 |
finfo->buffer = (PHYSFS_uint8 *) allocator.Malloc(ZIP_READBUFSIZE); |
1269 | 357 |
GOTO_IF_MACRO(!finfo->buffer, PHYSFS_ERR_OUT_OF_MEMORY, failed); |
358 |
if (zlib_err(inflateInit2(&finfo->stream, -MAX_WBITS)) != Z_OK) |
|
359 |
goto failed; |
|
1118
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
360 |
} /* if */ |
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
361 |
|
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
362 |
memcpy(retval, io, sizeof (PHYSFS_Io)); |
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
363 |
retval->opaque = finfo; |
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
364 |
return retval; |
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
365 |
|
1269 | 366 |
failed: |
1118
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
367 |
if (finfo != NULL) |
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
368 |
{ |
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
369 |
if (finfo->io != NULL) |
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
370 |
finfo->io->destroy(finfo->io); |
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
371 |
|
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
372 |
if (finfo->buffer != NULL) |
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
373 |
{ |
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
374 |
allocator.Free(finfo->buffer); |
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
375 |
inflateEnd(&finfo->stream); |
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
376 |
} /* if */ |
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
377 |
|
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
378 |
allocator.Free(finfo); |
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
379 |
} /* if */ |
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
380 |
|
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
381 |
if (retval != NULL) |
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
382 |
allocator.Free(retval); |
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
383 |
|
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
384 |
return NULL; |
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
385 |
} /* ZIP_duplicate */ |
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
386 |
|
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
387 |
static int ZIP_flush(PHYSFS_Io *io) { return 1; /* no write support. */ } |
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
388 |
|
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
389 |
static void ZIP_destroy(PHYSFS_Io *io) |
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
390 |
{ |
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
391 |
ZIPfileinfo *finfo = (ZIPfileinfo *) io->opaque; |
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
392 |
finfo->io->destroy(finfo->io); |
337 | 393 |
|
394 |
if (finfo->entry->compression_method != COMPMETH_NONE) |
|
395 |
inflateEnd(&finfo->stream); |
|
396 |
||
397 |
if (finfo->buffer != NULL) |
|
691
71d9affe0d8a
All memory management now goes through allocation hooks instead of directly to
Ryan C. Gordon <icculus@icculus.org>
parents:
658
diff
changeset
|
398 |
allocator.Free(finfo->buffer); |
337 | 399 |
|
691
71d9affe0d8a
All memory management now goes through allocation hooks instead of directly to
Ryan C. Gordon <icculus@icculus.org>
parents:
658
diff
changeset
|
400 |
allocator.Free(finfo); |
1118
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
401 |
allocator.Free(io); |
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
402 |
} /* ZIP_destroy */ |
20
efdde0d21521
Implementation compiles and links with no actual archive support. No test
Ryan C. Gordon <icculus@icculus.org>
parents:
17
diff
changeset
|
403 |
|
efdde0d21521
Implementation compiles and links with no actual archive support. No test
Ryan C. Gordon <icculus@icculus.org>
parents:
17
diff
changeset
|
404 |
|
1118
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
405 |
static const PHYSFS_Io ZIP_Io = |
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
406 |
{ |
1280
bd174b99fa5b
Add binary compatibility to PHYSFS_Io.
Ryan C. Gordon <icculus@icculus.org>
parents:
1276
diff
changeset
|
407 |
CURRENT_PHYSFS_IO_API_VERSION, NULL, |
1118
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
408 |
ZIP_read, |
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
409 |
ZIP_write, |
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
410 |
ZIP_seek, |
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
411 |
ZIP_tell, |
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
412 |
ZIP_length, |
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
413 |
ZIP_duplicate, |
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
414 |
ZIP_flush, |
1280
bd174b99fa5b
Add binary compatibility to PHYSFS_Io.
Ryan C. Gordon <icculus@icculus.org>
parents:
1276
diff
changeset
|
415 |
ZIP_destroy |
1118
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
416 |
}; |
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
417 |
|
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
418 |
|
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
419 |
|
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
420 |
static PHYSFS_sint64 zip_find_end_of_central_dir(PHYSFS_Io *io, PHYSFS_sint64 *len) |
337 | 421 |
{ |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
422 |
PHYSFS_uint8 buf[256]; |
1085
1ad575ce53c8
Merged changeset 1084:ee3d2e6e1161 from stable-2.0: unitialized array fix.
Ryan C. Gordon <icculus@icculus.org>
parents:
1054
diff
changeset
|
423 |
PHYSFS_uint8 extra[4] = { 0, 0, 0, 0 }; |
413
d669d303317d
Initialized some variables to stop compiler whining.
Ryan C. Gordon <icculus@icculus.org>
parents:
402
diff
changeset
|
424 |
PHYSFS_sint32 i = 0; |
337 | 425 |
PHYSFS_sint64 filelen; |
426 |
PHYSFS_sint64 filepos; |
|
427 |
PHYSFS_sint32 maxread; |
|
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
428 |
PHYSFS_sint32 totalread = 0; |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
429 |
int found = 0; |
337 | 430 |
|
1118
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
431 |
filelen = io->length(io); |
1345
29ab417d9453
This returns -1 on error, not zero. :/
Ryan C. Gordon <icculus@icculus.org>
parents:
1343
diff
changeset
|
432 |
BAIL_IF_MACRO(filelen == -1, ERRPASS, -1); |
337 | 433 |
|
434 |
/* |
|
435 |
* Jump to the end of the file and start reading backwards. |
|
436 |
* The last thing in the file is the zipfile comment, which is variable |
|
437 |
* length, and the field that specifies its size is before it in the |
|
438 |
* file (argh!)...this means that we need to scan backwards until we |
|
439 |
* hit the end-of-central-dir signature. We can then sanity check that |
|
440 |
* the comment was as big as it should be to make sure we're in the |
|
441 |
* right place. The comment length field is 16 bits, so we can stop |
|
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
442 |
* searching for that signature after a little more than 64k at most, |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
443 |
* and call it a corrupted zipfile. |
337 | 444 |
*/ |
445 |
||
446 |
if (sizeof (buf) < filelen) |
|
447 |
{ |
|
448 |
filepos = filelen - sizeof (buf); |
|
449 |
maxread = sizeof (buf); |
|
450 |
} /* if */ |
|
451 |
else |
|
452 |
{ |
|
453 |
filepos = 0; |
|
541
2be2fff14b7a
Another attempt at type size correctness.
Ryan C. Gordon <icculus@icculus.org>
parents:
540
diff
changeset
|
454 |
maxread = (PHYSFS_uint32) filelen; |
337 | 455 |
} /* else */ |
456 |
||
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
457 |
while ((totalread < filelen) && (totalread < 65557)) |
337 | 458 |
{ |
1240
22d4d1bd4e21
Reworked the error reporting API. Now we use error codes instead of strings.
Ryan C. Gordon <icculus@icculus.org>
parents:
1220
diff
changeset
|
459 |
BAIL_IF_MACRO(!io->seek(io, filepos), ERRPASS, -1); |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
460 |
|
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
461 |
/* make sure we catch a signature between buffers. */ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
462 |
if (totalread != 0) |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
463 |
{ |
1203
55f147714ce2
Cleaned up all the readAll() cut and paste.
Ryan C. Gordon <icculus@icculus.org>
parents:
1162
diff
changeset
|
464 |
if (!__PHYSFS_readAll(io, buf, maxread - 4)) |
1016
957c97389257
Cleaned up returns that look like function calls for my updated coding style.
Ryan C. Gordon <icculus@icculus.org>
parents:
997
diff
changeset
|
465 |
return -1; |
996
0410dc655d45
Fixed strict-aliasing issue that gcc 4.4 complains about.
Ryan C. Gordon <icculus@icculus.org>
parents:
928
diff
changeset
|
466 |
memcpy(&buf[maxread - 4], &extra, sizeof (extra)); |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
467 |
totalread += maxread - 4; |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
468 |
} /* if */ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
469 |
else |
337 | 470 |
{ |
1203
55f147714ce2
Cleaned up all the readAll() cut and paste.
Ryan C. Gordon <icculus@icculus.org>
parents:
1162
diff
changeset
|
471 |
if (!__PHYSFS_readAll(io, buf, maxread)) |
1016
957c97389257
Cleaned up returns that look like function calls for my updated coding style.
Ryan C. Gordon <icculus@icculus.org>
parents:
997
diff
changeset
|
472 |
return -1; |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
473 |
totalread += maxread; |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
474 |
} /* else */ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
475 |
|
996
0410dc655d45
Fixed strict-aliasing issue that gcc 4.4 complains about.
Ryan C. Gordon <icculus@icculus.org>
parents:
928
diff
changeset
|
476 |
memcpy(&extra, buf, sizeof (extra)); |
337 | 477 |
|
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
478 |
for (i = maxread - 4; i > 0; i--) |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
479 |
{ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
480 |
if ((buf[i + 0] == 0x50) && |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
481 |
(buf[i + 1] == 0x4B) && |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
482 |
(buf[i + 2] == 0x05) && |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
483 |
(buf[i + 3] == 0x06) ) |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
484 |
{ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
485 |
found = 1; /* that's the signature! */ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
486 |
break; |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
487 |
} /* if */ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
488 |
} /* for */ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
489 |
|
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
490 |
if (found) |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
491 |
break; |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
492 |
|
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
493 |
filepos -= (maxread - 4); |
895
8bf07c014a43
Fixed zip archiver: could do bogus seek if a small, non-zip file got put
Ryan C. Gordon <icculus@icculus.org>
parents:
894
diff
changeset
|
494 |
if (filepos < 0) |
8bf07c014a43
Fixed zip archiver: could do bogus seek if a small, non-zip file got put
Ryan C. Gordon <icculus@icculus.org>
parents:
894
diff
changeset
|
495 |
filepos = 0; |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
496 |
} /* while */ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
497 |
|
1240
22d4d1bd4e21
Reworked the error reporting API. Now we use error codes instead of strings.
Ryan C. Gordon <icculus@icculus.org>
parents:
1220
diff
changeset
|
498 |
BAIL_IF_MACRO(!found, PHYSFS_ERR_UNSUPPORTED, -1); |
337 | 499 |
|
500 |
if (len != NULL) |
|
501 |
*len = filelen; |
|
502 |
||
1016
957c97389257
Cleaned up returns that look like function calls for my updated coding style.
Ryan C. Gordon <icculus@icculus.org>
parents:
997
diff
changeset
|
503 |
return (filepos + i); |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
504 |
} /* zip_find_end_of_central_dir */ |
337 | 505 |
|
506 |
||
1118
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
507 |
static int isZip(PHYSFS_Io *io) |
20
efdde0d21521
Implementation compiles and links with no actual archive support. No test
Ryan C. Gordon <icculus@icculus.org>
parents:
17
diff
changeset
|
508 |
{ |
1118
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
509 |
PHYSFS_uint32 sig = 0; |
446
e1f7fe003b70
Fix for correct cleanup on read error.
Ryan C. Gordon <icculus@icculus.org>
parents:
429
diff
changeset
|
510 |
int retval = 0; |
32
09a8197fad3b
Initial work on ZIPfile support. Not complete. Not very pleased with this
Ryan C. Gordon <icculus@icculus.org>
parents:
29
diff
changeset
|
511 |
|
337 | 512 |
/* |
513 |
* The first thing in a zip file might be the signature of the |
|
514 |
* first local file record, so it makes for a quick determination. |
|
515 |
*/ |
|
1118
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
516 |
if (readui32(io, &sig)) |
32
09a8197fad3b
Initial work on ZIPfile support. Not complete. Not very pleased with this
Ryan C. Gordon <icculus@icculus.org>
parents:
29
diff
changeset
|
517 |
{ |
446
e1f7fe003b70
Fix for correct cleanup on read error.
Ryan C. Gordon <icculus@icculus.org>
parents:
429
diff
changeset
|
518 |
retval = (sig == ZIP_LOCAL_FILE_SIG); |
e1f7fe003b70
Fix for correct cleanup on read error.
Ryan C. Gordon <icculus@icculus.org>
parents:
429
diff
changeset
|
519 |
if (!retval) |
e1f7fe003b70
Fix for correct cleanup on read error.
Ryan C. Gordon <icculus@icculus.org>
parents:
429
diff
changeset
|
520 |
{ |
e1f7fe003b70
Fix for correct cleanup on read error.
Ryan C. Gordon <icculus@icculus.org>
parents:
429
diff
changeset
|
521 |
/* |
e1f7fe003b70
Fix for correct cleanup on read error.
Ryan C. Gordon <icculus@icculus.org>
parents:
429
diff
changeset
|
522 |
* No sig...might be a ZIP with data at the start |
e1f7fe003b70
Fix for correct cleanup on read error.
Ryan C. Gordon <icculus@icculus.org>
parents:
429
diff
changeset
|
523 |
* (a self-extracting executable, etc), so we'll have to do |
e1f7fe003b70
Fix for correct cleanup on read error.
Ryan C. Gordon <icculus@icculus.org>
parents:
429
diff
changeset
|
524 |
* it the hard way... |
e1f7fe003b70
Fix for correct cleanup on read error.
Ryan C. Gordon <icculus@icculus.org>
parents:
429
diff
changeset
|
525 |
*/ |
1118
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
526 |
retval = (zip_find_end_of_central_dir(io, NULL) != -1); |
446
e1f7fe003b70
Fix for correct cleanup on read error.
Ryan C. Gordon <icculus@icculus.org>
parents:
429
diff
changeset
|
527 |
} /* if */ |
32
09a8197fad3b
Initial work on ZIPfile support. Not complete. Not very pleased with this
Ryan C. Gordon <icculus@icculus.org>
parents:
29
diff
changeset
|
528 |
} /* if */ |
09a8197fad3b
Initial work on ZIPfile support. Not complete. Not very pleased with this
Ryan C. Gordon <icculus@icculus.org>
parents:
29
diff
changeset
|
529 |
|
1016
957c97389257
Cleaned up returns that look like function calls for my updated coding style.
Ryan C. Gordon <icculus@icculus.org>
parents:
997
diff
changeset
|
530 |
return retval; |
1113
2136d64bd1ad
Removed PHYSFS_Archiver's isArchive() method.
Ryan C. Gordon <icculus@icculus.org>
parents:
1111
diff
changeset
|
531 |
} /* isZip */ |
20
efdde0d21521
Implementation compiles and links with no actual archive support. No test
Ryan C. Gordon <icculus@icculus.org>
parents:
17
diff
changeset
|
532 |
|
efdde0d21521
Implementation compiles and links with no actual archive support. No test
Ryan C. Gordon <icculus@icculus.org>
parents:
17
diff
changeset
|
533 |
|
1283
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
534 |
static void zip_free_entries(ZIPentry *entries, PHYSFS_uint64 max) |
337 | 535 |
{ |
1283
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
536 |
PHYSFS_uint64 i; |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
537 |
for (i = 0; i < max; i++) |
337 | 538 |
{ |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
539 |
ZIPentry *entry = &entries[i]; |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
540 |
if (entry->name != NULL) |
691
71d9affe0d8a
All memory management now goes through allocation hooks instead of directly to
Ryan C. Gordon <icculus@icculus.org>
parents:
658
diff
changeset
|
541 |
allocator.Free(entry->name); |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
542 |
} /* for */ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
543 |
|
691
71d9affe0d8a
All memory management now goes through allocation hooks instead of directly to
Ryan C. Gordon <icculus@icculus.org>
parents:
658
diff
changeset
|
544 |
allocator.Free(entries); |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
545 |
} /* zip_free_entries */ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
546 |
|
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
547 |
|
483
d788c84d8694
Fixed bug that prevented use when symlinks were disallowed.
Ryan C. Gordon <icculus@icculus.org>
parents:
478
diff
changeset
|
548 |
/* |
d788c84d8694
Fixed bug that prevented use when symlinks were disallowed.
Ryan C. Gordon <icculus@icculus.org>
parents:
478
diff
changeset
|
549 |
* This will find the ZIPentry associated with a path in platform-independent |
d788c84d8694
Fixed bug that prevented use when symlinks were disallowed.
Ryan C. Gordon <icculus@icculus.org>
parents:
478
diff
changeset
|
550 |
* notation. Directories don't have ZIPentries associated with them, but |
d788c84d8694
Fixed bug that prevented use when symlinks were disallowed.
Ryan C. Gordon <icculus@icculus.org>
parents:
478
diff
changeset
|
551 |
* (*isDir) will be set to non-zero if a dir was hit. |
d788c84d8694
Fixed bug that prevented use when symlinks were disallowed.
Ryan C. Gordon <icculus@icculus.org>
parents:
478
diff
changeset
|
552 |
*/ |
1054
57f4af811ffb
THIS is Christoph's PHYSFS_stat() work.
Ryan C. Gordon <icculus@icculus.org>
parents:
1053
diff
changeset
|
553 |
static ZIPentry *zip_find_entry(const ZIPinfo *info, const char *path, |
57f4af811ffb
THIS is Christoph's PHYSFS_stat() work.
Ryan C. Gordon <icculus@icculus.org>
parents:
1053
diff
changeset
|
554 |
int *isDir) |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
555 |
{ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
556 |
ZIPentry *a = info->entries; |
1208
3edcb015089a
Fixed some compiler warnings.
Ryan C. Gordon <icculus@icculus.org>
parents:
1207
diff
changeset
|
557 |
PHYSFS_sint32 pathlen = (PHYSFS_sint32) strlen(path); |
1283
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
558 |
PHYSFS_sint64 lo = 0; |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
559 |
PHYSFS_sint64 hi = (PHYSFS_sint64) (info->entryCount - 1); |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
560 |
PHYSFS_sint64 middle; |
491
b8853d8a09cb
Fixed infinite loop bug, cleaned out tab chars.
Ryan C. Gordon <icculus@icculus.org>
parents:
483
diff
changeset
|
561 |
const char *thispath = NULL; |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
562 |
int rc; |
337 | 563 |
|
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
564 |
while (lo <= hi) |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
565 |
{ |
491
b8853d8a09cb
Fixed infinite loop bug, cleaned out tab chars.
Ryan C. Gordon <icculus@icculus.org>
parents:
483
diff
changeset
|
566 |
middle = lo + ((hi - lo) / 2); |
b8853d8a09cb
Fixed infinite loop bug, cleaned out tab chars.
Ryan C. Gordon <icculus@icculus.org>
parents:
483
diff
changeset
|
567 |
thispath = a[middle].name; |
b8853d8a09cb
Fixed infinite loop bug, cleaned out tab chars.
Ryan C. Gordon <icculus@icculus.org>
parents:
483
diff
changeset
|
568 |
rc = strncmp(path, thispath, pathlen); |
483
d788c84d8694
Fixed bug that prevented use when symlinks were disallowed.
Ryan C. Gordon <icculus@icculus.org>
parents:
478
diff
changeset
|
569 |
|
d788c84d8694
Fixed bug that prevented use when symlinks were disallowed.
Ryan C. Gordon <icculus@icculus.org>
parents:
478
diff
changeset
|
570 |
if (rc > 0) |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
571 |
lo = middle + 1; |
483
d788c84d8694
Fixed bug that prevented use when symlinks were disallowed.
Ryan C. Gordon <icculus@icculus.org>
parents:
478
diff
changeset
|
572 |
|
d788c84d8694
Fixed bug that prevented use when symlinks were disallowed.
Ryan C. Gordon <icculus@icculus.org>
parents:
478
diff
changeset
|
573 |
else if (rc < 0) |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
574 |
hi = middle - 1; |
483
d788c84d8694
Fixed bug that prevented use when symlinks were disallowed.
Ryan C. Gordon <icculus@icculus.org>
parents:
478
diff
changeset
|
575 |
|
491
b8853d8a09cb
Fixed infinite loop bug, cleaned out tab chars.
Ryan C. Gordon <icculus@icculus.org>
parents:
483
diff
changeset
|
576 |
else /* substring match...might be dir or entry or nothing. */ |
b8853d8a09cb
Fixed infinite loop bug, cleaned out tab chars.
Ryan C. Gordon <icculus@icculus.org>
parents:
483
diff
changeset
|
577 |
{ |
483
d788c84d8694
Fixed bug that prevented use when symlinks were disallowed.
Ryan C. Gordon <icculus@icculus.org>
parents:
478
diff
changeset
|
578 |
if (isDir != NULL) |
d788c84d8694
Fixed bug that prevented use when symlinks were disallowed.
Ryan C. Gordon <icculus@icculus.org>
parents:
478
diff
changeset
|
579 |
{ |
491
b8853d8a09cb
Fixed infinite loop bug, cleaned out tab chars.
Ryan C. Gordon <icculus@icculus.org>
parents:
483
diff
changeset
|
580 |
*isDir = (thispath[pathlen] == '/'); |
b8853d8a09cb
Fixed infinite loop bug, cleaned out tab chars.
Ryan C. Gordon <icculus@icculus.org>
parents:
483
diff
changeset
|
581 |
if (*isDir) |
1016
957c97389257
Cleaned up returns that look like function calls for my updated coding style.
Ryan C. Gordon <icculus@icculus.org>
parents:
997
diff
changeset
|
582 |
return NULL; |
483
d788c84d8694
Fixed bug that prevented use when symlinks were disallowed.
Ryan C. Gordon <icculus@icculus.org>
parents:
478
diff
changeset
|
583 |
} /* if */ |
d788c84d8694
Fixed bug that prevented use when symlinks were disallowed.
Ryan C. Gordon <icculus@icculus.org>
parents:
478
diff
changeset
|
584 |
|
d788c84d8694
Fixed bug that prevented use when symlinks were disallowed.
Ryan C. Gordon <icculus@icculus.org>
parents:
478
diff
changeset
|
585 |
if (thispath[pathlen] == '\0') /* found entry? */ |
1016
957c97389257
Cleaned up returns that look like function calls for my updated coding style.
Ryan C. Gordon <icculus@icculus.org>
parents:
997
diff
changeset
|
586 |
return &a[middle]; |
1142
25880a820248
Fixed bug in directory search for zip and qpak archivers (thanks, Michal!)
Ryan C. Gordon <icculus@icculus.org>
parents:
1129
diff
changeset
|
587 |
/* adjust search params, try again. */ |
25880a820248
Fixed bug in directory search for zip and qpak archivers (thanks, Michal!)
Ryan C. Gordon <icculus@icculus.org>
parents:
1129
diff
changeset
|
588 |
else if (thispath[pathlen] > '/') |
25880a820248
Fixed bug in directory search for zip and qpak archivers (thanks, Michal!)
Ryan C. Gordon <icculus@icculus.org>
parents:
1129
diff
changeset
|
589 |
hi = middle - 1; |
491
b8853d8a09cb
Fixed infinite loop bug, cleaned out tab chars.
Ryan C. Gordon <icculus@icculus.org>
parents:
483
diff
changeset
|
590 |
else |
1142
25880a820248
Fixed bug in directory search for zip and qpak archivers (thanks, Michal!)
Ryan C. Gordon <icculus@icculus.org>
parents:
1129
diff
changeset
|
591 |
lo = middle + 1; |
491
b8853d8a09cb
Fixed infinite loop bug, cleaned out tab chars.
Ryan C. Gordon <icculus@icculus.org>
parents:
483
diff
changeset
|
592 |
} /* if */ |
b8853d8a09cb
Fixed infinite loop bug, cleaned out tab chars.
Ryan C. Gordon <icculus@icculus.org>
parents:
483
diff
changeset
|
593 |
} /* while */ |
483
d788c84d8694
Fixed bug that prevented use when symlinks were disallowed.
Ryan C. Gordon <icculus@icculus.org>
parents:
478
diff
changeset
|
594 |
|
d788c84d8694
Fixed bug that prevented use when symlinks were disallowed.
Ryan C. Gordon <icculus@icculus.org>
parents:
478
diff
changeset
|
595 |
if (isDir != NULL) |
d788c84d8694
Fixed bug that prevented use when symlinks were disallowed.
Ryan C. Gordon <icculus@icculus.org>
parents:
478
diff
changeset
|
596 |
*isDir = 0; |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
597 |
|
1322
5476917b8ddf
Allow application-supplied archivers.
Ryan C. Gordon <icculus@icculus.org>
parents:
1320
diff
changeset
|
598 |
BAIL_MACRO(PHYSFS_ERR_NOT_FOUND, NULL); |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
599 |
} /* zip_find_entry */ |
337 | 600 |
|
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
601 |
|
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
602 |
/* Convert paths from old, buggy DOS zippers... */ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
603 |
static void zip_convert_dos_path(ZIPentry *entry, char *path) |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
604 |
{ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
605 |
PHYSFS_uint8 hosttype = (PHYSFS_uint8) ((entry->version >> 8) & 0xFF); |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
606 |
if (hosttype == 0) /* FS_FAT_ */ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
607 |
{ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
608 |
while (*path) |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
609 |
{ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
610 |
if (*path == '\\') |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
611 |
*path = '/'; |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
612 |
path++; |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
613 |
} /* while */ |
337 | 614 |
} /* if */ |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
615 |
} /* zip_convert_dos_path */ |
337 | 616 |
|
617 |
||
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
618 |
static void zip_expand_symlink_path(char *path) |
20
efdde0d21521
Implementation compiles and links with no actual archive support. No test
Ryan C. Gordon <icculus@icculus.org>
parents:
17
diff
changeset
|
619 |
{ |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
620 |
char *ptr = path; |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
621 |
char *prevptr = path; |
53
6c3c990f006e
ZIP entries are now cached at openArchive time, which cleans up the race
Ryan C. Gordon <icculus@icculus.org>
parents:
52
diff
changeset
|
622 |
|
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
623 |
while (1) |
53
6c3c990f006e
ZIP entries are now cached at openArchive time, which cleans up the race
Ryan C. Gordon <icculus@icculus.org>
parents:
52
diff
changeset
|
624 |
{ |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
625 |
ptr = strchr(ptr, '/'); |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
626 |
if (ptr == NULL) |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
627 |
break; |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
628 |
|
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
629 |
if (*(ptr + 1) == '.') |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
630 |
{ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
631 |
if (*(ptr + 2) == '/') |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
632 |
{ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
633 |
/* current dir in middle of string: ditch it. */ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
634 |
memmove(ptr, ptr + 2, strlen(ptr + 2) + 1); |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
635 |
} /* else if */ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
636 |
|
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
637 |
else if (*(ptr + 2) == '\0') |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
638 |
{ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
639 |
/* current dir at end of string: ditch it. */ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
640 |
*ptr = '\0'; |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
641 |
} /* else if */ |
53
6c3c990f006e
ZIP entries are now cached at openArchive time, which cleans up the race
Ryan C. Gordon <icculus@icculus.org>
parents:
52
diff
changeset
|
642 |
|
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
643 |
else if (*(ptr + 2) == '.') |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
644 |
{ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
645 |
if (*(ptr + 3) == '/') |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
646 |
{ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
647 |
/* parent dir in middle: move back one, if possible. */ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
648 |
memmove(prevptr, ptr + 4, strlen(ptr + 4) + 1); |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
649 |
ptr = prevptr; |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
650 |
while (prevptr != path) |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
651 |
{ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
652 |
prevptr--; |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
653 |
if (*prevptr == '/') |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
654 |
{ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
655 |
prevptr++; |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
656 |
break; |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
657 |
} /* if */ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
658 |
} /* while */ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
659 |
} /* if */ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
660 |
|
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
661 |
if (*(ptr + 3) == '\0') |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
662 |
{ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
663 |
/* parent dir at end: move back one, if possible. */ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
664 |
*prevptr = '\0'; |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
665 |
} /* if */ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
666 |
} /* if */ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
667 |
} /* if */ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
668 |
else |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
669 |
{ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
670 |
prevptr = ptr; |
1162
49950eab0ef8
Fixed infinite loop in zip_expand_symlink_path().
Ryan C. Gordon <icculus@icculus.org>
parents:
1142
diff
changeset
|
671 |
ptr++; |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
672 |
} /* else */ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
673 |
} /* while */ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
674 |
} /* zip_expand_symlink_path */ |
53
6c3c990f006e
ZIP entries are now cached at openArchive time, which cleans up the race
Ryan C. Gordon <icculus@icculus.org>
parents:
52
diff
changeset
|
675 |
|
658
1981818c6170
Removed all the forward declaration cruft from the archivers.
Ryan C. Gordon <icculus@icculus.org>
parents:
657
diff
changeset
|
676 |
/* (forward reference: zip_follow_symlink and zip_resolve call each other.) */ |
1118
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
677 |
static int zip_resolve(PHYSFS_Io *io, ZIPinfo *info, ZIPentry *entry); |
32
09a8197fad3b
Initial work on ZIPfile support. Not complete. Not very pleased with this
Ryan C. Gordon <icculus@icculus.org>
parents:
29
diff
changeset
|
678 |
|
143
337505f94c10
Platform abstracted i/o, other bugfixes.
Ryan C. Gordon <icculus@icculus.org>
parents:
132
diff
changeset
|
679 |
/* |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
680 |
* Look for the entry named by (path). If it exists, resolve it, and return |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
681 |
* a pointer to that entry. If it's another symlink, keep resolving until you |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
682 |
* hit a real file and then return a pointer to the final non-symlink entry. |
1269 | 683 |
* If there's a problem, return NULL. |
143
337505f94c10
Platform abstracted i/o, other bugfixes.
Ryan C. Gordon <icculus@icculus.org>
parents:
132
diff
changeset
|
684 |
*/ |
1118
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
685 |
static ZIPentry *zip_follow_symlink(PHYSFS_Io *io, ZIPinfo *info, char *path) |
53
6c3c990f006e
ZIP entries are now cached at openArchive time, which cleans up the race
Ryan C. Gordon <icculus@icculus.org>
parents:
52
diff
changeset
|
686 |
{ |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
687 |
ZIPentry *entry; |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
688 |
|
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
689 |
zip_expand_symlink_path(path); |
483
d788c84d8694
Fixed bug that prevented use when symlinks were disallowed.
Ryan C. Gordon <icculus@icculus.org>
parents:
478
diff
changeset
|
690 |
entry = zip_find_entry(info, path, NULL); |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
691 |
if (entry != NULL) |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
692 |
{ |
1118
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
693 |
if (!zip_resolve(io, info, entry)) /* recursive! */ |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
694 |
entry = NULL; |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
695 |
else |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
696 |
{ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
697 |
if (entry->symlink != NULL) |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
698 |
entry = entry->symlink; |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
699 |
} /* else */ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
700 |
} /* if */ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
701 |
|
1016
957c97389257
Cleaned up returns that look like function calls for my updated coding style.
Ryan C. Gordon <icculus@icculus.org>
parents:
997
diff
changeset
|
702 |
return entry; |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
703 |
} /* zip_follow_symlink */ |
20
efdde0d21521
Implementation compiles and links with no actual archive support. No test
Ryan C. Gordon <icculus@icculus.org>
parents:
17
diff
changeset
|
704 |
|
efdde0d21521
Implementation compiles and links with no actual archive support. No test
Ryan C. Gordon <icculus@icculus.org>
parents:
17
diff
changeset
|
705 |
|
1118
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
706 |
static int zip_resolve_symlink(PHYSFS_Io *io, ZIPinfo *info, ZIPentry *entry) |
46
66d9a112b0f7
Now with all directory functions implemented (and debugged?). No file
Ryan C. Gordon <icculus@icculus.org>
parents:
41
diff
changeset
|
707 |
{ |
1283
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
708 |
const PHYSFS_uint64 size = entry->uncompressed_size; |
1269 | 709 |
char *path = NULL; |
337 | 710 |
int rc = 0; |
711 |
||
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
712 |
/* |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
713 |
* We've already parsed the local file header of the symlink at this |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
714 |
* point. Now we need to read the actual link from the file data and |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
715 |
* follow it. |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
716 |
*/ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
717 |
|
1240
22d4d1bd4e21
Reworked the error reporting API. Now we use error codes instead of strings.
Ryan C. Gordon <icculus@icculus.org>
parents:
1220
diff
changeset
|
718 |
BAIL_IF_MACRO(!io->seek(io, entry->offset), ERRPASS, 0); |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
719 |
|
1269 | 720 |
path = (char *) __PHYSFS_smallAlloc(size + 1); |
721 |
BAIL_IF_MACRO(!path, PHYSFS_ERR_OUT_OF_MEMORY, 0); |
|
337 | 722 |
|
723 |
if (entry->compression_method == COMPMETH_NONE) |
|
1203
55f147714ce2
Cleaned up all the readAll() cut and paste.
Ryan C. Gordon <icculus@icculus.org>
parents:
1162
diff
changeset
|
724 |
rc = __PHYSFS_readAll(io, path, size); |
143
337505f94c10
Platform abstracted i/o, other bugfixes.
Ryan C. Gordon <icculus@icculus.org>
parents:
132
diff
changeset
|
725 |
|
337 | 726 |
else /* symlink target path is compressed... */ |
727 |
{ |
|
728 |
z_stream stream; |
|
1283
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
729 |
const PHYSFS_uint64 complen = entry->compressed_size; |
852
9467e96abdf1
Replaced some Malloc and all the alloca() calls with __PHYSFS_smallAlloc(),
Ryan C. Gordon <icculus@icculus.org>
parents:
809
diff
changeset
|
730 |
PHYSFS_uint8 *compressed = (PHYSFS_uint8*) __PHYSFS_smallAlloc(complen); |
337 | 731 |
if (compressed != NULL) |
732 |
{ |
|
1203
55f147714ce2
Cleaned up all the readAll() cut and paste.
Ryan C. Gordon <icculus@icculus.org>
parents:
1162
diff
changeset
|
733 |
if (__PHYSFS_readAll(io, compressed, complen)) |
337 | 734 |
{ |
644
1cb5533d369c
Initial structure for replacable allocator work.
Ryan C. Gordon <icculus@icculus.org>
parents:
579
diff
changeset
|
735 |
initializeZStream(&stream); |
337 | 736 |
stream.next_in = compressed; |
852
9467e96abdf1
Replaced some Malloc and all the alloca() calls with __PHYSFS_smallAlloc(),
Ryan C. Gordon <icculus@icculus.org>
parents:
809
diff
changeset
|
737 |
stream.avail_in = complen; |
538
8752e3c0dbf9
Now compiles on CodeWarrior 6 for MacOS Classic again.
Ryan C. Gordon <icculus@icculus.org>
parents:
504
diff
changeset
|
738 |
stream.next_out = (unsigned char *) path; |
337 | 739 |
stream.avail_out = size; |
740 |
if (zlib_err(inflateInit2(&stream, -MAX_WBITS)) == Z_OK) |
|
741 |
{ |
|
340
24a11f8566f8
Symlink fixes. Still broken, though.
Ryan C. Gordon <icculus@icculus.org>
parents:
337
diff
changeset
|
742 |
rc = zlib_err(inflate(&stream, Z_FINISH)); |
337 | 743 |
inflateEnd(&stream); |
340
24a11f8566f8
Symlink fixes. Still broken, though.
Ryan C. Gordon <icculus@icculus.org>
parents:
337
diff
changeset
|
744 |
|
24a11f8566f8
Symlink fixes. Still broken, though.
Ryan C. Gordon <icculus@icculus.org>
parents:
337
diff
changeset
|
745 |
/* both are acceptable outcomes... */ |
24a11f8566f8
Symlink fixes. Still broken, though.
Ryan C. Gordon <icculus@icculus.org>
parents:
337
diff
changeset
|
746 |
rc = ((rc == Z_OK) || (rc == Z_STREAM_END)); |
337 | 747 |
} /* if */ |
748 |
} /* if */ |
|
852
9467e96abdf1
Replaced some Malloc and all the alloca() calls with __PHYSFS_smallAlloc(),
Ryan C. Gordon <icculus@icculus.org>
parents:
809
diff
changeset
|
749 |
__PHYSFS_smallFree(compressed); |
337 | 750 |
} /* if */ |
751 |
} /* else */ |
|
143
337505f94c10
Platform abstracted i/o, other bugfixes.
Ryan C. Gordon <icculus@icculus.org>
parents:
132
diff
changeset
|
752 |
|
1269 | 753 |
if (rc) |
337 | 754 |
{ |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
755 |
path[entry->uncompressed_size] = '\0'; /* null-terminate it. */ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
756 |
zip_convert_dos_path(entry, path); |
1118
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
757 |
entry->symlink = zip_follow_symlink(io, info, path); |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
758 |
} /* else */ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
759 |
|
1269 | 760 |
__PHYSFS_smallFree(path); |
761 |
||
1016
957c97389257
Cleaned up returns that look like function calls for my updated coding style.
Ryan C. Gordon <icculus@icculus.org>
parents:
997
diff
changeset
|
762 |
return (entry->symlink != NULL); |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
763 |
} /* zip_resolve_symlink */ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
764 |
|
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
765 |
|
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
766 |
/* |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
767 |
* Parse the local file header of an entry, and update entry->offset. |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
768 |
*/ |
1118
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
769 |
static int zip_parse_local(PHYSFS_Io *io, ZIPentry *entry) |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
770 |
{ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
771 |
PHYSFS_uint32 ui32; |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
772 |
PHYSFS_uint16 ui16; |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
773 |
PHYSFS_uint16 fnamelen; |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
774 |
PHYSFS_uint16 extralen; |
337 | 775 |
|
551
f0fc464fd51b
Fixed seeking in uncompressed zip entries and handle Java-created JAR files.
Ryan C. Gordon <icculus@icculus.org>
parents:
541
diff
changeset
|
776 |
/* |
f0fc464fd51b
Fixed seeking in uncompressed zip entries and handle Java-created JAR files.
Ryan C. Gordon <icculus@icculus.org>
parents:
541
diff
changeset
|
777 |
* crc and (un)compressed_size are always zero if this is a "JAR" |
f0fc464fd51b
Fixed seeking in uncompressed zip entries and handle Java-created JAR files.
Ryan C. Gordon <icculus@icculus.org>
parents:
541
diff
changeset
|
778 |
* archive created with Sun's Java tools, apparently. We only |
f0fc464fd51b
Fixed seeking in uncompressed zip entries and handle Java-created JAR files.
Ryan C. Gordon <icculus@icculus.org>
parents:
541
diff
changeset
|
779 |
* consider this archive corrupted if those entries don't match and |
f0fc464fd51b
Fixed seeking in uncompressed zip entries and handle Java-created JAR files.
Ryan C. Gordon <icculus@icculus.org>
parents:
541
diff
changeset
|
780 |
* aren't zero. That seems to work well. |
1283
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
781 |
* We also ignore a mismatch if the value is 0xFFFFFFFF here, since it's |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
782 |
* possible that's a Zip64 thing. |
551
f0fc464fd51b
Fixed seeking in uncompressed zip entries and handle Java-created JAR files.
Ryan C. Gordon <icculus@icculus.org>
parents:
541
diff
changeset
|
783 |
*/ |
f0fc464fd51b
Fixed seeking in uncompressed zip entries and handle Java-created JAR files.
Ryan C. Gordon <icculus@icculus.org>
parents:
541
diff
changeset
|
784 |
|
1240
22d4d1bd4e21
Reworked the error reporting API. Now we use error codes instead of strings.
Ryan C. Gordon <icculus@icculus.org>
parents:
1220
diff
changeset
|
785 |
BAIL_IF_MACRO(!io->seek(io, entry->offset), ERRPASS, 0); |
22d4d1bd4e21
Reworked the error reporting API. Now we use error codes instead of strings.
Ryan C. Gordon <icculus@icculus.org>
parents:
1220
diff
changeset
|
786 |
BAIL_IF_MACRO(!readui32(io, &ui32), ERRPASS, 0); |
22d4d1bd4e21
Reworked the error reporting API. Now we use error codes instead of strings.
Ryan C. Gordon <icculus@icculus.org>
parents:
1220
diff
changeset
|
787 |
BAIL_IF_MACRO(ui32 != ZIP_LOCAL_FILE_SIG, PHYSFS_ERR_CORRUPT, 0); |
22d4d1bd4e21
Reworked the error reporting API. Now we use error codes instead of strings.
Ryan C. Gordon <icculus@icculus.org>
parents:
1220
diff
changeset
|
788 |
BAIL_IF_MACRO(!readui16(io, &ui16), ERRPASS, 0); |
22d4d1bd4e21
Reworked the error reporting API. Now we use error codes instead of strings.
Ryan C. Gordon <icculus@icculus.org>
parents:
1220
diff
changeset
|
789 |
BAIL_IF_MACRO(ui16 != entry->version_needed, PHYSFS_ERR_CORRUPT, 0); |
22d4d1bd4e21
Reworked the error reporting API. Now we use error codes instead of strings.
Ryan C. Gordon <icculus@icculus.org>
parents:
1220
diff
changeset
|
790 |
BAIL_IF_MACRO(!readui16(io, &ui16), ERRPASS, 0); /* general bits. */ |
22d4d1bd4e21
Reworked the error reporting API. Now we use error codes instead of strings.
Ryan C. Gordon <icculus@icculus.org>
parents:
1220
diff
changeset
|
791 |
BAIL_IF_MACRO(!readui16(io, &ui16), ERRPASS, 0); |
22d4d1bd4e21
Reworked the error reporting API. Now we use error codes instead of strings.
Ryan C. Gordon <icculus@icculus.org>
parents:
1220
diff
changeset
|
792 |
BAIL_IF_MACRO(ui16 != entry->compression_method, PHYSFS_ERR_CORRUPT, 0); |
22d4d1bd4e21
Reworked the error reporting API. Now we use error codes instead of strings.
Ryan C. Gordon <icculus@icculus.org>
parents:
1220
diff
changeset
|
793 |
BAIL_IF_MACRO(!readui32(io, &ui32), ERRPASS, 0); /* date/time */ |
22d4d1bd4e21
Reworked the error reporting API. Now we use error codes instead of strings.
Ryan C. Gordon <icculus@icculus.org>
parents:
1220
diff
changeset
|
794 |
BAIL_IF_MACRO(!readui32(io, &ui32), ERRPASS, 0); |
22d4d1bd4e21
Reworked the error reporting API. Now we use error codes instead of strings.
Ryan C. Gordon <icculus@icculus.org>
parents:
1220
diff
changeset
|
795 |
BAIL_IF_MACRO(ui32 && (ui32 != entry->crc), PHYSFS_ERR_CORRUPT, 0); |
1283
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
796 |
|
1240
22d4d1bd4e21
Reworked the error reporting API. Now we use error codes instead of strings.
Ryan C. Gordon <icculus@icculus.org>
parents:
1220
diff
changeset
|
797 |
BAIL_IF_MACRO(!readui32(io, &ui32), ERRPASS, 0); |
1283
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
798 |
BAIL_IF_MACRO(ui32 && (ui32 != 0xFFFFFFFF) && |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
799 |
(ui32 != entry->compressed_size), PHYSFS_ERR_CORRUPT, 0); |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
800 |
|
1240
22d4d1bd4e21
Reworked the error reporting API. Now we use error codes instead of strings.
Ryan C. Gordon <icculus@icculus.org>
parents:
1220
diff
changeset
|
801 |
BAIL_IF_MACRO(!readui32(io, &ui32), ERRPASS, 0); |
1283
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
802 |
BAIL_IF_MACRO(ui32 && (ui32 != 0xFFFFFFFF) && |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
803 |
(ui32 != entry->uncompressed_size), PHYSFS_ERR_CORRUPT, 0); |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
804 |
|
1240
22d4d1bd4e21
Reworked the error reporting API. Now we use error codes instead of strings.
Ryan C. Gordon <icculus@icculus.org>
parents:
1220
diff
changeset
|
805 |
BAIL_IF_MACRO(!readui16(io, &fnamelen), ERRPASS, 0); |
22d4d1bd4e21
Reworked the error reporting API. Now we use error codes instead of strings.
Ryan C. Gordon <icculus@icculus.org>
parents:
1220
diff
changeset
|
806 |
BAIL_IF_MACRO(!readui16(io, &extralen), ERRPASS, 0); |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
807 |
|
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
808 |
entry->offset += fnamelen + extralen + 30; |
1016
957c97389257
Cleaned up returns that look like function calls for my updated coding style.
Ryan C. Gordon <icculus@icculus.org>
parents:
997
diff
changeset
|
809 |
return 1; |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
810 |
} /* zip_parse_local */ |
46
66d9a112b0f7
Now with all directory functions implemented (and debugged?). No file
Ryan C. Gordon <icculus@icculus.org>
parents:
41
diff
changeset
|
811 |
|
66d9a112b0f7
Now with all directory functions implemented (and debugged?). No file
Ryan C. Gordon <icculus@icculus.org>
parents:
41
diff
changeset
|
812 |
|
1118
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
813 |
static int zip_resolve(PHYSFS_Io *io, ZIPinfo *info, ZIPentry *entry) |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
814 |
{ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
815 |
int retval = 1; |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
816 |
ZipResolveType resolve_type = entry->resolved; |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
817 |
|
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
818 |
/* Don't bother if we've failed to resolve this entry before. */ |
1240
22d4d1bd4e21
Reworked the error reporting API. Now we use error codes instead of strings.
Ryan C. Gordon <icculus@icculus.org>
parents:
1220
diff
changeset
|
819 |
BAIL_IF_MACRO(resolve_type == ZIP_BROKEN_FILE, PHYSFS_ERR_CORRUPT, 0); |
22d4d1bd4e21
Reworked the error reporting API. Now we use error codes instead of strings.
Ryan C. Gordon <icculus@icculus.org>
parents:
1220
diff
changeset
|
820 |
BAIL_IF_MACRO(resolve_type == ZIP_BROKEN_SYMLINK, PHYSFS_ERR_CORRUPT, 0); |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
821 |
|
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
822 |
/* uhoh...infinite symlink loop! */ |
1240
22d4d1bd4e21
Reworked the error reporting API. Now we use error codes instead of strings.
Ryan C. Gordon <icculus@icculus.org>
parents:
1220
diff
changeset
|
823 |
BAIL_IF_MACRO(resolve_type == ZIP_RESOLVING, PHYSFS_ERR_SYMLINK_LOOP, 0); |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
824 |
|
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
825 |
/* |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
826 |
* We fix up the offset to point to the actual data on the |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
827 |
* first open, since we don't want to seek across the whole file on |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
828 |
* archive open (can be SLOW on large, CD-stored files), but we |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
829 |
* need to check the local file header...not just for corruption, |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
830 |
* but since it stores offset info the central directory does not. |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
831 |
*/ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
832 |
if (resolve_type != ZIP_RESOLVED) |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
833 |
{ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
834 |
entry->resolved = ZIP_RESOLVING; |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
835 |
|
1118
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
836 |
retval = zip_parse_local(io, entry); |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
837 |
if (retval) |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
838 |
{ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
839 |
/* |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
840 |
* If it's a symlink, find the original file. This will cause |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
841 |
* resolution of other entries (other symlinks and, eventually, |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
842 |
* the real file) if all goes well. |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
843 |
*/ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
844 |
if (resolve_type == ZIP_UNRESOLVED_SYMLINK) |
1118
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
845 |
retval = zip_resolve_symlink(io, info, entry); |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
846 |
} /* if */ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
847 |
|
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
848 |
if (resolve_type == ZIP_UNRESOLVED_SYMLINK) |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
849 |
entry->resolved = ((retval) ? ZIP_RESOLVED : ZIP_BROKEN_SYMLINK); |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
850 |
else if (resolve_type == ZIP_UNRESOLVED_FILE) |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
851 |
entry->resolved = ((retval) ? ZIP_RESOLVED : ZIP_BROKEN_FILE); |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
852 |
} /* if */ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
853 |
|
1016
957c97389257
Cleaned up returns that look like function calls for my updated coding style.
Ryan C. Gordon <icculus@icculus.org>
parents:
997
diff
changeset
|
854 |
return retval; |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
855 |
} /* zip_resolve */ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
856 |
|
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
857 |
|
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
858 |
static int zip_version_does_symlinks(PHYSFS_uint32 version) |
46
66d9a112b0f7
Now with all directory functions implemented (and debugged?). No file
Ryan C. Gordon <icculus@icculus.org>
parents:
41
diff
changeset
|
859 |
{ |
66d9a112b0f7
Now with all directory functions implemented (and debugged?). No file
Ryan C. Gordon <icculus@icculus.org>
parents:
41
diff
changeset
|
860 |
int retval = 0; |
163
fc2b8ee5b420
Approved zeph's comments, fixed a few of my screwups.
Ryan C. Gordon <icculus@icculus.org>
parents:
161
diff
changeset
|
861 |
PHYSFS_uint8 hosttype = (PHYSFS_uint8) ((version >> 8) & 0xFF); |
46
66d9a112b0f7
Now with all directory functions implemented (and debugged?). No file
Ryan C. Gordon <icculus@icculus.org>
parents:
41
diff
changeset
|
862 |
|
66d9a112b0f7
Now with all directory functions implemented (and debugged?). No file
Ryan C. Gordon <icculus@icculus.org>
parents:
41
diff
changeset
|
863 |
switch (hosttype) |
66d9a112b0f7
Now with all directory functions implemented (and debugged?). No file
Ryan C. Gordon <icculus@icculus.org>
parents:
41
diff
changeset
|
864 |
{ |
342
cef50576cb0b
Fixed symlink detection.
Ryan C. Gordon <icculus@icculus.org>
parents:
340
diff
changeset
|
865 |
/* |
cef50576cb0b
Fixed symlink detection.
Ryan C. Gordon <icculus@icculus.org>
parents:
340
diff
changeset
|
866 |
* These are the platforms that can NOT build an archive with |
cef50576cb0b
Fixed symlink detection.
Ryan C. Gordon <icculus@icculus.org>
parents:
340
diff
changeset
|
867 |
* symlinks, according to the Info-ZIP project. |
cef50576cb0b
Fixed symlink detection.
Ryan C. Gordon <icculus@icculus.org>
parents:
340
diff
changeset
|
868 |
*/ |
cef50576cb0b
Fixed symlink detection.
Ryan C. Gordon <icculus@icculus.org>
parents:
340
diff
changeset
|
869 |
case 0: /* FS_FAT_ */ |
cef50576cb0b
Fixed symlink detection.
Ryan C. Gordon <icculus@icculus.org>
parents:
340
diff
changeset
|
870 |
case 1: /* AMIGA_ */ |
cef50576cb0b
Fixed symlink detection.
Ryan C. Gordon <icculus@icculus.org>
parents:
340
diff
changeset
|
871 |
case 2: /* VMS_ */ |
cef50576cb0b
Fixed symlink detection.
Ryan C. Gordon <icculus@icculus.org>
parents:
340
diff
changeset
|
872 |
case 4: /* VM_CSM_ */ |
cef50576cb0b
Fixed symlink detection.
Ryan C. Gordon <icculus@icculus.org>
parents:
340
diff
changeset
|
873 |
case 6: /* FS_HPFS_ */ |
cef50576cb0b
Fixed symlink detection.
Ryan C. Gordon <icculus@icculus.org>
parents:
340
diff
changeset
|
874 |
case 11: /* FS_NTFS_ */ |
cef50576cb0b
Fixed symlink detection.
Ryan C. Gordon <icculus@icculus.org>
parents:
340
diff
changeset
|
875 |
case 14: /* FS_VFAT_ */ |
cef50576cb0b
Fixed symlink detection.
Ryan C. Gordon <icculus@icculus.org>
parents:
340
diff
changeset
|
876 |
case 13: /* ACORN_ */ |
cef50576cb0b
Fixed symlink detection.
Ryan C. Gordon <icculus@icculus.org>
parents:
340
diff
changeset
|
877 |
case 15: /* MVS_ */ |
cef50576cb0b
Fixed symlink detection.
Ryan C. Gordon <icculus@icculus.org>
parents:
340
diff
changeset
|
878 |
case 18: /* THEOS_ */ |
cef50576cb0b
Fixed symlink detection.
Ryan C. Gordon <icculus@icculus.org>
parents:
340
diff
changeset
|
879 |
break; /* do nothing. */ |
cef50576cb0b
Fixed symlink detection.
Ryan C. Gordon <icculus@icculus.org>
parents:
340
diff
changeset
|
880 |
|
cef50576cb0b
Fixed symlink detection.
Ryan C. Gordon <icculus@icculus.org>
parents:
340
diff
changeset
|
881 |
default: /* assume the rest to be unix-like. */ |
46
66d9a112b0f7
Now with all directory functions implemented (and debugged?). No file
Ryan C. Gordon <icculus@icculus.org>
parents:
41
diff
changeset
|
882 |
retval = 1; |
66d9a112b0f7
Now with all directory functions implemented (and debugged?). No file
Ryan C. Gordon <icculus@icculus.org>
parents:
41
diff
changeset
|
883 |
break; |
66d9a112b0f7
Now with all directory functions implemented (and debugged?). No file
Ryan C. Gordon <icculus@icculus.org>
parents:
41
diff
changeset
|
884 |
} /* switch */ |
66d9a112b0f7
Now with all directory functions implemented (and debugged?). No file
Ryan C. Gordon <icculus@icculus.org>
parents:
41
diff
changeset
|
885 |
|
1016
957c97389257
Cleaned up returns that look like function calls for my updated coding style.
Ryan C. Gordon <icculus@icculus.org>
parents:
997
diff
changeset
|
886 |
return retval; |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
887 |
} /* zip_version_does_symlinks */ |
46
66d9a112b0f7
Now with all directory functions implemented (and debugged?). No file
Ryan C. Gordon <icculus@icculus.org>
parents:
41
diff
changeset
|
888 |
|
66d9a112b0f7
Now with all directory functions implemented (and debugged?). No file
Ryan C. Gordon <icculus@icculus.org>
parents:
41
diff
changeset
|
889 |
|
894
6d152b4900ea
Minor const correctness tweak in zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
852
diff
changeset
|
890 |
static int zip_entry_is_symlink(const ZIPentry *entry) |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
891 |
{ |
1016
957c97389257
Cleaned up returns that look like function calls for my updated coding style.
Ryan C. Gordon <icculus@icculus.org>
parents:
997
diff
changeset
|
892 |
return ((entry->resolved == ZIP_UNRESOLVED_SYMLINK) || |
957c97389257
Cleaned up returns that look like function calls for my updated coding style.
Ryan C. Gordon <icculus@icculus.org>
parents:
997
diff
changeset
|
893 |
(entry->resolved == ZIP_BROKEN_SYMLINK) || |
957c97389257
Cleaned up returns that look like function calls for my updated coding style.
Ryan C. Gordon <icculus@icculus.org>
parents:
997
diff
changeset
|
894 |
(entry->symlink)); |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
895 |
} /* zip_entry_is_symlink */ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
896 |
|
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
897 |
|
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
898 |
static int zip_has_symlink_attr(ZIPentry *entry, PHYSFS_uint32 extern_attr) |
46
66d9a112b0f7
Now with all directory functions implemented (and debugged?). No file
Ryan C. Gordon <icculus@icculus.org>
parents:
41
diff
changeset
|
899 |
{ |
342
cef50576cb0b
Fixed symlink detection.
Ryan C. Gordon <icculus@icculus.org>
parents:
340
diff
changeset
|
900 |
PHYSFS_uint16 xattr = ((extern_attr >> 16) & 0xFFFF); |
1016
957c97389257
Cleaned up returns that look like function calls for my updated coding style.
Ryan C. Gordon <icculus@icculus.org>
parents:
997
diff
changeset
|
901 |
return ( (zip_version_does_symlinks(entry->version)) && |
957c97389257
Cleaned up returns that look like function calls for my updated coding style.
Ryan C. Gordon <icculus@icculus.org>
parents:
997
diff
changeset
|
902 |
(entry->uncompressed_size > 0) && |
957c97389257
Cleaned up returns that look like function calls for my updated coding style.
Ryan C. Gordon <icculus@icculus.org>
parents:
997
diff
changeset
|
903 |
((xattr & UNIX_FILETYPE_MASK) == UNIX_FILETYPE_SYMLINK) ); |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
904 |
} /* zip_has_symlink_attr */ |
46
66d9a112b0f7
Now with all directory functions implemented (and debugged?). No file
Ryan C. Gordon <icculus@icculus.org>
parents:
41
diff
changeset
|
905 |
|
66d9a112b0f7
Now with all directory functions implemented (and debugged?). No file
Ryan C. Gordon <icculus@icculus.org>
parents:
41
diff
changeset
|
906 |
|
538
8752e3c0dbf9
Now compiles on CodeWarrior 6 for MacOS Classic again.
Ryan C. Gordon <icculus@icculus.org>
parents:
504
diff
changeset
|
907 |
static PHYSFS_sint64 zip_dos_time_to_physfs_time(PHYSFS_uint32 dostime) |
46
66d9a112b0f7
Now with all directory functions implemented (and debugged?). No file
Ryan C. Gordon <icculus@icculus.org>
parents:
41
diff
changeset
|
908 |
{ |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
909 |
PHYSFS_uint32 dosdate; |
337 | 910 |
struct tm unixtime; |
911 |
memset(&unixtime, '\0', sizeof (unixtime)); |
|
912 |
||
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
913 |
dosdate = (PHYSFS_uint32) ((dostime >> 16) & 0xFFFF); |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
914 |
dostime &= 0xFFFF; |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
915 |
|
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
916 |
/* dissect date */ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
917 |
unixtime.tm_year = ((dosdate >> 9) & 0x7F) + 80; |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
918 |
unixtime.tm_mon = ((dosdate >> 5) & 0x0F) - 1; |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
919 |
unixtime.tm_mday = ((dosdate ) & 0x1F); |
337 | 920 |
|
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
921 |
/* dissect time */ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
922 |
unixtime.tm_hour = ((dostime >> 11) & 0x1F); |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
923 |
unixtime.tm_min = ((dostime >> 5) & 0x3F); |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
924 |
unixtime.tm_sec = ((dostime << 1) & 0x3E); |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
925 |
|
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
926 |
/* let mktime calculate daylight savings time. */ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
927 |
unixtime.tm_isdst = -1; |
337 | 928 |
|
1016
957c97389257
Cleaned up returns that look like function calls for my updated coding style.
Ryan C. Gordon <icculus@icculus.org>
parents:
997
diff
changeset
|
929 |
return ((PHYSFS_sint64) mktime(&unixtime)); |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
930 |
} /* zip_dos_time_to_physfs_time */ |
337 | 931 |
|
932 |
||
1283
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
933 |
static int zip_load_entry(PHYSFS_Io *io, const int zip64, ZIPentry *entry, |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
934 |
PHYSFS_uint64 ofs_fixup) |
337 | 935 |
{ |
936 |
PHYSFS_uint16 fnamelen, extralen, commentlen; |
|
937 |
PHYSFS_uint32 external_attr; |
|
1283
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
938 |
PHYSFS_uint32 starting_disk; |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
939 |
PHYSFS_uint64 offset; |
337 | 940 |
PHYSFS_uint16 ui16; |
941 |
PHYSFS_uint32 ui32; |
|
942 |
PHYSFS_sint64 si64; |
|
943 |
||
944 |
/* sanity check with central directory signature... */ |
|
1240
22d4d1bd4e21
Reworked the error reporting API. Now we use error codes instead of strings.
Ryan C. Gordon <icculus@icculus.org>
parents:
1220
diff
changeset
|
945 |
BAIL_IF_MACRO(!readui32(io, &ui32), ERRPASS, 0); |
22d4d1bd4e21
Reworked the error reporting API. Now we use error codes instead of strings.
Ryan C. Gordon <icculus@icculus.org>
parents:
1220
diff
changeset
|
946 |
BAIL_IF_MACRO(ui32 != ZIP_CENTRAL_DIR_SIG, PHYSFS_ERR_CORRUPT, 0); |
53
6c3c990f006e
ZIP entries are now cached at openArchive time, which cleans up the race
Ryan C. Gordon <icculus@icculus.org>
parents:
52
diff
changeset
|
947 |
|
337 | 948 |
/* Get the pertinent parts of the record... */ |
1240
22d4d1bd4e21
Reworked the error reporting API. Now we use error codes instead of strings.
Ryan C. Gordon <icculus@icculus.org>
parents:
1220
diff
changeset
|
949 |
BAIL_IF_MACRO(!readui16(io, &entry->version), ERRPASS, 0); |
22d4d1bd4e21
Reworked the error reporting API. Now we use error codes instead of strings.
Ryan C. Gordon <icculus@icculus.org>
parents:
1220
diff
changeset
|
950 |
BAIL_IF_MACRO(!readui16(io, &entry->version_needed), ERRPASS, 0); |
22d4d1bd4e21
Reworked the error reporting API. Now we use error codes instead of strings.
Ryan C. Gordon <icculus@icculus.org>
parents:
1220
diff
changeset
|
951 |
BAIL_IF_MACRO(!readui16(io, &ui16), ERRPASS, 0); /* general bits */ |
22d4d1bd4e21
Reworked the error reporting API. Now we use error codes instead of strings.
Ryan C. Gordon <icculus@icculus.org>
parents:
1220
diff
changeset
|
952 |
BAIL_IF_MACRO(!readui16(io, &entry->compression_method), ERRPASS, 0); |
22d4d1bd4e21
Reworked the error reporting API. Now we use error codes instead of strings.
Ryan C. Gordon <icculus@icculus.org>
parents:
1220
diff
changeset
|
953 |
BAIL_IF_MACRO(!readui32(io, &ui32), ERRPASS, 0); |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
954 |
entry->last_mod_time = zip_dos_time_to_physfs_time(ui32); |
1240
22d4d1bd4e21
Reworked the error reporting API. Now we use error codes instead of strings.
Ryan C. Gordon <icculus@icculus.org>
parents:
1220
diff
changeset
|
955 |
BAIL_IF_MACRO(!readui32(io, &entry->crc), ERRPASS, 0); |
1283
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
956 |
BAIL_IF_MACRO(!readui32(io, &ui32), ERRPASS, 0); |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
957 |
entry->compressed_size = (PHYSFS_uint64) ui32; |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
958 |
BAIL_IF_MACRO(!readui32(io, &ui32), ERRPASS, 0); |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
959 |
entry->uncompressed_size = (PHYSFS_uint64) ui32; |
1240
22d4d1bd4e21
Reworked the error reporting API. Now we use error codes instead of strings.
Ryan C. Gordon <icculus@icculus.org>
parents:
1220
diff
changeset
|
960 |
BAIL_IF_MACRO(!readui16(io, &fnamelen), ERRPASS, 0); |
22d4d1bd4e21
Reworked the error reporting API. Now we use error codes instead of strings.
Ryan C. Gordon <icculus@icculus.org>
parents:
1220
diff
changeset
|
961 |
BAIL_IF_MACRO(!readui16(io, &extralen), ERRPASS, 0); |
22d4d1bd4e21
Reworked the error reporting API. Now we use error codes instead of strings.
Ryan C. Gordon <icculus@icculus.org>
parents:
1220
diff
changeset
|
962 |
BAIL_IF_MACRO(!readui16(io, &commentlen), ERRPASS, 0); |
1283
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
963 |
BAIL_IF_MACRO(!readui16(io, &ui16), ERRPASS, 0); |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
964 |
starting_disk = (PHYSFS_uint32) ui16; |
1240
22d4d1bd4e21
Reworked the error reporting API. Now we use error codes instead of strings.
Ryan C. Gordon <icculus@icculus.org>
parents:
1220
diff
changeset
|
965 |
BAIL_IF_MACRO(!readui16(io, &ui16), ERRPASS, 0); /* internal file attribs */ |
22d4d1bd4e21
Reworked the error reporting API. Now we use error codes instead of strings.
Ryan C. Gordon <icculus@icculus.org>
parents:
1220
diff
changeset
|
966 |
BAIL_IF_MACRO(!readui32(io, &external_attr), ERRPASS, 0); |
1283
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
967 |
BAIL_IF_MACRO(!readui32(io, &ui32), ERRPASS, 0); |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
968 |
offset = (PHYSFS_uint64) ui32; |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
969 |
|
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
970 |
entry->symlink = NULL; /* will be resolved later, if necessary. */ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
971 |
entry->resolved = (zip_has_symlink_attr(entry, external_attr)) ? |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
972 |
ZIP_UNRESOLVED_SYMLINK : ZIP_UNRESOLVED_FILE; |
337 | 973 |
|
691
71d9affe0d8a
All memory management now goes through allocation hooks instead of directly to
Ryan C. Gordon <icculus@icculus.org>
parents:
658
diff
changeset
|
974 |
entry->name = (char *) allocator.Malloc(fnamelen + 1); |
1240
22d4d1bd4e21
Reworked the error reporting API. Now we use error codes instead of strings.
Ryan C. Gordon <icculus@icculus.org>
parents:
1220
diff
changeset
|
975 |
BAIL_IF_MACRO(entry->name == NULL, PHYSFS_ERR_OUT_OF_MEMORY, 0); |
1203
55f147714ce2
Cleaned up all the readAll() cut and paste.
Ryan C. Gordon <icculus@icculus.org>
parents:
1162
diff
changeset
|
976 |
if (!__PHYSFS_readAll(io, entry->name, fnamelen)) |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
977 |
goto zip_load_entry_puked; |
337 | 978 |
|
979 |
entry->name[fnamelen] = '\0'; /* null-terminate the filename. */ |
|
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
980 |
zip_convert_dos_path(entry, entry->name); |
337 | 981 |
|
1118
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
982 |
si64 = io->tell(io); |
337 | 983 |
if (si64 == -1) |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
984 |
goto zip_load_entry_puked; |
337 | 985 |
|
1283
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
986 |
/* |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
987 |
* The actual sizes didn't fit in 32-bits; look for the Zip64 |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
988 |
* extended information extra field... |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
989 |
*/ |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
990 |
if ( (zip64) && |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
991 |
((offset == 0xFFFFFFFF) || |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
992 |
(starting_disk == 0xFFFFFFFF) || |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
993 |
(entry->compressed_size == 0xFFFFFFFF) || |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
994 |
(entry->uncompressed_size == 0xFFFFFFFF)) ) |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
995 |
{ |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
996 |
int found = 0; |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
997 |
PHYSFS_uint16 sig, len; |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
998 |
while (extralen > 4) |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
999 |
{ |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1000 |
if (!readui16(io, &sig)) |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1001 |
goto zip_load_entry_puked; |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1002 |
else if (!readui16(io, &len)) |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1003 |
goto zip_load_entry_puked; |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1004 |
|
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1005 |
si64 += 4 + len; |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1006 |
extralen -= 4 + len; |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1007 |
if (sig != ZIP64_EXTENDED_INFO_EXTRA_FIELD_SIG) |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1008 |
{ |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1009 |
if (!io->seek(io, si64)) |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1010 |
goto zip_load_entry_puked; |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1011 |
continue; |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1012 |
} /* if */ |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1013 |
|
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1014 |
found = 1; |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1015 |
break; |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1016 |
} /* while */ |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1017 |
|
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1018 |
GOTO_IF_MACRO(!found, PHYSFS_ERR_CORRUPT, zip_load_entry_puked); |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1019 |
|
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1020 |
if (entry->uncompressed_size == 0xFFFFFFFF) |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1021 |
{ |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1022 |
GOTO_IF_MACRO(len < 8, PHYSFS_ERR_CORRUPT, zip_load_entry_puked); |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1023 |
if (!readui64(io, &entry->uncompressed_size)) |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1024 |
goto zip_load_entry_puked; |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1025 |
len -= 8; |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1026 |
} /* if */ |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1027 |
|
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1028 |
if (entry->compressed_size == 0xFFFFFFFF) |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1029 |
{ |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1030 |
GOTO_IF_MACRO(len < 8, PHYSFS_ERR_CORRUPT, zip_load_entry_puked); |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1031 |
if (!readui64(io, &entry->compressed_size)) |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1032 |
goto zip_load_entry_puked; |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1033 |
len -= 8; |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1034 |
} /* if */ |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1035 |
|
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1036 |
if (offset == 0xFFFFFFFF) |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1037 |
{ |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1038 |
GOTO_IF_MACRO(len < 8, PHYSFS_ERR_CORRUPT, zip_load_entry_puked); |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1039 |
if (!readui64(io, &offset)) |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1040 |
goto zip_load_entry_puked; |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1041 |
len -= 8; |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1042 |
} /* if */ |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1043 |
|
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1044 |
if (starting_disk == 0xFFFFFFFF) |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1045 |
{ |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1046 |
GOTO_IF_MACRO(len < 8, PHYSFS_ERR_CORRUPT, zip_load_entry_puked); |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1047 |
if (!readui32(io, &starting_disk)) |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1048 |
goto zip_load_entry_puked; |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1049 |
len -= 4; |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1050 |
} /* if */ |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1051 |
|
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1052 |
GOTO_IF_MACRO(len != 0, PHYSFS_ERR_CORRUPT, zip_load_entry_puked); |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1053 |
} /* if */ |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1054 |
|
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1055 |
GOTO_IF_MACRO(starting_disk != 0, PHYSFS_ERR_CORRUPT, zip_load_entry_puked); |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1056 |
|
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1057 |
entry->offset = offset + ofs_fixup; |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1058 |
|
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1059 |
/* seek to the start of the next entry in the central directory... */ |
1118
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
1060 |
if (!io->seek(io, si64 + extralen + commentlen)) |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
1061 |
goto zip_load_entry_puked; |
337 | 1062 |
|
1016
957c97389257
Cleaned up returns that look like function calls for my updated coding style.
Ryan C. Gordon <icculus@icculus.org>
parents:
997
diff
changeset
|
1063 |
return 1; /* success. */ |
337 | 1064 |
|
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
1065 |
zip_load_entry_puked: |
691
71d9affe0d8a
All memory management now goes through allocation hooks instead of directly to
Ryan C. Gordon <icculus@icculus.org>
parents:
658
diff
changeset
|
1066 |
allocator.Free(entry->name); |
1016
957c97389257
Cleaned up returns that look like function calls for my updated coding style.
Ryan C. Gordon <icculus@icculus.org>
parents:
997
diff
changeset
|
1067 |
return 0; /* failure. */ |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
1068 |
} /* zip_load_entry */ |
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
1069 |
|
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
1070 |
|
1283
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1071 |
static int zip_entry_cmp(void *_a, size_t one, size_t two) |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
1072 |
{ |
928
0e37b8163248
Various archiver swap and compare functions now check if they are
Ryan C. Gordon <icculus@icculus.org>
parents:
895
diff
changeset
|
1073 |
if (one != two) |
0e37b8163248
Various archiver swap and compare functions now check if they are
Ryan C. Gordon <icculus@icculus.org>
parents:
895
diff
changeset
|
1074 |
{ |
0e37b8163248
Various archiver swap and compare functions now check if they are
Ryan C. Gordon <icculus@icculus.org>
parents:
895
diff
changeset
|
1075 |
const ZIPentry *a = (const ZIPentry *) _a; |
1016
957c97389257
Cleaned up returns that look like function calls for my updated coding style.
Ryan C. Gordon <icculus@icculus.org>
parents:
997
diff
changeset
|
1076 |
return strcmp(a[one].name, a[two].name); |
928
0e37b8163248
Various archiver swap and compare functions now check if they are
Ryan C. Gordon <icculus@icculus.org>
parents:
895
diff
changeset
|
1077 |
} /* if */ |
0e37b8163248
Various archiver swap and compare functions now check if they are
Ryan C. Gordon <icculus@icculus.org>
parents:
895
diff
changeset
|
1078 |
|
0e37b8163248
Various archiver swap and compare functions now check if they are
Ryan C. Gordon <icculus@icculus.org>
parents:
895
diff
changeset
|
1079 |
return 0; |
464
21c8e0d1578c
Generalized sorting routines, and removed individual implementations.
Ryan C. Gordon <icculus@icculus.org>
parents:
446
diff
changeset
|
1080 |
} /* zip_entry_cmp */ |
337 | 1081 |
|
1082 |
||
1283
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1083 |
static void zip_entry_swap(void *_a, size_t one, size_t two) |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
1084 |
{ |
928
0e37b8163248
Various archiver swap and compare functions now check if they are
Ryan C. Gordon <icculus@icculus.org>
parents:
895
diff
changeset
|
1085 |
if (one != two) |
0e37b8163248
Various archiver swap and compare functions now check if they are
Ryan C. Gordon <icculus@icculus.org>
parents:
895
diff
changeset
|
1086 |
{ |
0e37b8163248
Various archiver swap and compare functions now check if they are
Ryan C. Gordon <icculus@icculus.org>
parents:
895
diff
changeset
|
1087 |
ZIPentry tmp; |
0e37b8163248
Various archiver swap and compare functions now check if they are
Ryan C. Gordon <icculus@icculus.org>
parents:
895
diff
changeset
|
1088 |
ZIPentry *first = &(((ZIPentry *) _a)[one]); |
0e37b8163248
Various archiver swap and compare functions now check if they are
Ryan C. Gordon <icculus@icculus.org>
parents:
895
diff
changeset
|
1089 |
ZIPentry *second = &(((ZIPentry *) _a)[two]); |
0e37b8163248
Various archiver swap and compare functions now check if they are
Ryan C. Gordon <icculus@icculus.org>
parents:
895
diff
changeset
|
1090 |
memcpy(&tmp, first, sizeof (ZIPentry)); |
0e37b8163248
Various archiver swap and compare functions now check if they are
Ryan C. Gordon <icculus@icculus.org>
parents:
895
diff
changeset
|
1091 |
memcpy(first, second, sizeof (ZIPentry)); |
0e37b8163248
Various archiver swap and compare functions now check if they are
Ryan C. Gordon <icculus@icculus.org>
parents:
895
diff
changeset
|
1092 |
memcpy(second, &tmp, sizeof (ZIPentry)); |
0e37b8163248
Various archiver swap and compare functions now check if they are
Ryan C. Gordon <icculus@icculus.org>
parents:
895
diff
changeset
|
1093 |
} /* if */ |
464
21c8e0d1578c
Generalized sorting routines, and removed individual implementations.
Ryan C. Gordon <icculus@icculus.org>
parents:
446
diff
changeset
|
1094 |
} /* zip_entry_swap */ |
365
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
1095 |
|
3d087cde1252
My rewrite continues. I'm mostly satisfied with this code now, minus debugging.
Ryan C. Gordon <icculus@icculus.org>
parents:
345
diff
changeset
|
1096 |
|
1118
2e09fc635fdd
Abstracted file i/o into PHYSFS_Io interface.
Ryan C. Gordon <icculus@icculus.org>
parents:
1113
diff
changeset
|
1097 |
static int zip_load_entries(PHYSFS_Io *io, ZIPinfo *info, |
1283
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1098 |
const PHYSFS_uint64 data_ofs, |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1099 |
const PHYSFS_uint64 central_ofs) |
337 | 1100 |
{ |
1283
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1101 |
const PHYSFS_uint64 max = info->entryCount; |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1102 |
const int zip64 = info->zip64; |
8bcc48d243df
Added Zip64 support to the .zip archiver.
Ryan C. Gordon <icculus@icculus.org>
parents:
1281
diff
changeset
|
1103 |
PHYSFS_uint64 i; |
337 | 1104 |
|