emu-mirror/citra-canary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix path usage in InstallCia

Browse Source
This commit is contained in:
B3n30 2020-03-17 13:40:58 +01:00
parent a4457d871c
commit ed51f06097
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/core/hle/service/am/am.cpp
View File

@ -34,15 +34,6 @@
#include "core/loader/loader.h" #include "core/loader/loader.h"
#include "core/loader/smdh.h" #include "core/loader/smdh.h"
namespace {
bool HasSupportedFileExtension(std::string path) {
static const std::array<std::string, 7> extensions = {
{".3ds", ".3dsx", ".elf", ".axf", ".cci", ".cxi", ".app"}};
const auto file_ext = FileUtil::GetExtensionFromFilename(path);
return std::find(extensions.begin(), extensions.end(), file_ext) != extensions.end();
}
} // namespace
namespace Service::AM { namespace Service::AM {
constexpr u16 PLATFORM_CTR = 0x0004; constexpr u16 PLATFORM_CTR = 0x0004;
@ -389,7 +380,7 @@ InstallStatus InstallCIA(const std::string& path,
const std::string& virtual_name) -> bool { const std::string& virtual_name) -> bool {
const std::string physical_name = directory + DIR_SEP + virtual_name; const std::string physical_name = directory + DIR_SEP + virtual_name;
const bool is_dir = FileUtil::IsDirectory(physical_name); const bool is_dir = FileUtil::IsDirectory(physical_name);
if (!is_dir && HasSupportedFileExtension(physical_name)) { if (!is_dir) {
std::unique_ptr<Loader::AppLoader> loader = Loader::GetLoader(physical_name); std::unique_ptr<Loader::AppLoader> loader = Loader::GetLoader(physical_name);
if (!loader) { if (!loader) {
return true; return true;
@ -405,7 +396,12 @@ InstallStatus InstallCIA(const std::string& path,
return FileUtil::ForeachDirectoryEntry(nullptr, physical_name, callback); return FileUtil::ForeachDirectoryEntry(nullptr, physical_name, callback);
} }
}; };
if (!FileUtil::ForeachDirectoryEntry(nullptr, path, callback)) { if (!FileUtil::ForeachDirectoryEntry(
nullptr,
GetTitlePath(
Service::AM::GetTitleMediaType(container.GetTitleMetadata().GetTitleID()),
container.GetTitleMetadata().GetTitleID()),
callback)) {
LOG_ERROR(Service_AM, "CIA {} contained encrypted files.", path); LOG_ERROR(Service_AM, "CIA {} contained encrypted files.", path);
return InstallStatus::ErrorEncrypted; return InstallStatus::ErrorEncrypted;
} }