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

exclude: use GPatternSpec instead of fnmatch()

Browse Source 
GLib's version of fnmatch() is more portable.
This commit is contained in:
Max Kellermann 2009-11-07 16:29:29 +01:00
parent a505cbc6c9
commit c2251dc5a2
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/exclude.c
View File

@ -29,7 +29,6 @@
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
#include <errno.h> #include <errno.h>
#include <fnmatch.h>
GSList * GSList *
exclude_list_load(const char *path_fs) exclude_list_load(const char *path_fs)
@ -59,7 +58,7 @@ exclude_list_load(const char *path_fs)
p = g_strstrip(line); p = g_strstrip(line);
if (*p != 0) if (*p != 0)
list = g_slist_prepend(list, g_strdup(p)); list = g_slist_prepend(list, g_pattern_spec_new(p));
} }
fclose(file); fclose(file);
@ -71,7 +70,8 @@ void
exclude_list_free(GSList *list) exclude_list_free(GSList *list)
{ {
while (list != NULL) { while (list != NULL) {
g_free(list->data); GPatternSpec *pattern = list->data;
g_pattern_spec_free(pattern);
list = g_slist_remove(list, list->data); list = g_slist_remove(list, list->data);
} }
} }
@ -84,9 +84,9 @@ exclude_list_check(GSList *list, const char *name_fs)
/* XXX include full path name in check */ /* XXX include full path name in check */
for (; list != NULL; list = list->next) { for (; list != NULL; list = list->next) {
const char *pattern = list->data; GPatternSpec *pattern = list->data;
if (fnmatch(pattern, name_fs, FNM_PATHNAME|FNM_PERIOD) == 0) if (g_pattern_match_string(pattern, name_fs))
return true; return true;
} }