Archive/Lime3DS
0
0
Fork 0
mirror of https://github.com/Lime3DS/Lime3DS.git synced 2025-05-01 06:07:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

loader.cpp: improved file extension checking, made Upper/LowerStr useful

Browse source 
Instead of forcibly taking the last 4 characters, it now finds the last extension separator (the period) and takes a substr of its location.
This commit is contained in:
archshift 2014-09-07 00:49:52 -07:00
parent 335082e74e
commit 4ed24a0619
3 changed files with 17 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/core/loader/loader.cpp
View file

@ -26,21 +26,23 @@ FileType IdentifyFile(const std::string &filename) {
ERROR_LOG(LOADER, "invalid filename %s", filename.c_str());
return FileType::Error;
}
std::string extension = filename.size() >= 5 ? filename.substr(filename.size() - 4) : "";
if (!strcasecmp(extension.c_str(), ".elf")) {
size_t extension_loc = filename.find_last_of('.');
std::string extension = extension_loc != std::string::npos ? filename.substr(extension_loc) : "";
if (LowerStr(extension) == ".elf") {
return FileType::ELF; // TODO(bunnei): Do some filetype checking :p
}
else if (!strcasecmp(extension.c_str(), ".axf")) {
else if (LowerStr(extension) == ".axf") {
return FileType::ELF; // TODO(bunnei): Do some filetype checking :p
}
else if (!strcasecmp(extension.c_str(), ".cxi")) {
else if (LowerStr(extension) == ".cxi") {
return FileType::CXI; // TODO(bunnei): Do some filetype checking :p
}
else if (!strcasecmp(extension.c_str(), ".cci")) {
else if (LowerStr(extension) == ".cci") {
return FileType::CCI; // TODO(bunnei): Do some filetype checking :p
}
else if (!strcasecmp(extension.c_str(), ".bin")) {
else if (LowerStr(extension) == ".bin") {
return FileType::BIN; // TODO(bunnei): Do some filetype checking :p
}
return FileType::Unknown;