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

FatFs: Enable long file name support.

Browse source 
Lots of re-plumbing to make this work, including a bunch of Unicode stuff now in the binary. Bloat City, I'm sure.

TODO: FatFs using unsigned (uint16_t) for UTF16 representation is kinda inconvenient. Lots of reinterpret_cast<>().
This commit is contained in:
Jared Boone 2016-08-21 18:06:39 -07:00
parent 43a11ba048
commit f7bfde73b6
20 changed files with 68 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

21
firmware/application/file.hpp
View file

@ -33,8 +33,6 @@
#include <memory>
#include <iterator>
std::string next_filename_stem_matching_pattern(const std::string& filename_stem_pattern);
namespace std {
namespace filesystem {
@ -66,9 +64,12 @@ private:
uint32_t err;
};
using path = std::string;
using path = std::u16string;
using file_status = BYTE;
static_assert(sizeof(path::value_type) == 2, "sizeof(std::filesystem::path::value_type) != 2");
static_assert(sizeof(path::value_type) == sizeof(TCHAR), "FatFs TCHAR size != std::filesystem::path::value_type");
struct space_info {
static_assert(sizeof(std::uintmax_t) >= 8, "std::uintmax_t too small (<uint64_t)");
@ -82,7 +83,7 @@ struct directory_entry : public FILINFO {
return fattrib;
}
const std::string path() const noexcept { return fname; };
const std::filesystem::path path() const noexcept { return reinterpret_cast<const std::filesystem::path::value_type*>(fname); };
};
class directory_iterator {
@ -107,7 +108,7 @@ public:
using iterator_category = std::input_iterator_tag;
directory_iterator() noexcept { };
directory_iterator(const char* path, const char* wild);
directory_iterator(const std::filesystem::path::value_type* path, const std::filesystem::path::value_type* wild);
~directory_iterator() { }
@ -131,6 +132,8 @@ space_info space(const path& p);
} /* namespace filesystem */
} /* namespace std */
std::filesystem::path next_filename_stem_matching_pattern(const std::filesystem::path& filename_stem_pattern);
class File {
public:
using Error = std::filesystem::filesystem_error;
@ -193,9 +196,9 @@ public:
File& operator=(const File&) = delete;
// TODO: Return Result<>.
Optional<Error> open(const std::string& filename);
Optional<Error> append(const std::string& filename);
Optional<Error> create(const std::string& filename);
Optional<Error> open(const std::filesystem::path& filename);
Optional<Error> append(const std::filesystem::path& filename);
Optional<Error> create(const std::filesystem::path& filename);
Result<size_t> read(void* const data, const size_t bytes_to_read);
Result<size_t> write(const void* const data, const size_t bytes_to_write);
@ -215,7 +218,7 @@ public:
private:
FIL f;
Optional<Error> open_fatfs(const std::string& filename, BYTE mode);
Optional<Error> open_fatfs(const std::filesystem::path& filename, BYTE mode);
};
#endif/*__FILE_H__*/