aboutsummaryrefslogtreecommitdiff
path: root/src/glib_compat.h
diff options
context:
space:
mode:
authorDenis Krjuchkov <denis@crazydev.net>2012-06-03 13:00:11 +0600
committerMax Kellermann <max@duempel.org>2012-06-12 19:31:19 +0200
commit25d053cbf288fb966526c554bea6158ef5c38202 (patch)
treeceb3bda54406eec336aedf138ab326e966077a5f /src/glib_compat.h
parent055257a210015a623062ad3ad3cb8a40fbc6839f (diff)
Work around incorrect g_file_test() behavior on Win32
g_file_test is redefined to be g_file_test_utf8 and thus can't handle non-ASCII characters. This fix adds simple wrapper (taken from glib) that fixes encoding and calls g_file_test_utf8. All required inclusions of glib_compat.h are added as well.
Diffstat (limited to 'src/glib_compat.h')
-rw-r--r--src/glib_compat.h28
1 files changed, 28 insertions, 0 deletions
diff --git a/src/glib_compat.h b/src/glib_compat.h
index 4d0e7040..0b96a662 100644
--- a/src/glib_compat.h
+++ b/src/glib_compat.h
@@ -74,4 +74,32 @@ g_uri_parse_scheme(const char *uri)
#endif
+#if defined(G_OS_WIN32) && defined(g_file_test)
+
+/* Modern GLib on Win32 likes to use UTF-8 for file names.
+It redefines g_file_test() to be g_file_test_utf8().
+This gives incorrect results for non-ASCII files.
+Old g_file_test() is available for *binary compatibility*,
+but symbol is hidden from linker, we copy-paste its definition here */
+
+#undef g_file_test
+
+static inline gboolean
+g_file_test(const gchar *filename, GFileTest test)
+{
+ gchar *utf8_filename = g_locale_to_utf8(filename, -1, NULL, NULL, NULL);
+ gboolean retval;
+
+ if (utf8_filename == NULL)
+ return FALSE;
+
+ retval = g_file_test_utf8(utf8_filename, test);
+
+ g_free(utf8_filename);
+
+ return retval;
+}
+
+#endif
+
#endif