Mercurial > hg > dmlib
annotate dmres.c @ 406:a0160ffdf7e5
Use fseeko() and ftello() to ensure 64-bit off_t compatibility in stdio backend.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Sat, 03 Nov 2012 01:54:00 +0200 |
parents | 59045853853d |
children | 3d9c044ec08d |
rev | line source |
---|---|
0 | 1 /* |
2 * dmlib | |
3 * -- Resource management | |
4 * Programmed and designed by Matti 'ccr' Hamalainen | |
5 * (C) Copyright 2003-2012 Tecnic Software productions (TNSP) | |
6 */ | |
7 #include "dmres.h" | |
8 #include <time.h> | |
9 | |
10 | |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
11 DMResource *dmres_new(DMResourceLib *lib, const char *filename, int flags, size_t size) |
0 | 12 { |
27
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
13 DMResource *node = dmMalloc0(sizeof(DMResource)); |
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
14 if (node == NULL) |
0 | 15 return NULL; |
16 | |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
17 node->lib = lib; |
27
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
18 node->filename = dm_strdup(filename); |
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
19 node->flags = flags; |
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
20 node->dataSize = size; |
0 | 21 |
27
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
22 return node; |
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
23 } |
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
24 |
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
25 |
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
26 void dmres_free_res_data(DMResource *node) |
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
27 { |
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
28 if (node->rdata != NULL && |
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
29 node->rops != NULL && |
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
30 node->rops->free != NULL) |
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
31 { |
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
32 node->rops->free(node); |
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
33 } |
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
34 |
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
35 node->rdata = NULL; |
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
36 node->flags &= !DMF_LOADED_RES; |
0 | 37 } |
38 | |
39 | |
27
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
40 void dmres_free_raw_data(DMResource *node) |
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
41 { |
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
42 dmFree(node->data); |
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
43 node->data = NULL; |
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
44 node->flags &= !DMF_LOADED_RAW; |
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
45 } |
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
46 |
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
47 |
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
48 void dmres_purge_raw_data(DMResource *node) |
0 | 49 { |
27
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
50 if ((node->flags & DMF_PRELOAD_RAW) == 0 && |
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
51 (node->flags & DMF_LOADED_RAW) && |
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
52 node->data != NULL) |
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
53 dmres_free_raw_data(node); |
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
54 } |
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
55 |
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
56 |
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
57 void dmres_free(DMResource *node) |
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
58 { |
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
59 if (node != NULL) |
0 | 60 { |
27
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
61 dmres_free_res_data(node); |
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
62 dmres_free_raw_data(node); |
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
63 dmFree(node->filename); |
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
64 dmFree(node); |
0 | 65 } |
66 } | |
67 | |
68 | |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
69 void dmres_insert(DMResourceLib *lib, DMResource * node) |
0 | 70 { |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
71 if (lib == NULL) |
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
72 return; |
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
73 |
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
74 node->lib = lib; |
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
75 |
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
76 if (lib->resources != NULL) |
0 | 77 { |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
78 node->prev = lib->resources->prev; |
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
79 lib->resources->prev->next = node; |
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
80 lib->resources->prev = node; |
0 | 81 } |
82 else | |
83 { | |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
84 lib->resources = node->prev = node; |
0 | 85 } |
86 | |
87 node->next = NULL; | |
88 } | |
89 | |
90 | |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
91 void dmres_delete(DMResourceLib *lib, DMResource * node) |
0 | 92 { |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
93 if (lib == NULL) |
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
94 return; |
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
95 |
0 | 96 if (node->prev) |
97 node->prev->next = node->next; | |
98 | |
99 if (node->next) | |
100 node->next->prev = node->prev; | |
101 else | |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
102 lib->resources->prev = node->prev; |
0 | 103 |
104 node->prev = node->next = NULL; | |
105 } | |
106 | |
107 | |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
108 DMResource * dmres_find(DMResourceLib *lib, const char *filename) |
0 | 109 { |
110 DMResource *node, *found = NULL; | |
111 | |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
112 if (lib == NULL) |
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
113 return NULL; |
0 | 114 |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
115 dmMutexLock(lib->mutex); |
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
116 |
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
117 for (node = lib->resources; node != NULL; node = node->next) |
0 | 118 { |
119 if (strcmp(node->filename, filename) == 0) | |
120 { | |
121 found = node; | |
122 break; | |
123 } | |
124 } | |
125 | |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
126 dmMutexUnlock(lib->mutex); |
0 | 127 |
128 return found; | |
129 } | |
130 | |
131 | |
124
d5cfd29c87c4
Rename some conditional compilation directives.
Matti Hamalainen <ccr@tnsp.org>
parents:
114
diff
changeset
|
132 #ifdef DM_USE_STDIO |
0 | 133 /* Basic stdio file routines |
134 */ | |
135 static int dm_stdio_fopen(DMResource *handle) | |
136 { | |
137 char *rfilename = dm_strdup_printf("%s%s", DMRES_DATA_PATH, handle->filename); | |
138 if (rfilename == NULL) | |
139 return DMERR_MALLOC; | |
140 | |
141 handle->fh = fopen(rfilename, "rb"); | |
142 dmFree(rfilename); | |
143 | |
144 handle->error = dmGetErrno(); | |
145 return (handle->fh != NULL) ? DMERR_OK : DMERR_FOPEN; | |
146 } | |
147 | |
148 | |
149 static void dm_stdio_fclose(DMResource * f) | |
150 { | |
151 if (f->fh != NULL) | |
152 { | |
153 fclose(f->fh); | |
154 f->fh = NULL; | |
155 } | |
156 } | |
157 | |
158 | |
159 static int dm_stdio_ferror(DMResource * f) | |
160 { | |
161 return f->error; | |
162 } | |
163 | |
164 | |
165 static int dm_stdio_fseek(DMResource *f, const off_t pos, const int whence) | |
166 { | |
167 int ret = fseek(f->fh, pos, whence); | |
168 f->error = dmGetErrno(); | |
169 return ret; | |
170 } | |
171 | |
172 | |
173 static off_t dm_stdio_fsize(DMResource *f) | |
174 { | |
175 off_t savePos, fileSize; | |
176 | |
177 // Check if the size is cached | |
178 if (f->dataSize != 0) | |
179 return f->dataSize; | |
180 | |
181 // Get file size | |
406
a0160ffdf7e5
Use fseeko() and ftello() to ensure 64-bit off_t compatibility in stdio backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
182 savePos = ftello(f->fh); |
a0160ffdf7e5
Use fseeko() and ftello() to ensure 64-bit off_t compatibility in stdio backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
183 if (fseeko(f->fh, 0L, SEEK_END) != 0) |
0 | 184 { |
185 f->error = dmGetErrno(); | |
186 return -1; | |
187 } | |
188 | |
406
a0160ffdf7e5
Use fseeko() and ftello() to ensure 64-bit off_t compatibility in stdio backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
189 fileSize = ftello(f->fh); |
a0160ffdf7e5
Use fseeko() and ftello() to ensure 64-bit off_t compatibility in stdio backend.
Matti Hamalainen <ccr@tnsp.org>
parents:
359
diff
changeset
|
190 if (fseeko(f->fh, savePos, SEEK_SET) != 0) |
0 | 191 { |
192 f->error = dmGetErrno(); | |
193 return -1; | |
194 } | |
195 | |
196 f->dataSize = fileSize; | |
197 return fileSize; | |
198 } | |
199 | |
200 | |
201 static off_t dm_stdio_ftell(DMResource * f) | |
202 { | |
203 return ftell(f->fh); | |
204 } | |
205 | |
206 | |
207 static BOOL dm_stdio_feof(DMResource * f) | |
208 { | |
209 return feof(f->fh); | |
210 } | |
211 | |
212 | |
213 static int dm_stdio_fgetc(DMResource * f) | |
214 { | |
215 int ret = fgetc(f->fh); | |
216 f->error = dmGetErrno(); | |
217 return ret; | |
218 } | |
219 | |
220 | |
59
c560703e85ed
Add resource writing functions (only work for stdio backend)
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
221 static int dm_stdio_fputc(int v, DMResource * f) |
c560703e85ed
Add resource writing functions (only work for stdio backend)
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
222 { |
c560703e85ed
Add resource writing functions (only work for stdio backend)
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
223 int ret = fputc(v, f->fh); |
c560703e85ed
Add resource writing functions (only work for stdio backend)
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
224 f->error = dmGetErrno(); |
c560703e85ed
Add resource writing functions (only work for stdio backend)
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
225 return ret; |
c560703e85ed
Add resource writing functions (only work for stdio backend)
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
226 } |
c560703e85ed
Add resource writing functions (only work for stdio backend)
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
227 |
c560703e85ed
Add resource writing functions (only work for stdio backend)
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
228 |
0 | 229 static size_t dm_stdio_fread(void *ptr, size_t size, size_t nmemb, DMResource * f) |
230 { | |
231 size_t ret = fread(ptr, size, nmemb, f->fh); | |
232 f->error = dmGetErrno(); | |
233 return ret; | |
234 } | |
235 | |
236 | |
59
c560703e85ed
Add resource writing functions (only work for stdio backend)
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
237 static size_t dm_stdio_fwrite(void *ptr, size_t size, size_t nmemb, DMResource * f) |
c560703e85ed
Add resource writing functions (only work for stdio backend)
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
238 { |
c560703e85ed
Add resource writing functions (only work for stdio backend)
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
239 size_t ret = fwrite(ptr, size, nmemb, f->fh); |
c560703e85ed
Add resource writing functions (only work for stdio backend)
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
240 f->error = dmGetErrno(); |
c560703e85ed
Add resource writing functions (only work for stdio backend)
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
241 return ret; |
c560703e85ed
Add resource writing functions (only work for stdio backend)
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
242 } |
c560703e85ed
Add resource writing functions (only work for stdio backend)
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
243 |
c560703e85ed
Add resource writing functions (only work for stdio backend)
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
244 |
0 | 245 static int dm_stdio_preload(DMResource *handle) |
246 { | |
247 int ret = dm_stdio_fopen(handle); | |
248 if (ret != DMERR_OK) | |
249 return ret; | |
250 | |
251 dm_stdio_fsize(handle); | |
252 | |
253 handle->data = dmMalloc(handle->dataSize); | |
254 if (handle->data == NULL) | |
255 return DMERR_MALLOC; | |
256 | |
257 if (dm_stdio_fread(handle->data, sizeof(Uint8), handle->dataSize, handle) != handle->dataSize) | |
258 return DMERR_FREAD; | |
259 | |
260 return DMERR_OK; | |
261 } | |
262 | |
263 | |
264 DMResourceOps dfStdioFileOps = | |
265 { | |
266 dm_stdio_ferror, | |
267 dm_stdio_fseek, | |
268 dm_stdio_fsize, | |
269 dm_stdio_ftell, | |
270 dm_stdio_feof, | |
271 dm_stdio_fgetc, | |
59
c560703e85ed
Add resource writing functions (only work for stdio backend)
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
272 dm_stdio_fputc, |
0 | 273 dm_stdio_fread, |
59
c560703e85ed
Add resource writing functions (only work for stdio backend)
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
274 dm_stdio_fwrite, |
0 | 275 |
276 dm_stdio_fopen, | |
277 dm_stdio_fclose, | |
278 dm_stdio_preload | |
279 }; | |
280 | |
281 DMResourceOps dfStdioFHOps = | |
282 { | |
283 dm_stdio_ferror, | |
284 dm_stdio_fseek, | |
285 dm_stdio_fsize, | |
286 dm_stdio_ftell, | |
287 dm_stdio_feof, | |
288 dm_stdio_fgetc, | |
59
c560703e85ed
Add resource writing functions (only work for stdio backend)
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
289 dm_stdio_fputc, |
0 | 290 dm_stdio_fread, |
59
c560703e85ed
Add resource writing functions (only work for stdio backend)
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
291 dm_stdio_fwrite, |
0 | 292 |
293 NULL, | |
294 NULL, | |
295 NULL | |
296 }; | |
297 #endif | |
298 | |
299 | |
300 // Some mingw/windows headers define these as macros, which is bad for us | |
301 #ifdef __WIN32 | |
302 #undef ferror | |
303 #undef feof | |
304 #endif | |
305 | |
306 | |
307 /* | |
308 * PACK file routines | |
309 */ | |
124
d5cfd29c87c4
Rename some conditional compilation directives.
Matti Hamalainen <ccr@tnsp.org>
parents:
114
diff
changeset
|
310 #ifdef DM_USE_PACKFS |
0 | 311 static int dm_pack_preload(DMResource *handle) |
312 { | |
313 DMPackEntry *node; | |
314 int res = DMERR_OK, cres, cdataLeft; | |
315 z_stream cstream; | |
316 Uint8 * cbuffer = NULL; | |
317 | |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
318 if (handle->lib == NULL || handle->lib->packFile == NULL) |
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
319 return DMERR_NULLPTR; |
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
320 |
0 | 321 // Search PACK nodelist for file |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
322 if ((node = dm_pack_find(handle->lib->packFile->entries, handle->filename)) == NULL) |
0 | 323 { |
324 dmError("Entry '%s' not found in PACK file.\n", handle->filename); | |
325 res = DMERR_NOT_FOUND; | |
326 goto error; | |
327 } | |
328 | |
329 // Seek to entry | |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
330 if (fseek(handle->lib->packFile->file, node->offset, SEEK_SET) == -1) |
0 | 331 { |
332 dmError("Could not seek node position in PACK file.\n"); | |
333 res = DMERR_FSEEK; | |
334 goto error; | |
335 } | |
336 | |
337 // Allocate a structures and buffers | |
338 cbuffer = (Uint8 *) dmMalloc(DPACK_TMPSIZE); | |
339 if (cbuffer == NULL) | |
340 { | |
341 res = DMERR_MALLOC; | |
342 goto error; | |
343 } | |
344 | |
345 // Initialize fields | |
346 handle->dataOffset = 0; | |
347 handle->dataSize = node->size; | |
348 handle->data = (Uint8 *) dmMalloc(node->size); | |
349 if (handle->data == NULL) | |
350 { | |
351 res = DMERR_MALLOC; | |
352 goto error; | |
353 } | |
354 | |
355 // Initialize decompression | |
356 cstream.zalloc = (alloc_func) Z_NULL; | |
357 cstream.zfree = (free_func) Z_NULL; | |
358 cstream.opaque = (voidpf) Z_NULL; | |
359 cstream.next_out = handle->data; | |
360 cstream.avail_out = handle->dataSize; | |
361 cdataLeft = node->length; | |
362 cres = inflateInit(&(cstream)); | |
363 if (cres != Z_OK) | |
364 { | |
365 dmError("Could not initialize zlib stream inflation.\n"); | |
366 res = DMERR_INIT_FAIL; | |
367 goto error; | |
368 } | |
369 | |
370 // Uncompress the data | |
371 while (cdataLeft > 0 && | |
372 cstream.avail_out > 0 && cres == Z_OK) | |
373 { | |
374 cstream.avail_in = fread( | |
375 cbuffer, sizeof(Uint8), | |
376 (cdataLeft >= DPACK_TMPSIZE) ? DPACK_TMPSIZE : cdataLeft, | |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
377 handle->lib->packFile->file); |
0 | 378 |
379 cdataLeft -= cstream.avail_in; | |
380 cstream.next_in = cbuffer; | |
381 cres = inflate(&cstream, Z_FULL_FLUSH); | |
382 } | |
383 | |
384 // Cleanup | |
385 inflateEnd(&(cstream)); | |
386 | |
387 error: | |
388 dmFree(cbuffer); | |
389 return res; | |
390 } | |
391 | |
392 | |
166
112eb95f2fba
Improve build system granularity.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
393 static void dm_pack_fclose(DMResource * f) |
0 | 394 { |
395 f->dataSize = 0; | |
396 f->dataOffset = 0; | |
397 dmFree(f->data); | |
398 f->data = NULL; | |
399 } | |
166
112eb95f2fba
Improve build system granularity.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
400 #endif |
0 | 401 |
402 | |
403 static int dm_mem_ferror(DMResource * f) | |
404 { | |
405 return f->error; | |
406 } | |
407 | |
408 | |
409 static int dm_mem_fseek(DMResource * f, const off_t offset, const int whence) | |
410 { | |
411 off_t newPos; | |
412 | |
413 // Calculate the new position | |
414 switch (whence) | |
415 { | |
416 case SEEK_SET: | |
417 newPos = offset; | |
418 break; | |
419 | |
420 case SEEK_CUR: | |
421 newPos = f->dataOffset + offset; | |
422 break; | |
423 | |
424 case SEEK_END: | |
425 newPos = f->dataSize + offset; | |
426 break; | |
427 | |
428 default: | |
429 return -1; | |
430 } | |
431 | |
432 // Set the new position | |
433 f->dataOffset = newPos; | |
434 | |
435 // Check the new position | |
436 if (newPos < 0 && (size_t) newPos >= f->dataSize) | |
437 return -1; | |
438 | |
439 return 0; | |
440 } | |
441 | |
442 | |
443 static off_t dm_mem_fsize(DMResource * f) | |
444 { | |
445 return f->dataSize; | |
446 } | |
447 | |
448 | |
449 static off_t dm_mem_ftell(DMResource * f) | |
450 { | |
451 return f->dataOffset; | |
452 } | |
453 | |
454 | |
455 static BOOL dm_mem_feof(DMResource * f) | |
456 { | |
457 // Check for EOF | |
458 if ((size_t) f->dataOffset <= f->dataSize) | |
459 return FALSE; | |
460 else | |
461 return TRUE; | |
462 } | |
463 | |
464 | |
465 static int dm_mem_fgetc(DMResource * f) | |
466 { | |
467 // Check for EOF | |
468 if ((size_t) f->dataOffset < f->dataSize) | |
469 return (int) f->data[f->dataOffset++]; | |
470 else | |
471 return EOF; | |
472 } | |
473 | |
474 | |
475 static size_t dm_mem_fread(void *buf, size_t size, size_t nmemb, DMResource * f) | |
476 { | |
477 size_t length = (size * nmemb); | |
478 | |
479 // Check if we can read the whole chunk | |
480 if (((size_t) f->dataOffset + length) >= f->dataSize) | |
481 { | |
482 nmemb = (f->dataSize - f->dataOffset) / size; | |
483 length = size * nmemb; | |
484 } | |
485 | |
486 memcpy(buf, f->data + f->dataOffset, length); | |
487 f->dataOffset += length; | |
488 return nmemb; | |
489 } | |
490 | |
491 | |
166
112eb95f2fba
Improve build system granularity.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
492 #ifdef DM_USE_PACKFS |
0 | 493 DMResourceOps dfPackFileOps = |
494 { | |
495 dm_mem_ferror, | |
496 dm_mem_fseek, | |
497 dm_mem_fsize, | |
498 dm_mem_ftell, | |
499 dm_mem_feof, | |
500 dm_mem_fgetc, | |
59
c560703e85ed
Add resource writing functions (only work for stdio backend)
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
501 NULL, |
0 | 502 dm_mem_fread, |
59
c560703e85ed
Add resource writing functions (only work for stdio backend)
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
503 NULL, |
0 | 504 |
505 NULL, | |
166
112eb95f2fba
Improve build system granularity.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
506 dm_pack_fclose, |
0 | 507 dm_pack_preload |
508 }; | |
166
112eb95f2fba
Improve build system granularity.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
509 #endif |
0 | 510 |
511 | |
512 DMResourceOps dfMemIOFileOps = | |
513 { | |
514 dm_mem_ferror, | |
515 dm_mem_fseek, | |
516 dm_mem_fsize, | |
517 dm_mem_ftell, | |
518 dm_mem_feof, | |
519 dm_mem_fgetc, | |
59
c560703e85ed
Add resource writing functions (only work for stdio backend)
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
520 NULL, |
0 | 521 dm_mem_fread, |
59
c560703e85ed
Add resource writing functions (only work for stdio backend)
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
522 NULL, |
0 | 523 |
524 NULL, | |
525 NULL, | |
526 NULL | |
527 }; | |
528 | |
529 | |
530 /* FS file handling functions. These functions call the actual | |
531 * functions depending on where the file is located. | |
532 */ | |
26
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
533 static void dmf_init_fops(DMResource *handle) |
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
534 { |
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
535 // Check fops |
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
536 if (handle->fops == NULL) |
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
537 { |
124
d5cfd29c87c4
Rename some conditional compilation directives.
Matti Hamalainen <ccr@tnsp.org>
parents:
114
diff
changeset
|
538 #ifdef DM_USE_PACKFS |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
539 if (handle->lib->flags & DRF_USE_PACK) |
26
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
540 handle->fops = &dfPackFileOps; |
124
d5cfd29c87c4
Rename some conditional compilation directives.
Matti Hamalainen <ccr@tnsp.org>
parents:
114
diff
changeset
|
541 #ifdef DM_USE_STDIO |
26
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
542 else |
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
543 handle->fops = &dfStdioFileOps; |
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
544 #else |
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
545 handle->fops = &dfPackFileOps; |
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
546 #endif |
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
547 |
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
548 #else |
166
112eb95f2fba
Improve build system granularity.
Matti Hamalainen <ccr@tnsp.org>
parents:
124
diff
changeset
|
549 handle->fops = NULL; |
26
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
550 #endif |
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
551 } |
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
552 } |
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
553 |
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
554 |
29
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
555 int dmf_preload(DMResource *handle) |
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
556 { |
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
557 int ret = DMERR_INIT_FAIL; |
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
558 |
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
559 // Check if we want to preload raw data? |
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
560 if (((handle->flags & DMF_PRELOAD_RAW) || |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
561 (handle->lib->flags & DRF_PRELOAD_ALL)) && |
29
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
562 (handle->flags & DMF_LOADED_RAW) == 0 && |
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
563 handle->fops->preload != NULL) |
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
564 { |
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
565 ret = handle->fops->preload(handle); |
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
566 if (ret == DMERR_OK) |
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
567 { |
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
568 handle->flags |= DMF_LOADED_RAW; |
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
569 } |
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
570 } |
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
571 else |
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
572 { |
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
573 if (handle->fops->fopen != NULL) |
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
574 ret = handle->fops->fopen(handle); |
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
575 else |
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
576 if (handle->fops->preload != NULL) |
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
577 { |
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
578 ret = handle->fops->preload(handle); |
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
579 if (ret == DMERR_OK) |
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
580 { |
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
581 handle->flags |= DMF_LOADED_RAW; |
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
582 } |
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
583 } |
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
584 } |
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
585 |
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
586 // Check if resource data is to be preloaded |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
587 if (((handle->flags & DMF_PRELOAD_RES) || (handle->lib->flags & DRF_PRELOAD_RES)) && |
29
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
588 (handle->flags & DMF_LOADED_RES) == 0 && |
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
589 handle->rops != NULL && |
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
590 handle->rops->load != NULL) |
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
591 { |
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
592 ret = handle->rops->load(handle); |
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
593 if (ret == DMERR_OK) |
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
594 { |
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
595 // Okay, mark as loaded |
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
596 handle->flags |= DMF_LOADED_RES; |
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
597 |
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
598 // Check if we can purge the raw data now |
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
599 if ((handle->flags & DMF_PERSIST) == 0) |
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
600 dmres_purge_raw_data(handle); |
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
601 } |
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
602 } |
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
603 |
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
604 return ret; |
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
605 } |
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
606 |
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
607 |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
608 DMResource *dmf_open(DMResourceLib *lib, const char *filename) |
0 | 609 { |
610 int ret; | |
611 DMResource *handle; | |
612 | |
613 // Check master directory for resource | |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
614 if ((handle = dmres_find(lib, filename)) == NULL) |
0 | 615 { |
124
d5cfd29c87c4
Rename some conditional compilation directives.
Matti Hamalainen <ccr@tnsp.org>
parents:
114
diff
changeset
|
616 #ifdef DM_USE_STDIO |
0 | 617 // Hmm.. does not exist? Fall back to a stdio file |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
618 handle = dmres_new(lib, filename, 0, 0); |
0 | 619 if (handle == NULL) |
620 return NULL; | |
621 | |
622 handle->fops = &dfStdioFileOps; | |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
623 dmres_insert(lib, handle); |
0 | 624 #else |
625 // Stdio not enabled, fail | |
626 return NULL; | |
627 #endif | |
628 } | |
629 | |
29
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
630 // Initialize file ops |
26
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
631 dmf_init_fops(handle); |
0 | 632 |
633 // Check if the data is preloaded | |
26
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
634 if (handle->flags & DMF_LOADED_RAW) |
0 | 635 { |
636 dmres_ref(handle); | |
637 return handle; | |
638 } | |
639 | |
29
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
640 // Try preloading |
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
641 ret = dmf_preload(handle); |
0 | 642 |
643 if (ret == DMERR_OK) | |
26
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
644 { |
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
645 dmres_ref(handle); |
0 | 646 return handle; |
26
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
647 } |
0 | 648 |
649 return NULL; | |
650 } | |
651 | |
652 | |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
653 DMResource * dmf_create_memio(DMResourceLib *lib, const char *filename, Uint8 *buf, size_t len) |
0 | 654 { |
655 DMResource *handle; | |
656 | |
657 // Check master directory for resource | |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
658 if ((handle = dmres_find(lib, filename)) == NULL) |
0 | 659 { |
660 // Hmm.. does not exist? Fall back to a stdio file | |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
661 handle = dmres_new(lib, filename, DMF_LOADED_RAW, len); |
0 | 662 if (handle == NULL) |
663 return NULL; | |
664 | |
665 handle->fops = &dfMemIOFileOps; | |
666 handle->data = buf; | |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
667 dmres_insert(lib, handle); |
0 | 668 } |
669 | |
670 // Increase refcount | |
671 dmres_ref(handle); | |
672 | |
673 return handle; | |
674 } | |
675 | |
676 | |
124
d5cfd29c87c4
Rename some conditional compilation directives.
Matti Hamalainen <ccr@tnsp.org>
parents:
114
diff
changeset
|
677 #ifdef DM_USE_STDIO |
74
23ac82365a65
Add file mode to dmf_create_stdio().
Matti Hamalainen <ccr@tnsp.org>
parents:
72
diff
changeset
|
678 DMResource * dmf_create_stdio(const char *filename, const char *mode) |
0 | 679 { |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
680 DMResource *handle = dmres_new(NULL, filename, 0, 0); |
0 | 681 if (handle == NULL) |
682 return NULL; | |
683 | |
684 handle->fops = &dfStdioFileOps; | |
685 | |
74
23ac82365a65
Add file mode to dmf_create_stdio().
Matti Hamalainen <ccr@tnsp.org>
parents:
72
diff
changeset
|
686 handle->fh = fopen(filename, mode); |
0 | 687 handle->error = dmGetErrno(); |
688 | |
689 if (handle->fh != NULL) | |
690 { | |
691 dmres_ref(handle); | |
692 return handle; | |
693 } | |
694 else | |
695 { | |
696 dmres_free(handle); | |
697 return NULL; | |
698 } | |
699 } | |
700 | |
701 | |
702 DMResource * dmf_create_stdio_stream(FILE *fh) | |
703 { | |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
704 DMResource *handle = dmres_new(NULL, "", 0, 0); |
0 | 705 if (handle == NULL) |
706 return NULL; | |
707 | |
708 handle->fops = &dfStdioFHOps; | |
709 handle->fh = fh; | |
710 dmres_ref(handle); | |
711 return handle; | |
712 } | |
713 #endif | |
714 | |
715 | |
716 void dmf_close(DMResource * f) | |
717 { | |
718 if (f == NULL) | |
719 return; | |
720 | |
721 if (f->fops->fclose != NULL) | |
722 f->fops->fclose(f); | |
723 | |
724 dmres_unref(f); | |
725 } | |
726 | |
727 | |
728 int dmferror(DMResource * f) | |
729 { | |
730 f->atime = time(NULL); | |
731 return f->fops->ferror(f); | |
732 } | |
733 | |
734 int dmfseek(DMResource * f, off_t offset, int whence) | |
735 { | |
736 f->atime = time(NULL); | |
737 return f->fops->fseek(f, offset, whence); | |
738 } | |
739 | |
740 off_t dmfsize(DMResource * f) | |
741 { | |
742 f->atime = time(NULL); | |
743 return f->fops->fsize(f); | |
744 } | |
745 | |
746 off_t dmftell(DMResource * f) | |
747 { | |
748 f->atime = time(NULL); | |
749 return f->fops->ftell(f); | |
750 } | |
751 | |
752 BOOL dmfeof(DMResource * f) | |
753 { | |
754 f->atime = time(NULL); | |
755 return f->fops->feof(f); | |
756 } | |
757 | |
758 int dmfgetc(DMResource * f) | |
759 { | |
760 f->atime = time(NULL); | |
761 return f->fops->fgetc(f); | |
762 } | |
763 | |
74
23ac82365a65
Add file mode to dmf_create_stdio().
Matti Hamalainen <ccr@tnsp.org>
parents:
72
diff
changeset
|
764 int dmfputc(int v, DMResource * f) |
72
be6160981428
Improve and finish write functions in resource subsystem.
Matti Hamalainen <ccr@tnsp.org>
parents:
59
diff
changeset
|
765 { |
be6160981428
Improve and finish write functions in resource subsystem.
Matti Hamalainen <ccr@tnsp.org>
parents:
59
diff
changeset
|
766 f->atime = time(NULL); |
be6160981428
Improve and finish write functions in resource subsystem.
Matti Hamalainen <ccr@tnsp.org>
parents:
59
diff
changeset
|
767 return f->fops->fputc(v, f); |
be6160981428
Improve and finish write functions in resource subsystem.
Matti Hamalainen <ccr@tnsp.org>
parents:
59
diff
changeset
|
768 } |
be6160981428
Improve and finish write functions in resource subsystem.
Matti Hamalainen <ccr@tnsp.org>
parents:
59
diff
changeset
|
769 |
0 | 770 size_t dmfread(void *ptr, size_t size, size_t nmemb, DMResource * f) |
771 { | |
772 f->atime = time(NULL); | |
773 return f->fops->fread(ptr, size, nmemb, f); | |
774 } | |
775 | |
72
be6160981428
Improve and finish write functions in resource subsystem.
Matti Hamalainen <ccr@tnsp.org>
parents:
59
diff
changeset
|
776 size_t dmfwrite(void *ptr, size_t size, size_t nmemb, DMResource * f) |
be6160981428
Improve and finish write functions in resource subsystem.
Matti Hamalainen <ccr@tnsp.org>
parents:
59
diff
changeset
|
777 { |
be6160981428
Improve and finish write functions in resource subsystem.
Matti Hamalainen <ccr@tnsp.org>
parents:
59
diff
changeset
|
778 f->atime = time(NULL); |
be6160981428
Improve and finish write functions in resource subsystem.
Matti Hamalainen <ccr@tnsp.org>
parents:
59
diff
changeset
|
779 return f->fops->fwrite(ptr, size, nmemb, f); |
be6160981428
Improve and finish write functions in resource subsystem.
Matti Hamalainen <ccr@tnsp.org>
parents:
59
diff
changeset
|
780 } |
be6160981428
Improve and finish write functions in resource subsystem.
Matti Hamalainen <ccr@tnsp.org>
parents:
59
diff
changeset
|
781 |
235 | 782 char *dmfgets(char *s, int size, DMResource * f) |
783 { | |
784 char *p = s, c; | |
785 int n = 0; | |
786 | |
787 while ((c = f->fops->fgetc(f)) != EOF) | |
788 { | |
237
6d9d43bb68eb
Oops, another silly issue in dmfgets().
Matti Hamalainen <ccr@tnsp.org>
parents:
236
diff
changeset
|
789 n++; |
235 | 790 if (c == '\n') |
791 break; | |
792 else | |
793 if (n < size - 1) | |
794 *p++ = c; | |
795 } | |
796 *p = 0; | |
797 | |
236
8189be40ed7c
Oops, dmfgets() had a nasty think-o and counted the remaining buffer space
Matti Hamalainen <ccr@tnsp.org>
parents:
235
diff
changeset
|
798 return (n > 0) ? s : NULL; |
235 | 799 } |
800 | |
801 | |
27
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
802 int dmres_ref(DMResource *node) |
0 | 803 { |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
804 if (node->lib != NULL) dmMutexLock(node->lib->mutex); |
27
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
805 node->atime = time(NULL); |
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
806 node->refcount++; |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
807 if (node->lib != NULL) dmMutexUnlock(node->lib->mutex); |
0 | 808 |
27
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
809 return node->refcount; |
0 | 810 } |
811 | |
812 | |
27
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
813 int dmres_unref(DMResource *node) |
0 | 814 { |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
815 if (node->lib != NULL) dmMutexLock(node->lib->mutex); |
27
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
816 node->refcount--; |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
817 if (node->lib != NULL) dmMutexUnlock(node->lib->mutex); |
0 | 818 |
27
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
819 return node->refcount; |
0 | 820 } |
821 | |
822 | |
114
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
823 #define NADDFLAG(flg, ch) \ |
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
824 do { \ |
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
825 if ((flags & (flg)) && offs < size - 1) \ |
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
826 str[offs++] = ch; \ |
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
827 } while (0) |
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
828 |
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
829 void dmres_flags_to_symbolic(char *str, size_t size, int flags) |
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
830 { |
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
831 size_t offs = 0; |
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
832 NADDFLAG(DMF_PRELOAD_RAW, 'r'); |
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
833 NADDFLAG(DMF_PRELOAD_RES, 'e'); |
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
834 NADDFLAG(DMF_PERSIST, 'p'); |
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
835 NADDFLAG(DMF_STREAM, 's'); |
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
836 if (offs < size) |
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
837 str[offs] = 0; |
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
838 } |
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
839 |
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
840 #undef NADDFLAG |
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
841 |
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
842 |
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
843 int dmres_symbolic_to_flags(const char *str) |
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
844 { |
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
845 int offs, flags; |
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
846 |
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
847 for (flags = offs = 0; str[offs]; offs++) |
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
848 switch (tolower(str[offs])) |
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
849 { |
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
850 case 'r': flags |= DMF_PRELOAD_RAW; break; |
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
851 case 'e': flags |= DMF_PRELOAD_RES; break; |
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
852 case 'p': flags |= DMF_PERSIST; break; |
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
853 case 's': flags |= DMF_STREAM; break; |
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
854 } |
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
855 return flags; |
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
856 } |
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
857 |
e9de22e5a6d5
Add functions for converting resource flags to symbolic string form and back.
Matti Hamalainen <ccr@tnsp.org>
parents:
107
diff
changeset
|
858 |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
859 int dmres_load_resfile(DMResourceLib *lib, const char *filename) |
0 | 860 { |
33 | 861 int ret = DMERR_OK; |
0 | 862 char line[256]; |
863 FILE *f = fopen(filename, "r"); | |
864 if (f == NULL) | |
865 return DMERR_FOPEN; | |
866 | |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
867 dmMutexLock(lib->mutex); |
0 | 868 |
869 while (fgets(line, sizeof(line) - 1, f) != NULL) | |
870 { | |
871 int fnstart, fsep; | |
872 for (fnstart = 0; isspace(line[fnstart]); fnstart++); | |
873 for (fsep = fnstart; line[fsep] && line[fsep] != '|'; fsep++); | |
874 if (line[fsep] == '|') | |
875 { | |
876 int flags, i; | |
877 for (i = fsep - 1; i > 0 && isspace(line[i]); i--) | |
878 line[i] = 0; | |
879 | |
880 for (i = fsep; isspace(line[i]); i++); | |
881 } | |
882 } | |
883 | |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
884 dmMutexUnlock(lib->mutex); |
0 | 885 fclose(f); |
33 | 886 |
0 | 887 return ret; |
888 } | |
889 | |
890 | |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
891 int dmres_write_resfile(DMResourceLib *lib, const char *filename) |
0 | 892 { |
893 int ret; | |
894 DMResource *node; | |
895 FILE *f = fopen(filename, "w"); | |
896 if (f == NULL) | |
897 return DMERR_FOPEN; | |
898 | |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
899 dmMutexLock(lib->mutex); |
0 | 900 |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
901 for (node = lib->resources; node != NULL; node = node->next) |
0 | 902 { |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
903 char tmp[64]; |
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
904 dmres_flags_to_symbolic(tmp, sizeof(tmp), node->flags); |
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
905 if (fprintf(f, "%s|%s\n", node->filename, tmp) < 0) |
0 | 906 { |
907 ret = DMERR_FWRITE; | |
908 goto error; | |
909 } | |
910 } | |
911 | |
912 error: | |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
913 dmMutexUnlock(lib->mutex); |
0 | 914 fclose(f); |
915 return ret; | |
916 } | |
917 | |
918 | |
919 /* Resources subsystem initialization and shutdown routines | |
920 */ | |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
921 int dmres_init(DMResourceLib **plib, const char *filename, const char *path, const int flags, int (*classifier)(DMResource *)) |
0 | 922 { |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
923 DMResourceLib *lib; |
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
924 |
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
925 // Allocate the resource library structure |
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
926 if ((*plib = lib = dmMalloc0(sizeof(DMResourceLib))) == NULL) |
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
927 return DMERR_MALLOC; |
0 | 928 |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
929 // Basic data |
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
930 lib->mutex = dmCreateMutex(); |
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
931 lib->flags = flags; |
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
932 lib->resPath = dm_strdup((path != NULL) ? path : DMRES_DATA_PATH); |
0 | 933 |
107 | 934 |
0 | 935 if (flags & DRF_USE_PACK) |
936 { | |
124
d5cfd29c87c4
Rename some conditional compilation directives.
Matti Hamalainen <ccr@tnsp.org>
parents:
114
diff
changeset
|
937 #ifdef DM_USE_PACKFS |
0 | 938 int ret; |
939 DMPackEntry *node; | |
940 | |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
941 lib->packFilename = dm_strdup((filename != NULL) ? filename : DMRES_DATA_PACK); |
0 | 942 |
943 // Initialize PACK, open as read-only | |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
944 ret = dm_pack_open(lib->packFilename, &lib->packFile, TRUE); |
0 | 945 if (ret != DMERR_OK) |
946 { | |
947 dmError("Error opening PACK file '%s', #%i: %s\n", | |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
948 lib->packFilename, ret, dmErrorStr(ret)); |
0 | 949 |
950 return DMERR_INIT_FAIL; | |
951 } | |
952 | |
953 // Initialize resources from a PACK file | |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
954 for (node = lib->packFile->entries; node != NULL; node = node->next) |
0 | 955 { |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
956 DMResource *res = dmres_new(lib, node->filename, node->resFlags & DMF_MASK, node->size); |
0 | 957 if (res == NULL) |
958 { | |
959 dmError("Could not allocate memory for resource node '%s' [0x%08x], %d.\n", | |
960 node->filename, node->resFlags, node->size); | |
961 return DMERR_INIT_FAIL; | |
962 } | |
963 | |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
964 dmres_insert(lib, res); |
0 | 965 } |
966 | |
967 #else | |
968 // PACK not compiled in, FAIL! | |
969 return DMERR_INIT_FAIL; | |
970 #endif | |
971 } | |
972 else | |
973 { | |
974 // Initialize resources from a resource directory | |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
975 char *resFilename = dm_strdup_printf("%s%s", lib->resPath, DMRES_RES_FILE); |
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
976 int ret = dmres_load_resfile(lib, resFilename); |
0 | 977 dmFree(resFilename); |
978 | |
979 if (ret != DMERR_OK) | |
980 return DMERR_INIT_FAIL; | |
981 } | |
982 | |
26
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
983 // Okay, classify resources |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
984 if (lib->resources != NULL && classifier != NULL) |
26
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
985 { |
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
986 DMResource *node; |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
987 for (node = lib->resources; node != NULL; node = node->next) |
26
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
988 { |
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
989 int ret = classifier(node); |
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
990 if (ret != DMERR_OK) |
107 | 991 return ret; |
26
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
992 } |
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
993 } |
0 | 994 |
995 // Initialization complete | |
996 return DMERR_OK; | |
997 } | |
998 | |
999 | |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1000 int dmres_close(DMResourceLib *lib) |
0 | 1001 { |
1002 DMResource *node; | |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1003 |
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1004 if (lib == NULL) |
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1005 return DMERR_NULLPTR; |
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1006 |
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1007 dmMutexLock(lib->mutex); |
0 | 1008 |
1009 // Shutdown possible subsystems | |
124
d5cfd29c87c4
Rename some conditional compilation directives.
Matti Hamalainen <ccr@tnsp.org>
parents:
114
diff
changeset
|
1010 #ifdef DM_USE_PACKFS |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1011 if (lib->flags & DRF_USE_PACK) |
0 | 1012 { |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1013 int res = dm_pack_close(lib->packFile); |
0 | 1014 if (res != DMERR_OK) |
1015 { | |
1016 dmError("Error closing PACK, #%i: %s\n", | |
1017 res, dmErrorStr(res)); | |
1018 } | |
1019 | |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1020 dmFree(lib->packFilename); |
0 | 1021 } |
1022 #endif | |
1023 | |
1024 // Free resource entries | |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1025 node = lib->resources; |
0 | 1026 while (node != NULL) |
1027 { | |
1028 DMResource *next = node->next; | |
1029 dmres_free(node); | |
1030 node = next; | |
1031 } | |
1032 | |
1033 // Etc. | |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1034 dmFree(lib->resPath); |
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1035 dmMutexUnlock(lib->mutex); |
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1036 dmDestroyMutex(lib->mutex); |
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1037 return DMERR_OK; |
0 | 1038 } |
1039 | |
1040 | |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1041 int dmres_preload(DMResourceLib *lib, BOOL start, int *loaded, int *total) |
0 | 1042 { |
26
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1043 int ret = DMERR_OK; |
0 | 1044 |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1045 dmMutexLock(lib->mutex); |
0 | 1046 |
26
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1047 // Initialize preloading |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1048 if (lib->preload == NULL || start) |
0 | 1049 { |
1050 DMResource *node; | |
26
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1051 |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1052 lib->preload = lib->resources; |
0 | 1053 *loaded = 0; |
1054 *total = 0; | |
26
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1055 |
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1056 // Calculate total number of resources to be preloaded |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1057 for (node = lib->resources; node != NULL; node = node->next) |
0 | 1058 { |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1059 if ((lib->flags & (DRF_PRELOAD_ALL | DRF_PRELOAD_RES)) || |
26
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1060 (node->flags & (DMF_PRELOAD_RAW | DMF_PRELOAD_RES))) |
0 | 1061 (*total)++; |
1062 } | |
1063 } | |
26
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1064 else |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1065 if (lib->preload != NULL) |
0 | 1066 { |
29
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1067 // Initialize fops and preload |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1068 dmf_init_fops(lib->preload); |
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1069 if ((ret = dmf_preload(lib->preload)) != DMERR_OK) |
29
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1070 goto error; |
26
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1071 |
29
e9f562f07cb0
Modularize some more and fix a nasty bug when raw data is not preloaded but
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
1072 (*loaded)++; |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1073 lib->preload = lib->preload->next; |
0 | 1074 } |
1075 | |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1076 dmMutexUnlock(lib->mutex); |
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1077 return (lib->preload == NULL) ? DMERR_OK : DMERR_PROGRESS; |
26
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1078 |
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1079 error: |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1080 dmMutexUnlock(lib->mutex); |
26
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1081 return ret; |
0 | 1082 } |
1083 | |
1084 | |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1085 void dmres_prune(DMResourceLib *lib, int agems, int flags) |
0 | 1086 { |
26
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1087 DMResource *node; |
0 | 1088 int currtime = time(NULL); |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1089 dmMutexLock(lib->mutex); |
0 | 1090 |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1091 for (node = lib->resources; node != NULL; node = node->next) |
0 | 1092 { |
1093 // Check if node has refcount of 0 and is | |
1094 // not marked as persistent resource | |
26
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1095 if (node->refcount == 0 && |
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1096 (node->flags & DMF_PERSIST) == 0 && |
2f463a59d732
Implement rudimentary resource system.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1097 (node->flags & (DMF_LOADED_RES | DMF_LOADED_RAW))) |
0 | 1098 { |
1099 // Check if we match either one of atime or mtime | |
1100 if (((flags & DMPRUNE_ATIME) && | |
1101 currtime - node->atime >= agems) || | |
1102 ((flags & DMPRUNE_MTIME) && | |
1103 currtime - node->mtime >= agems)) | |
1104 { | |
27
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
1105 dmres_free_res_data(node); |
21c14afbf63d
Modularize the resource system a bit.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
1106 dmres_free_raw_data(node); |
0 | 1107 } |
1108 } | |
1109 } | |
1110 | |
359
59045853853d
Make resource management re-entrant.
Matti Hamalainen <ccr@tnsp.org>
parents:
237
diff
changeset
|
1111 dmMutexUnlock(lib->mutex); |
0 | 1112 } |
1113 | |
1114 | |
1115 /* Helper resource access routines | |
1116 */ | |
1117 int dmf_read_str(DMResource *f, Uint8 *s, size_t l) | |
1118 { | |
1119 return dmfread(s, sizeof(Uint8), l, f) == l; | |
1120 } | |
1121 | |
1122 | |
1123 #define DM_DEFINE_FUNC(xname, xtype, xmacro) \ | |
1124 BOOL dmf_read_ ## xname (DMResource *f, xtype *v) { \ | |
1125 xtype result; \ | |
1126 if (dmfread(&result, sizeof( xtype ), 1, f) != 1) \ | |
1127 return FALSE; \ | |
1128 *v = DM_ ## xmacro ## _TO_NATIVE (result); \ | |
1129 return TRUE; \ | |
1130 } | |
1131 | |
1132 DM_DEFINE_FUNC(le16, Uint16, LE16) | |
1133 DM_DEFINE_FUNC(le32, Uint32, LE32) | |
1134 | |
1135 DM_DEFINE_FUNC(be16, Uint16, BE16) | |
1136 DM_DEFINE_FUNC(be32, Uint32, BE32) | |
1137 | |
1138 #ifdef DM_HAVE_64BIT | |
1139 DM_DEFINE_FUNC(le64, Uint64, LE64) | |
1140 DM_DEFINE_FUNC(be64, Uint64, BE64) | |
1141 #endif |