moo_filename_from_locale()

moo/mooutils/mooutils-fs.c

@@ -339,21 +339,28 @@ moo_filenames_from_locale (char **files)
 
     for (i = 0; files && *files; ++files)
     {
-#ifdef __WIN32__
+        conv[i] = moo_filename_from_locale (*files);
-        conv[i] = g_locale_to_utf8 (*files, -1, NULL, NULL, NULL);
 
         if (!conv[i])
             g_warning ("%s: could not convert '%s' to UTF8", G_STRLOC, *files);
         else
             ++i;
-#else
-        conv[i++] = g_strdup (*files);
-#endif
     }
 
     return conv;
 }
 
+char *
+moo_filename_from_locale (const char *file)
+{
+    g_return_val_if_fail (file != NULL, NULL);
+#ifdef __WIN32__
+    return g_locale_to_utf8 (file, -1, NULL, NULL, NULL);
+#else
+    return g_strdup (file);
+#endif
+}
+
 
 /**********************************************************************/
 /* MSLU for poor

moo/mooutils/mooutils-fs.h

@@ -57,6 +57,7 @@ gboolean        moo_mkdir                   (const char *path,
                                              GError    **error);
 
 char          **moo_filenames_from_locale   (char      **files);
+char           *moo_filename_from_locale    (const char *file);
 
 /*
  * C library and WinAPI functions wrappers analogous to glib/gstdio.h