Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2025-05-14 12:42:19 -04:00
Code Issues Projects Releases Packages Wiki Activity

Soundboard bugfix: shouldn't crash with long file names

Browse source
This commit is contained in:
furrtek 2017-02-01 23:31:16 +00:00
parent 394331ebd2
commit 15f66eb74e
7 changed files with 32 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

22
firmware/application/file.cpp
View file

@ -166,23 +166,15 @@ std::filesystem::path next_filename_stem_matching_pattern(std::filesystem::path
}
}
std::vector<std::filesystem::path> scan_root_files(const TCHAR* directory, const std::string& extension) {
std::vector<std::filesystem::path> scan_root_files(const std::filesystem::path& directory,
const std::filesystem::path& extension) {
std::vector<std::filesystem::path> file_list { };
std::filesystem::path file_path;
FRESULT res;
DIR dir;
static FILINFO fno;
res = f_opendir(&dir, directory);
if (res == FR_OK) {
for (;;) {
res = f_readdir(&dir, &fno);
if (res != FR_OK || fno.fname[0] == 0) break;
file_path = fno.fname;
if (file_path.extension().string() == extension)
file_list.push_back(file_path);
for(const auto& entry : std::filesystem::directory_iterator(directory, extension)) {
if( std::filesystem::is_regular_file(entry.status()) ) {
file_list.push_back(entry.path());
}
f_closedir(&dir);
}
return file_list;