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

(file_ops) 7z cleanups

Browse Source
This commit is contained in:
twinaphex 2015-12-01 19:14:59 +01:00
parent cb0c8497c9
commit 263b2de885
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
file_ops.c
View File

@ -138,7 +138,7 @@ static SRes Utf16_To_Utf8Buf(CBuf *dest,
static SRes Utf16_To_Char(CBuf *buf, const uint16_t *s, int fileMode) static SRes Utf16_To_Char(CBuf *buf, const uint16_t *s, int fileMode)
{ {
int len = 0; unsigned len = 0;
for (len = 0; s[len] != '\0'; len++); for (len = 0; s[len] != '\0'; len++);
@ -172,16 +172,16 @@ static SRes Utf16_To_Char(CBuf *buf, const uint16_t *s, int fileMode)
#endif #endif
} }
static SRes ConvertUtf16toCharString(const uint16_t *s, char *outstring) static SRes ConvertUtf16toCharString(const uint16_t *in, char *s, size_t len)
{ {
CBuf buf; CBuf buf;
SRes res; SRes res;
Buf_Init(&buf); Buf_Init(&buf);
res = Utf16_To_Char(&buf, s, 0); res = Utf16_To_Char(&buf, in, 0);
if (res == SZ_OK) if (res == SZ_OK)
strncpy(outstring, (const char*)buf.data, PATH_MAX_LENGTH); strlcpy(s, (const char*)buf.data, len);
Buf_Free(&buf, &g_Alloc); Buf_Free(&buf, &g_Alloc);
return res; return res;
@ -222,7 +222,7 @@ static int read_7zip_file(
} }
else else
{ {
RARCH_LOG_OUTPUT("Openend archive %s. Now trying to extract %s\n", RARCH_LOG_OUTPUT("Opened archive %s. Now trying to extract %s\n",
archive_path,relative_path); archive_path,relative_path);
} }
@ -268,7 +268,7 @@ static int read_7zip_file(
} }
SzArEx_GetFileNameUtf16(&db, i, temp); SzArEx_GetFileNameUtf16(&db, i, temp);
res = ConvertUtf16toCharString(temp,infile); res = ConvertUtf16toCharString(temp, infile, sizeof(infile));
if (!strcmp(infile, relative_path)) if (!strcmp(infile, relative_path))
{ {
@ -419,7 +419,7 @@ static struct string_list *compressed_7zip_file_list_new(
} }
} }
SzArEx_GetFileNameUtf16(&db, i, temp); SzArEx_GetFileNameUtf16(&db, i, temp);
res = ConvertUtf16toCharString(temp, infile); res = ConvertUtf16toCharString(temp, infile, sizeof(infile));
file_ext = path_get_extension(infile); file_ext = path_get_extension(infile);
if (string_list_find_elem_prefix(ext_list, ".", file_ext)) if (string_list_find_elem_prefix(ext_list, ".", file_ext))