luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 03:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

glib-compile-schemas: Fix non-ASCII arg parsing on Windows

Browse Source 
When the source directory contains non-ASCII symbols,
argument parsing previously failed on MINGW64.

Fixes: #3003
This commit is contained in:
Daniyar Tleulin 2023-05-23 16:49:21 +06:00 committed by Philip Withnall
parent 7e41ac18da
commit 6c6a844a50
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gio/glib-compile-schemas.c
View File

@ -22,6 +22,7 @@
/* Prologue {{{1 */ /* Prologue {{{1 */
#include "config.h" #include "config.h"
#include <glib.h>
#include <gstdio.h> #include <gstdio.h>
#include <gi18n.h> #include <gi18n.h>
@ -2182,6 +2183,7 @@ main (int argc, char **argv)
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
gchar *tmp = NULL; gchar *tmp = NULL;
gchar **command_line = NULL;
#endif #endif
setlocale (LC_ALL, GLIB_DEFAULT_LOCALE); setlocale (LC_ALL, GLIB_DEFAULT_LOCALE);
@ -2206,12 +2208,23 @@ main (int argc, char **argv)
"and the cache file is called gschemas.compiled.")); "and the cache file is called gschemas.compiled."));
g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE); g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
#ifdef G_OS_WIN32
command_line = g_win32_get_command_line ();
if (!g_option_context_parse_strv (context, &command_line, &error))
{
fprintf (stderr, "%s\n", error->message);
retval = 1;
goto done;
}
argc = g_strv_length (command_line);
#else
if (!g_option_context_parse (context, &argc, &argv, &error)) if (!g_option_context_parse (context, &argc, &argv, &error))
{ {
fprintf (stderr, "%s\n", error->message); fprintf (stderr, "%s\n", error->message);
retval = 1; retval = 1;
goto done; goto done;
} }
#endif
if (show_version_and_exit) if (show_version_and_exit)
{ {
@ -2227,7 +2240,11 @@ main (int argc, char **argv)
goto done; goto done;
} }
#ifdef G_OS_WIN32
srcdir = command_line[1];
#else
srcdir = argv[1]; srcdir = argv[1];
#endif
target = g_build_filename (targetdir ? targetdir : srcdir, "gschemas.compiled", NULL); target = g_build_filename (targetdir ? targetdir : srcdir, "gschemas.compiled", NULL);
@ -2320,6 +2337,7 @@ done:
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
g_free (tmp); g_free (tmp);
g_strfreev (command_line);
#endif #endif
return retval; return retval;