hardcoresushi/libcryfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix build with fmt 9.0 (#433)

Browse Source 
* Fix build with fmt 9.0

Co-authored-by: Sebastian Meßmer <smessmer@users.noreply.github.com>
This commit is contained in:
Bernhard Rosenkraenzer 2022-07-22 14:13:38 +02:00 committed by Sebastian Messmer
parent dc330fa22e
commit ee6250380f
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog.txt
View File

@ -1,3 +1,7 @@
Version 0.11.3
---------------
* Fixed build issue on systems with libfmt 9.0 (see https://github.com/cryfs/cryfs/issues/432 )
Version 0.11.2 Version 0.11.2
--------------- ---------------
Bugfix: Bugfix:

8
src/fspp/fuse/Fuse.cpp
View File

@ -603,21 +603,21 @@ int Fuse::mknod(const bf::path &path, ::mode_t mode, dev_t rdev) {
UNUSED(mode); UNUSED(mode);
UNUSED(path); UNUSED(path);
ThreadNameForDebugging _threadName("mknod"); ThreadNameForDebugging _threadName("mknod");
LOG(WARN, "Called non-implemented mknod({}, {}, _)", path, mode); LOG(WARN, "Called non-implemented mknod({}, {}, _)", path.string(), mode);
return ENOSYS; return ENOSYS;
} }
int Fuse::mkdir(const bf::path &path, ::mode_t mode) { int Fuse::mkdir(const bf::path &path, ::mode_t mode) {
ThreadNameForDebugging _threadName("mkdir"); ThreadNameForDebugging _threadName("mkdir");
#ifdef FSPP_LOG #ifdef FSPP_LOG
LOG(DEBUG, "mkdir({}, {})", path, mode); LOG(DEBUG, "mkdir({}, {})", path.string(), mode);
#endif #endif
try { try {
ASSERT(is_valid_fspp_path(path), "has to be an absolute path"); ASSERT(is_valid_fspp_path(path), "has to be an absolute path");
// DokanY seems to call mkdir("/"). Ignore that // DokanY seems to call mkdir("/"). Ignore that
if ("/" == path) { if ("/" == path) {
#ifdef FSPP_LOG #ifdef FSPP_LOG
LOG(DEBUG, "mkdir({}, {}): ignored", path, mode); LOG(DEBUG, "mkdir({}, {}): ignored", path.string(), mode);
#endif #endif
return 0; return 0;
} }
@ -766,7 +766,7 @@ int Fuse::rename(const bf::path &from, const bf::path &to) {
//TODO //TODO
int Fuse::link(const bf::path &from, const bf::path &to) { int Fuse::link(const bf::path &from, const bf::path &to) {
ThreadNameForDebugging _threadName("link"); ThreadNameForDebugging _threadName("link");
LOG(WARN, "NOT IMPLEMENTED: link({}, {})", from, to); LOG(WARN, "NOT IMPLEMENTED: link({}, {})", from.string(), to.string());
//auto real_from = _impl->RootDir() / from; //auto real_from = _impl->RootDir() / from;
//auto real_to = _impl->RootDir() / to; //auto real_to = _impl->RootDir() / to;
//int retstat = ::link(real_from.string().c_str(), real_to.string().c_str()); //int retstat = ::link(real_from.string().c_str(), real_to.string().c_str());