mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-11 00:44:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor zlib_parse_filer.prx

Browse Source
This commit is contained in:
twinaphex 2015-05-26 23:28:40 +02:00
parent 8e8267b708
commit 6a7ab12dc1
1 changed files with 49 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
libretro-common/file/file_extract.c
View File

@ -489,6 +489,44 @@ typedef struct zlib_transfer
const struct zlib_file_backend *backend; const struct zlib_file_backend *backend;
} zlib_transfer_t; } zlib_transfer_t;
int zlib_parse_file_iterate(zlib_transfer_t *state, char *filename,
const uint8_t **cdata,
unsigned *cmode, uint32_t *size, uint32_t *csize,
uint32_t *checksum, unsigned *payback)
{
uint32_t offset;
uint32_t namelength, extralength, commentlength,
offsetNL, offsetEL;
uint32_t signature = read_le(state->directory + 0, 4);
if (signature != CENTRAL_FILE_HEADER_SIGNATURE)
return 0;
*cmode = read_le(state->directory + 10, 2);
*checksum = read_le(state->directory + 16, 4);
*csize = read_le(state->directory + 20, 4);
*size = read_le(state->directory + 24, 4);
namelength = read_le(state->directory + 28, 2);
extralength = read_le(state->directory + 30, 2);
commentlength = read_le(state->directory + 32, 2);
if (namelength >= PATH_MAX_LENGTH)
return -1;
memcpy(filename, state->directory + 46, namelength);
offset = read_le(state->directory + 42, 4);
offsetNL = read_le(state->data + offset + 26, 2);
offsetEL = read_le(state->data + offset + 28, 2);
*cdata = state->data + offset + 30 + offsetNL + offsetEL;
*payback = 46 + namelength + extralength + commentlength;
return 1;
}
/** /**
* zlib_parse_file: * zlib_parse_file:
* @file : filename path of archive * @file : filename path of archive
@ -542,36 +580,21 @@ bool zlib_parse_file(const char *file, const char *valid_exts,
for (;;) for (;;)
{ {
uint32_t checksum, csize, size, offset;
unsigned cmode, namelength, extralength, commentlength,
offsetNL, offsetEL;
char filename[PATH_MAX_LENGTH] = {0};
const uint8_t *cdata = NULL; const uint8_t *cdata = NULL;
uint32_t signature = read_le(state.directory + 0, 4); uint32_t checksum = 0;
uint32_t size = 0;
uint32_t csize = 0;
unsigned cmode = 0;
unsigned payload = 0;
char filename[PATH_MAX_LENGTH] = {0};
int ret = zlib_parse_file_iterate(&state, filename, &cdata, &cmode, &size, &csize,
&checksum, &payload);
if (signature != CENTRAL_FILE_HEADER_SIGNATURE) if (ret == 0)
break; break;
if (ret == -1)
cmode = read_le(state.directory + 10, 2);
checksum = read_le(state.directory + 16, 4);
csize = read_le(state.directory + 20, 4);
size = read_le(state.directory + 24, 4);
namelength = read_le(state.directory + 28, 2);
extralength = read_le(state.directory + 30, 2);
commentlength = read_le(state.directory + 32, 2);
if (namelength >= PATH_MAX_LENGTH)
GOTO_END_ERROR(); GOTO_END_ERROR();
memcpy(filename, state.directory + 46, namelength);
offset = read_le(state.directory + 42, 4);
offsetNL = read_le(state.data + offset + 26, 2);
offsetEL = read_le(state.data + offset + 28, 2);
cdata = state.data + offset + 30 + offsetNL + offsetEL;
#if 0 #if 0
RARCH_LOG("OFFSET: %u, CSIZE: %u, SIZE: %u.\n", offset + 30 + RARCH_LOG("OFFSET: %u, CSIZE: %u, SIZE: %u.\n", offset + 30 +
offsetNL + offsetEL, csize, size); offsetNL + offsetEL, csize, size);
@ -581,7 +604,7 @@ bool zlib_parse_file(const char *file, const char *valid_exts,
csize, size, checksum, userdata)) csize, size, checksum, userdata))
break; break;
state.directory += 46 + namelength + extralength + commentlength; state.directory += payload;
} }
end: end: