Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
c64a3b5d
Commit
c64a3b5d
authored
4 years ago
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fs/Glob: un-inline the Windows version to reduce header dependencies
parent
16c38c43
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
43 additions
and
8 deletions
+43
-8
Glob.cxx
src/fs/Glob.cxx
+31
-0
Glob.hxx
src/fs/Glob.hxx
+11
-8
meson.build
src/fs/meson.build
+1
-0
No files found.
src/fs/Glob.cxx
0 → 100644
View file @
c64a3b5d
/*
* 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
This diff is collapsed.
Click to expand it.
src/fs/Glob.hxx
View file @
c64a3b5d
...
...
@@ -27,7 +27,6 @@
#include <fnmatch.h>
#elif defined(_WIN32)
#define HAVE_CLASS_GLOB
#include <shlwapi.h>
#endif
#ifdef HAVE_CLASS_GLOB
...
...
@@ -50,15 +49,19 @@ public:
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
This diff is collapsed.
Click to expand it.
src/fs/meson.build
View file @
c64a3b5d
...
...
@@ -3,6 +3,7 @@ fs_sources = [
'Traits.cxx',
'Config.cxx',
'Charset.cxx',
'Glob.cxx',
'Path.cxx',
'Path2.cxx',
'AllocatedPath.cxx',
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment