From 82ec17db7df53ed1c376d1cdaa9a6587719a546d Mon Sep 17 00:00:00 2001
From: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
Date: Tue, 6 Jan 2015 23:10:13 +0000
Subject: Loader: Guess filetype from the magic, or fallback to the extension.
---
src/core/loader/loader.cpp | 60 ++++++++++++++++++++++++++++++++++------------
1 file changed, 45 insertions(+), 15 deletions(-)
(limited to 'src/core/loader/loader.cpp')
diff --git a/src/core/loader/loader.cpp b/src/core/loader/loader.cpp
index fd32b7b204..01b415215e 100644
--- a/src/core/loader/loader.cpp
+++ b/src/core/loader/loader.cpp
@@ -19,11 +19,32 @@ namespace Loader {
/**
* Identifies the type of a bootable file
+ * @param file open file
+ * @return FileType of file
+ */
+static FileType IdentifyFile(FileUtil::IOFile& file) {
+ FileType type;
+
+#define CHECK_TYPE(loader) \
+ type = AppLoader_##loader::IdentifyType(file); \
+ if (FileType::Error != type) \
+ return type;
+
+ CHECK_TYPE(THREEDSX)
+ CHECK_TYPE(ELF)
+ CHECK_TYPE(NCCH)
+
+#undef CHECK_TYPE
+
+ return FileType::Unknown;
+}
+
+/**
+ * Guess the type of a bootable file from its extension
* @param filename String filename of bootable file
- * @todo (ShizZy) this function sucks... make it actually check file contents etc.
* @return FileType of file
*/
-FileType IdentifyFile(const std::string &filename) {
+static FileType GuessFromFilename(const std::string& filename) {
if (filename.size() == 0) {
LOG_ERROR(Loader, "invalid filename %s", filename.c_str());
return FileType::Error;
@@ -34,22 +55,20 @@ FileType IdentifyFile(const std::string &filename) {
return FileType::Unknown;
std::string extension = Common::ToLower(filename.substr(extension_loc));
- // TODO(bunnei): Do actual filetype checking instead of naively checking the extension
- if (extension == ".elf") {
+ if (extension == ".elf")
return FileType::ELF;
- } else if (extension == ".axf") {
+ else if (extension == ".axf")
return FileType::ELF;
- } else if (extension == ".cxi") {
+ else if (extension == ".cxi")
return FileType::CXI;
- } else if (extension == ".cci") {
+ else if (extension == ".cci")
return FileType::CCI;
- } else if (extension == ".bin") {
+ else if (extension == ".bin")
return FileType::BIN;
- } else if (extension == ".3ds") {
+ else if (extension == ".3ds")
return FileType::CCI;
- } else if (extension == ".3dsx") {
+ else if (extension == ".3dsx")
return FileType::THREEDSX;
- }
return FileType::Unknown;
}
@@ -60,7 +79,16 @@ ResultStatus LoadFile(const std::string& filename) {
if (!file->IsOpen())
return ResultStatus::Error;
- switch (IdentifyFile(filename)) {
+ FileType type = IdentifyFile(*file);
+ FileType filename_type = GuessFromFilename(filename);
+
+ if (type != filename_type) {
+ LOG_WARNING(Loader, "File %s has a different type than its extension.", filename.c_str());
+ if (FileType::Unknown == type)
+ type = filename_type;
+ }
+
+ switch (type) {
//3DSX file format...
case FileType::THREEDSX:
@@ -72,7 +100,8 @@ ResultStatus LoadFile(const std::string& filename) {
// NCCH/NCSD container formats...
case FileType::CXI:
- case FileType::CCI: {
+ case FileType::CCI:
+ {
AppLoader_NCCH app_loader(std::move(file));
// Load application and RomFS
@@ -100,10 +129,11 @@ ResultStatus LoadFile(const std::string& filename) {
// IdentifyFile could know identify file type...
case FileType::Unknown:
-
- default:
+ {
+ LOG_CRITICAL(Loader, "File %s is of unknown type.");
return ResultStatus::ErrorInvalidFormat;
}
+ }
return ResultStatus::Error;
}
--
cgit v1.2.3-70-g09d2