Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-03 17:08:39 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix phantom files in archives containing directories

Browse Source
This commit is contained in:
Vas Crabb 2016-04-10 15:35:24 +10:00
parent e594366857
commit 760b4bd93b
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/lib/util/zippath.cpp
View File

@ -925,11 +925,6 @@ static const char *get_relative_path(zippath_directory const &directory)
const osd_directory_entry *zippath_readdir(zippath_directory *directory) const osd_directory_entry *zippath_readdir(zippath_directory *directory)
{ {
const osd_directory_entry *result = nullptr; const osd_directory_entry *result = nullptr;
int header;
const char *relpath;
const char *separator;
const char *s;
zippath_returned_directory *rdent;
if (!directory->returned_parent) if (!directory->returned_parent)
{ {
@ -960,37 +955,36 @@ const osd_directory_entry *zippath_readdir(zippath_directory *directory)
} }
else if (directory->zipfile) else if (directory->zipfile)
{ {
char const *relpath;
do do
{ {
/* a zip file read */ /* a zip file read */
int header;
do do
{ {
if (!directory->called_zip_first) header = directory->called_zip_first ? directory->zipfile->next_file() : directory->zipfile->first_file();
header = directory->zipfile->first_file();
else
header = directory->zipfile->next_file();
directory->called_zip_first = true; directory->called_zip_first = true;
relpath = nullptr; relpath = nullptr;
} }
while((header >= 0) && ((relpath = get_relative_path(*directory)) == nullptr)); while ((header >= 0) && ((relpath = get_relative_path(*directory)) == nullptr));
if (relpath != nullptr) if (relpath)
{ {
/* we've found a ZIP entry; but this may be an entry deep within the target directory */ /* we've found a ZIP entry; but this may be an entry deep within the target directory */
for (s = relpath; *s && !is_zip_file_separator(*s); s++) char const *separator = relpath;
; while (*separator && !is_zip_file_separator(*separator)) separator++;
separator = *s ? s : nullptr;
if (separator != nullptr) if (*separator || directory->zipfile->current_is_directory())
{ {
/* a nested entry; loop through returned_dirlist to see if we've returned the parent directory */ /* a nested entry; loop through returned_dirlist to see if we've returned the parent directory */
zippath_returned_directory *rdent;
for (rdent = directory->returned_dirlist; rdent != nullptr; rdent = rdent->next) for (rdent = directory->returned_dirlist; rdent != nullptr; rdent = rdent->next)
{ {
if (!core_strnicmp(rdent->name.c_str(), relpath, separator - relpath)) if (!core_strnicmp(rdent->name.c_str(), relpath, separator - relpath + 1))
break; break;
} }
if (rdent == nullptr) if (!rdent)
{ {
/* we've found a new directory; add this to returned_dirlist */ /* we've found a new directory; add this to returned_dirlist */
rdent = new zippath_returned_directory; rdent = new zippath_returned_directory;
@ -1016,7 +1010,7 @@ const osd_directory_entry *zippath_readdir(zippath_directory *directory)
} }
} }
} }
while((relpath != nullptr) && (result == nullptr)); while (relpath && !result);
} }
return result; return result;
} }