The-Homebrew-Cloud/ContentRedirectionModule
2
0
Fork 0
mirror of https://github.com/wiiu-env/ContentRedirectionModule.git synced 2024-06-03 07:58:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make sure all path checks are case-insensitive

Browse Source
This commit is contained in:
Maschell 2024-05-08 11:14:59 +02:00
parent 60b711cf81
commit 45efb02d27
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/FSWrapper.cpp
View File

@ -83,7 +83,7 @@ FSError FSWrapper::FSReadDirWrapper(FSDirectoryHandle handle, FSDirectoryEntry *
struct dirent *entry_ = readdir(dir); struct dirent *entry_ = readdir(dir);
if (entry_) { if (entry_) {
if (SkipDeletedFilesInReadDir() && std::string_view(entry_->d_name).starts_with(deletePrefix)) { if (SkipDeletedFilesInReadDir() && starts_with_case_insensitive(entry_->d_name, deletePrefix)) {
DEBUG_FUNCTION_LINE_ERR("Skip file file name %s because of the prefix", entry_->d_name); DEBUG_FUNCTION_LINE_ERR("Skip file file name %s because of the prefix", entry_->d_name);
continue; continue;
} }
@ -317,7 +317,7 @@ FSError FSWrapper::FSCloseFileWrapper(FSFileHandle handle) {
bool FSWrapper::CheckFileShouldBeIgnored(std::string &path) { bool FSWrapper::CheckFileShouldBeIgnored(std::string &path) {
auto asPath = std::filesystem::path(path); auto asPath = std::filesystem::path(path);
if (std::string(asPath.filename().c_str()).starts_with(deletePrefix)) { if (starts_with_case_insensitive(asPath.filename().c_str(), deletePrefix)) {
DEBUG_FUNCTION_LINE_VERBOSE("[%s] Ignore %s, filename starts with %s", getName().c_str(), path.c_str(), deletePrefix.c_str()); DEBUG_FUNCTION_LINE_VERBOSE("[%s] Ignore %s, filename starts with %s", getName().c_str(), path.c_str(), deletePrefix.c_str());
return true; return true;
} }
@ -673,8 +673,9 @@ bool FSWrapper::IsFileModeAllowed(const char *mode) {
return false; return false;
} }
bool FSWrapper::IsPathToReplace(const std::string_view &path) { bool FSWrapper::IsPathToReplace(const std::string_view &path) {
return path.starts_with(pPathToReplace); return starts_with_case_insensitive(path, pPathToReplace);
} }
std::string FSWrapper::GetNewPath(const std::string_view &path) { std::string FSWrapper::GetNewPath(const std::string_view &path) {

3
src/FSWrapperMergeDirsWithParent.cpp
View File

@ -1,4 +1,5 @@
#include "FSWrapperMergeDirsWithParent.h" #include "FSWrapperMergeDirsWithParent.h"
#include "utils/StringTools.h"
#include "utils/logger.h" #include "utils/logger.h"
#include "utils/utils.h" #include "utils/utils.h"
#include <coreinit/cache.h> #include <coreinit/cache.h>
@ -83,7 +84,7 @@ FSError FSWrapperMergeDirsWithParent::FSReadDirWrapper(FSADirectoryHandle handle
/** /**
* Read the next entry if this entry starts with deletePrefix. We keep the entry but mark it as deleted. * Read the next entry if this entry starts with deletePrefix. We keep the entry but mark it as deleted.
*/ */
if (std::string_view(entry->name).starts_with(deletePrefix)) { if (starts_with_case_insensitive(entry->name, deletePrefix)) {
dirHandle->readResult[dirHandle->readResultNumberOfEntries].isMarkedAsDeleted = true; dirHandle->readResult[dirHandle->readResultNumberOfEntries].isMarkedAsDeleted = true;
OSMemoryBarrier(); OSMemoryBarrier();

12
src/utils/StringTools.h
View File

@ -11,4 +11,14 @@ std::string string_format(const std::string &format, Args... args) {
auto buf = std::make_unique<char[]>(size); auto buf = std::make_unique<char[]>(size);
std::snprintf(buf.get(), size, format.c_str(), args...); std::snprintf(buf.get(), size, format.c_str(), args...);
return std::string(buf.get(), buf.get() + size - 1); // We don't want the '\0' inside return std::string(buf.get(), buf.get() + size - 1); // We don't want the '\0' inside
} }
static inline bool starts_with_case_insensitive(std::string_view str, std::string_view prefix) {
if (str.size() < prefix.size())
return false;
return std::equal(prefix.begin(), prefix.end(), str.begin(),
[](char a, char b) {
return std::tolower(a) == std::tolower(b);
});
}