p
/
fiv
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use GPatternSpec rather than fnmatch() 

Fixing a portability issue on Windows, where we still aim to use
the shared-mime-info database.
This commit is contained in:
Přemysl Eric Janouch 2022-07-14 10:07:18 +02:00
parent de27dce09c
commit 07aa11d78d
Signed by: p
GPG Key ID: A0420B94F92B9493
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
fiv-io.c
View File

@ -2970,7 +2970,7 @@ model_entry_finalize(FivIoModelEntry *entry)
struct _FivIoModel { struct _FivIoModel {
GObject parent_instance; GObject parent_instance;
gchar **supported_globs; GPatternSpec **supported_patterns;
GFile *directory; ///< Currently loaded directory GFile *directory; ///< Currently loaded directory
GFileMonitor *monitor; ///< "directory" monitoring GFileMonitor *monitor; ///< "directory" monitoring
@ -3011,19 +3011,21 @@ model_supports(FivIoModel *self, const char *filename)
if (!utf8) if (!utf8)
return FALSE; return FALSE;
gchar *lowercased = g_utf8_strdown(utf8, -1); gchar *lc = g_utf8_strdown(utf8, -1);
gsize lc_length = strlen(lc);
gchar *reversed = g_utf8_strreverse(lc, lc_length);
g_free(utf8); g_free(utf8);
// XXX: fnmatch() uses the /locale/ encoding, but who cares nowadays. // fnmatch() uses the /locale encoding/, and isn't present on Windows.
// TODO(p): Use GPatternSpec and g_file_info_get_display_name(). // TODO(p): Consider using g_file_info_get_display_name() for direct UTF-8.
for (gchar **p = self->supported_globs; *p; p++) gboolean result = FALSE;
if (!fnmatch(*p, lowercased, 0)) { for (GPatternSpec **p = self->supported_patterns; *p; p++)
g_free(lowercased); if ((result = g_pattern_spec_match(*p, lc_length, lc, reversed)))
return TRUE; break;
}
g_free(lowercased); g_free(lc);
return FALSE; g_free(reversed);
return result;
} }
static inline int static inline int
@ -3135,6 +3137,10 @@ static void
fiv_io_model_finalize(GObject *gobject) fiv_io_model_finalize(GObject *gobject)
{ {
FivIoModel *self = FIV_IO_MODEL(gobject); FivIoModel *self = FIV_IO_MODEL(gobject);
for (GPatternSpec **p = self->supported_patterns; *p; p++)
g_pattern_spec_free(*p);
g_free(self->supported_patterns);
g_clear_object(&self->directory); g_clear_object(&self->directory);
g_clear_object(&self->monitor); g_clear_object(&self->monitor);
g_array_free(self->subdirs, TRUE); g_array_free(self->subdirs, TRUE);
@ -3234,9 +3240,15 @@ fiv_io_model_init(FivIoModel *self)
self->filtering = TRUE; self->filtering = TRUE;
char **types = fiv_io_all_supported_media_types(); char **types = fiv_io_all_supported_media_types();
self->supported_globs = extract_mime_globs((const char **) types); char **globs = extract_mime_globs((const char **) types);
g_strfreev(types); g_strfreev(types);
gsize n = g_strv_length(globs);
self->supported_patterns = g_malloc0_n(n, sizeof *self->supported_patterns);
while (n--)
self->supported_patterns[n] = g_pattern_spec_new(globs[n]);
g_strfreev(globs);
self->files = g_array_new(FALSE, TRUE, sizeof(FivIoModelEntry)); self->files = g_array_new(FALSE, TRUE, sizeof(FivIoModelEntry));
self->subdirs = g_array_new(FALSE, TRUE, sizeof(FivIoModelEntry)); self->subdirs = g_array_new(FALSE, TRUE, sizeof(FivIoModelEntry));
g_array_set_clear_func( g_array_set_clear_func(