mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-04 12:40:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make rarch_zlib.c more generic

Browse Source
This commit is contained in:
twinaphex 2013-01-11 23:04:46 +01:00
parent f21c998cc7
commit 5b63da79db
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
console/rarch_zlib.c
View File

@ -42,12 +42,18 @@
#define WRITEBUFFERSIZE (1024 * 512) #define WRITEBUFFERSIZE (1024 * 512)
static int rarch_zlib_extract_file(unzFile uf, static int rarch_zlib_extract_file(unzFile uf,
const char *current_dir, char *slash, char *write_filename, const char *current_dir, char *write_filename,
size_t write_filename_size, unsigned extract_zip_mode) size_t write_filename_size, unsigned extract_zip_mode)
{ {
char filename_inzip[PATH_MAX]; char filename_inzip[PATH_MAX];
bool is_dir = false; bool is_dir = false;
FILE *file_out = NULL; FILE *file_out = NULL;
char slash;
#if defined(_WIN32)
slash = '\\';
#else
slash = '/';
#endif
unz_file_info file_info; unz_file_info file_info;
int ret = unzGetCurrentFileInfo(uf, int ret = unzGetCurrentFileInfo(uf,
@ -72,7 +78,7 @@ static int rarch_zlib_extract_file(unzFile uf,
{ {
case ZIP_EXTRACT_TO_CURRENT_DIR: case ZIP_EXTRACT_TO_CURRENT_DIR:
case ZIP_EXTRACT_TO_CURRENT_DIR_AND_LOAD_FIRST_FILE: case ZIP_EXTRACT_TO_CURRENT_DIR_AND_LOAD_FIRST_FILE:
snprintf(write_filename, write_filename_size, "%s%s%s", current_dir, slash, filename_inzip); snprintf(write_filename, write_filename_size, "%s%c%s", current_dir, slash, filename_inzip);
break; break;
#if defined(HAVE_HDD_CACHE_PARTITION) #if defined(HAVE_HDD_CACHE_PARTITION)
case ZIP_EXTRACT_TO_CACHE_DIR: case ZIP_EXTRACT_TO_CACHE_DIR:
@ -169,13 +175,7 @@ int rarch_zlib_extract_archive(const char *zip_path, char *first_file,
for (unsigned i = 0; i < gi.number_entry; i++) for (unsigned i = 0; i < gi.number_entry; i++)
{ {
static char write_filename[PATH_MAX]; static char write_filename[PATH_MAX];
char slash[6]; if (rarch_zlib_extract_file(uf, dir_path, write_filename, sizeof(write_filename), extract_zip_mode) != UNZ_OK)
#ifdef _XBOX
snprintf(slash, sizeof(slash), "\\");
#else
snprintf(slash, sizeof(slash), "/");
#endif
if (rarch_zlib_extract_file(uf, dir_path, slash, write_filename, sizeof(write_filename), extract_zip_mode) != UNZ_OK)
{ {
RARCH_ERR("Failed to extract current file from ZIP archive.\n"); RARCH_ERR("Failed to extract current file from ZIP archive.\n");
break; break;