oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

fs/Glob: use fnmatch() if available

Browse Source
This commit is contained in:
Max Kellermann 2015-06-22 18:55:49 +02:00
parent a6aea4ba58
commit bc8542503d
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -225,6 +225,7 @@ if test x$host_is_linux = xyes; then
fi fi
AC_CHECK_FUNCS(getpwnam_r getpwuid_r) AC_CHECK_FUNCS(getpwnam_r getpwuid_r)
AC_CHECK_FUNCS(fnmatch)
AC_CHECK_FUNCS(strndup) AC_CHECK_FUNCS(strndup)
if test x$host_is_linux = xyes; then if test x$host_is_linux = xyes; then

22
src/fs/Glob.hxx
View File

@ -22,7 +22,11 @@
#include "check.h" #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 #define HAVE_CLASS_GLOB
#include <glib.h> #include <glib.h>
#endif #endif
@ -35,9 +39,20 @@
* (asterisk and question mark). * (asterisk and question mark).
*/ */
class Glob { class Glob {
#ifdef HAVE_FNMATCH
std::string pattern;
#else
GPatternSpec *pattern; GPatternSpec *pattern;
#endif
public: 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) explicit Glob(const char *_pattern)
:pattern(g_pattern_spec_new(_pattern)) {} :pattern(g_pattern_spec_new(_pattern)) {}
@ -49,10 +64,15 @@ public:
~Glob() { ~Glob() {
g_pattern_spec_free(pattern); g_pattern_spec_free(pattern);
} }
#endif
gcc_pure gcc_pure
bool Check(const char *name_fs) const { 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); return g_pattern_match_string(pattern, name_fs);
#endif
} }
}; };