fs/Glob: un-inline the Windows version to reduce header dependencies
This commit is contained in:
parent
16c38c438f
commit
c64a3b5dbb
31
src/fs/Glob.cxx
Normal file
31
src/fs/Glob.cxx
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2003-2021 The Music Player Daemon Project
|
||||||
|
* http://www.musicpd.org
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 2 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License along
|
||||||
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "Glob.hxx"
|
||||||
|
|
||||||
|
#ifdef _WIN32
|
||||||
|
#include <shlwapi.h>
|
||||||
|
|
||||||
|
bool
|
||||||
|
Glob::Check(const char *name_fs) const noexcept
|
||||||
|
{
|
||||||
|
return PathMatchSpecA(name_fs, pattern.c_str());
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
@ -27,7 +27,6 @@
|
|||||||
#include <fnmatch.h>
|
#include <fnmatch.h>
|
||||||
#elif defined(_WIN32)
|
#elif defined(_WIN32)
|
||||||
#define HAVE_CLASS_GLOB
|
#define HAVE_CLASS_GLOB
|
||||||
#include <shlwapi.h>
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef HAVE_CLASS_GLOB
|
#ifdef HAVE_CLASS_GLOB
|
||||||
@ -50,15 +49,19 @@ public:
|
|||||||
Glob &operator=(Glob &&other) noexcept = default;
|
Glob &operator=(Glob &&other) noexcept = default;
|
||||||
|
|
||||||
gcc_pure
|
gcc_pure
|
||||||
bool Check(const char *name_fs) const noexcept {
|
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
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#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
|
#endif
|
||||||
|
@ -3,6 +3,7 @@ fs_sources = [
|
|||||||
'Traits.cxx',
|
'Traits.cxx',
|
||||||
'Config.cxx',
|
'Config.cxx',
|
||||||
'Charset.cxx',
|
'Charset.cxx',
|
||||||
|
'Glob.cxx',
|
||||||
'Path.cxx',
|
'Path.cxx',
|
||||||
'Path2.cxx',
|
'Path2.cxx',
|
||||||
'AllocatedPath.cxx',
|
'AllocatedPath.cxx',
|
||||||
|
Loading…
Reference in New Issue
Block a user