Canithesis/digFTP
4
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

use std::format in logger, re-organize main.cpp, add SIGINT handling.

Browse Source
This commit is contained in:
Wirlaburla
2025-01-01 18:18:00 -06:00
parent 54693d03cd
commit f59ea622cc
7 changed files with 343 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/filer_local/filer_local.cpp
View File

@@ -43,10 +43,9 @@ public:
cwd = "/";
} catch (const fs::filesystem_error& ex) {
logger->print(LOGLEVEL_ERROR, "setRoot error: %s", ex.what());
logger->print(LOGLEVEL_ERROR, "setRoot error: {}", ex.what());
fd.error = {FilerStatusCodes::Exception, ex.what()};
}
return fd;
}
@@ -68,7 +67,7 @@ public:
cwd = new_cwd;
} catch (const fs::filesystem_error& ex) {
logger->print(LOGLEVEL_ERROR, "setCWD error: %s", ex.what());
logger->print(LOGLEVEL_ERROR, "setCWD error: {}", ex.what());
fd.error = {FilerStatusCodes::Exception, ex.what()};
}
@@ -105,16 +104,16 @@ public:
*target = fs::path(*target).lexically_normal();
if (fs::is_symlink(*target) && resolve_symlink) {
fs::path resolved_sym = fs::weakly_canonical(*target);
logger->print(LOGLEVEL_DEBUG, "Resolved symlink path: %s", resolved_sym.c_str());
logger->print(LOGLEVEL_DEBUG, "resolved symlink path: {}", resolved_sym.string());
return resolve_ext_symlinks ? true : resolved_sym.string().starts_with(root.string());
} else if (!(*target).string().starts_with(root.string()))
return false;
logger->print(LOGLEVEL_DEBUG, "Resolved path: %s", target->c_str());
logger->print(LOGLEVEL_DEBUG, "resolved path: {}", target->string());
return true;
} catch (const std::exception& e) {
logger->print(LOGLEVEL_ERROR, "Path resolution error: %s", e.what());
logger->print(LOGLEVEL_ERROR, "path resolution error: {}", e.what());
return false;
}
}
@@ -151,7 +150,7 @@ public:
fd.path = strdup(requested_path.c_str());
fd.relpath = strdup(fs::relative(requested_path, root).c_str());
} catch (const fs::filesystem_error& ex) {
logger->print(LOGLEVEL_ERROR, "Path fallback: %s", ex.what());
logger->print(LOGLEVEL_ERROR, "traversal error: {}", ex.what());
fd.error = file_error{FilerStatusCodes::Exception, ex.what()};
}
return fd;