diff options
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/fs/Glob.hxx | 22 |
2 files changed, 22 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index dfd208ae5..e154ac3a3 100644 --- a/configure.ac +++ b/configure.ac @@ -225,6 +225,7 @@ if test x$host_is_linux = xyes; then fi AC_CHECK_FUNCS(getpwnam_r getpwuid_r) +AC_CHECK_FUNCS(fnmatch) AC_CHECK_FUNCS(strndup) if test x$host_is_linux = xyes; then diff --git a/src/fs/Glob.hxx b/src/fs/Glob.hxx index 493b3beba..b7307feea 100644 --- a/src/fs/Glob.hxx +++ b/src/fs/Glob.hxx @@ -22,7 +22,11 @@ #include "check.h" -#ifdef HAVE_GLIB +#ifdef HAVE_FNMATCH +#define HAVE_CLASS_GLOB +#include <string> +#include <fnmatch.h> +#elif defined(HAVE_GLIB) #define HAVE_CLASS_GLOB #include <glib.h> #endif @@ -35,9 +39,20 @@ * (asterisk and question mark). */ class Glob { +#ifdef HAVE_FNMATCH + std::string pattern; +#else GPatternSpec *pattern; +#endif public: +#ifdef HAVE_FNMATCH + explicit Glob(const char *_pattern) + :pattern(_pattern) {} + + Glob(Glob &&other) + :pattern(std::move(other.pattern)) {} +#else explicit Glob(const char *_pattern) :pattern(g_pattern_spec_new(_pattern)) {} @@ -49,10 +64,15 @@ public: ~Glob() { g_pattern_spec_free(pattern); } +#endif gcc_pure bool Check(const char *name_fs) const { +#ifdef HAVE_FNMATCH + return fnmatch(pattern.c_str(), name_fs, 0) == 0; +#else return g_pattern_match_string(pattern, name_fs); +#endif } }; |