TheCloud/dwarfs
1
0
Fork 0
mirror of https://github.com/mhx/dwarfs.git synced 2025-09-10 13:04:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

feat: check for tool link/copy before --tool

Browse Source 
This prevents stuff like `mkdwarfs --tool=dwarfsck` from working.
This commit is contained in:
Marcus Holland-Moritz 2024-01-10 17:04:07 +01:00
parent d5955f06d7
commit a83bea3852
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/universal.cpp
View File

@ -84,6 +84,18 @@ extern "C" const PfnDliHook __pfnDliFailureHook2 = delay_hook;
#endif #endif
int SYS_MAIN(int argc, sys_char** argv) { int SYS_MAIN(int argc, sys_char** argv) {
auto path = std::filesystem::path(argv[0]);
// first, see if we are called as a copy/hardlink/symlink
if (path.extension().string() == EXE_EXT) {
if (auto it = functions.find(path.stem().string()); it != functions.end()) {
return safe_main([&] { return it->second(argc, argv); });
}
}
// if not, see if we can find a --tool=... argument
if (argc > 1) { if (argc > 1) {
auto tool_arg = sys_string_to_string(argv[1]); auto tool_arg = sys_string_to_string(argv[1]);
if (tool_arg.starts_with("--tool=")) { if (tool_arg.starts_with("--tool=")) {
@ -98,13 +110,7 @@ int SYS_MAIN(int argc, sys_char** argv) {
} }
} }
auto path = std::filesystem::path(argv[0]); // nope, just print the help
if (path.extension().string() == EXE_EXT) {
if (auto it = functions.find(path.stem().string()); it != functions.end()) {
return safe_main([&] { return it->second(argc, argv); });
}
}
using namespace folly::gen; using namespace folly::gen;