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

refactor(universal): factor out looks-like-executable check

Browse Source
This commit is contained in:
Marcus Holland-Moritz 2025-03-19 22:31:37 +01:00
parent f7969109d5
commit fb159a0317
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tools/src/universal.cpp
View File

@ -44,12 +44,6 @@ namespace {
using namespace dwarfs::tool; using namespace dwarfs::tool;
using namespace std::string_view_literals; using namespace std::string_view_literals;
#ifdef _WIN32
#define EXE_EXT ".exe"
#else
#define EXE_EXT ""
#endif
constexpr dwarfs::sorted_array_map functions{ constexpr dwarfs::sorted_array_map functions{
std::pair{"dwarfs"sv, &dwarfs_main}, std::pair{"dwarfs"sv, &dwarfs_main},
std::pair{"mkdwarfs"sv, &mkdwarfs_main}, std::pair{"mkdwarfs"sv, &mkdwarfs_main},
@ -57,6 +51,22 @@ constexpr dwarfs::sorted_array_map functions{
std::pair{"dwarfsextract"sv, &dwarfsextract_main}, std::pair{"dwarfsextract"sv, &dwarfsextract_main},
}; };
bool looks_like_executable(std::filesystem::path const& path) {
auto ext = path.extension().string();
if (ext.empty()) {
return true;
}
#ifdef _WIN32
if (ext == ".exe") {
return true;
}
#endif
return false;
}
} // namespace } // namespace
int SYS_MAIN(int argc, sys_char** argv) { int SYS_MAIN(int argc, sys_char** argv) {
@ -64,7 +74,7 @@ int SYS_MAIN(int argc, sys_char** argv) {
// first, see if we are called as a copy/hardlink/symlink // first, see if we are called as a copy/hardlink/symlink
if (auto ext = path.extension().string(); ext.empty() || ext == EXE_EXT) { if (looks_like_executable(path)) {
auto stem = path.stem().string(); auto stem = path.stem().string();
if (auto it = functions.find(stem); it != functions.end()) { if (auto it = functions.find(stem); it != functions.end()) {
return main_adapter(it->second).safe(argc, argv); return main_adapter(it->second).safe(argc, argv);