Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Windows: Properly check for hidden files when enumerating files

Browse source
This commit is contained in:
Silent 2019-06-27 10:37:49 +02:00
parent 71ab845564
commit 2479427992
No known key found for this signature in database
GPG key ID: AE53149BB0C45AF1
1 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
ext/native/file/file_util.cpp
View file

@ -211,20 +211,19 @@ bool FileInfo::operator <(const FileInfo &other) const {
size_t getFilesInDir(const char *directory, std::vector<FileInfo> *files, const char *filter, int flags) { size_t getFilesInDir(const char *directory, std::vector<FileInfo> *files, const char *filter, int flags) {
size_t foundEntries = 0; size_t foundEntries = 0;
std::set<std::string> filters; std::set<std::string> filters;
std::string tmp;
if (filter) { if (filter) {
std::string tmp;
while (*filter) { while (*filter) {
if (*filter == ':') { if (*filter == ':') {
filters.insert(tmp); filters.insert(std::move(tmp));
tmp = "";
} else { } else {
tmp.push_back(*filter); tmp.push_back(*filter);
} }
filter++; filter++;
} }
if (!tmp.empty())
filters.insert(std::move(tmp));
} }
if (tmp.size())
filters.insert(tmp);
#ifdef _WIN32 #ifdef _WIN32
// Find the first file in the directory. // Find the first file in the directory.
WIN32_FIND_DATA ffd; WIN32_FIND_DATA ffd;
@ -252,14 +251,20 @@ size_t getFilesInDir(const char *directory, std::vector<FileInfo> *files, const
const std::string virtualName(result->d_name); const std::string virtualName(result->d_name);
#endif #endif
// check for "." and ".." // check for "." and ".."
if (((virtualName[0] == '.') && (virtualName[1] == '\0')) || if (virtualName == "." || virtualName == "..")
((virtualName[0] == '.') && (virtualName[1] == '.') &&
(virtualName[2] == '\0')))
continue; continue;
// Remove dotfiles (optional with flag.) // Remove dotfiles (optional with flag.)
if (!(flags & GETFILES_GETHIDDEN) && virtualName[0] == '.') if (!(flags & GETFILES_GETHIDDEN))
continue; {
#ifdef _WIN32
if ((ffd.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN) != 0)
continue;
#else
if (virtualName[0] == '.')
continue;
#endif
}
FileInfo info; FileInfo info;
info.name = virtualName; info.name = virtualName;
@ -283,7 +288,7 @@ size_t getFilesInDir(const char *directory, std::vector<FileInfo> *files, const
} }
if (files) if (files)
files->push_back(info); files->push_back(std::move(info));
foundEntries++; foundEntries++;
#ifdef _WIN32 #ifdef _WIN32
} while (FindNextFile(hFind, &ffd) != 0); } while (FindNextFile(hFind, &ffd) != 0);