nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2024-11-09 22:56:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

pm: fix boot2 launch logic error

Browse source
This commit is contained in:
Michael Scire 2019-07-03 20:01:53 -07:00 committed by SciresM
parent 27ff119ba6
commit 8177a27db9
1 changed files with 26 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
stratosphere/pm/source/boot2/boot2_api.cpp
View file

@ -202,29 +202,38 @@ namespace sts::boot2 {
} }
void LaunchFlaggedProgramsFromSdCard() { void LaunchFlaggedProgramsFromSdCard() {
/* Allow for user-customizable programs. */ /* Validate that the titles directory exists. */
DIR *titles_dir = opendir("sdmc:/atmosphere/titles"); DIR *titles_dir = opendir("sdmc:/atmosphere/titles");
struct dirent *ent; if (titles_dir == nullptr) {
if (titles_dir != nullptr) {
ON_SCOPE_EXIT { closedir(titles_dir); };
while ((ent = readdir(titles_dir)) != nullptr) {
if (strlen(ent->d_name) == 2 * sizeof(u64) && IsHexadecimal(ent->d_name)) {
ncm::TitleId title_id{strtoul(ent->d_name, nullptr, 16)};
if (pm::info::HasLaunchedTitle(title_id)) {
return; return;
} }
ON_SCOPE_EXIT { closedir(titles_dir); };
/* Iterate over entries in the titles directory */
struct dirent *ent;
while ((ent = readdir(titles_dir)) != nullptr) {
/* Check that the subdirectory can be converted to a title id. */
if (std::strlen(ent->d_name) == 2 * sizeof(ncm::TitleId) && IsHexadecimal(ent->d_name)) {
/* Check if we've already launched the title. */
ncm::TitleId title_id{std::strtoul(ent->d_name, nullptr, 16)};
if (pm::info::HasLaunchedTitle(title_id)) {
continue;
}
/* Check if the title is flagged. */
char title_path[FS_MAX_PATH]; char title_path[FS_MAX_PATH];
std::snprintf(title_path, sizeof(title_path), "sdmc:/atmosphere/titles/%s/flags/boot2.flag", ent->d_name); std::snprintf(title_path, sizeof(title_path), "sdmc:/atmosphere/titles/%s/flags/boot2.flag", ent->d_name);
FILE *f_flag = fopen(title_path, "rb"); FILE *f_flag = fopen(title_path, "rb");
if (f_flag != nullptr) { if (f_flag == nullptr) {
continue;
}
fclose(f_flag); fclose(f_flag);
/* Actually launch the title. */
LaunchTitle(nullptr, ncm::TitleLocation::Make(title_id, ncm::StorageId::None), 0); LaunchTitle(nullptr, ncm::TitleLocation::Make(title_id, ncm::StorageId::None), 0);
} }
} }
} }
}
}
} }