From 687b6012122ded0a1dd4c1df8f8795d8855506a3 Mon Sep 17 00:00:00 2001 From: Aki Date: Sun, 11 Sep 2022 16:17:12 +0200 Subject: Moved FilterFile around --- ArchiveEx/dat.cpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/ArchiveEx/dat.cpp b/ArchiveEx/dat.cpp index 3a0e0da..9662cbc 100644 --- a/ArchiveEx/dat.cpp +++ b/ArchiveEx/dat.cpp @@ -167,6 +167,21 @@ PrintHelp(std::ostream& out) } +std::function +FilterFile(const std::vector& patterns, std::function func) +{ + return [&patterns, func](const char* name) -> void { + if (patterns.empty()) + return func(name); + for (const auto& pattern : patterns) { + const int match = fnmatch(pattern.c_str(), name, FNM_PATHNAME | FNM_LEADING_DIR); + if (match == 0) + return func(name); + } + }; +} + + void UpdateFile(ArchiveEx::Archive& archive, const std::string& path, bool warn) { @@ -209,18 +224,3 @@ try { catch (const ExtractError& err) { std::cerr << "could not extract: " << filepath << std::endl; } - - -std::function -FilterFile(const std::vector& patterns, std::function func) -{ - return [&patterns, func](const char* name) -> void { - if (patterns.empty()) - return func(name); - for (const auto& pattern : patterns) { - const int match = fnmatch(pattern.c_str(), name, FNM_PATHNAME | FNM_LEADING_DIR); - if (match == 0) - return func(name); - } - }; -} -- cgit v1.1