diff options
Diffstat (limited to 'src/fs/Glob.hxx')
| -rw-r--r-- | src/fs/Glob.hxx | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/src/fs/Glob.hxx b/src/fs/Glob.hxx index 0a2e9abfc..65e3a9e1f 100644 --- a/src/fs/Glob.hxx +++ b/src/fs/Glob.hxx @@ -24,45 +24,44 @@ #ifdef HAVE_FNMATCH #define HAVE_CLASS_GLOB -#include <string> #include <fnmatch.h> #elif defined(_WIN32) #define HAVE_CLASS_GLOB -#include <string> -#include <shlwapi.h> #endif #ifdef HAVE_CLASS_GLOB #include "util/Compiler.h" +#include <string> + /** * A pattern that matches file names. It may contain shell wildcards * (asterisk and question mark). */ class Glob { -#if defined(HAVE_FNMATCH) || defined(_WIN32) std::string pattern; -#endif public: -#if defined(HAVE_FNMATCH) || defined(_WIN32) explicit Glob(const char *_pattern) :pattern(_pattern) {} - Glob(Glob &&other) - :pattern(std::move(other.pattern)) {} -#endif + Glob(Glob &&other) noexcept = default; + Glob &operator=(Glob &&other) noexcept = default; gcc_pure - bool Check(const char *name_fs) const noexcept { -#ifdef HAVE_FNMATCH - return fnmatch(pattern.c_str(), name_fs, 0) == 0; -#elif defined(_WIN32) - return PathMatchSpecA(name_fs, pattern.c_str()); -#endif - } + bool Check(const char *name_fs) const noexcept; }; +#ifdef HAVE_FNMATCH + +inline bool +Glob::Check(const char *name_fs) const noexcept +{ + return fnmatch(pattern.c_str(), name_fs, 0) == 0; +} + #endif +#endif /* HAVE_CLASS_GLOB */ + #endif |