luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-13 15:56:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

glib-compile-resources: 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:48:41 +06:00
parent 9f4f8702e5
commit 0305d237dd
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gio/glib-compile-resources.c
View File

@ -837,6 +837,7 @@ main (int argc, char **argv)
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
gchar *tmp; gchar *tmp;
gchar **command_line = NULL;
#endif #endif
setlocale (LC_ALL, GLIB_DEFAULT_LOCALE); setlocale (LC_ALL, GLIB_DEFAULT_LOCALE);
@ -863,11 +864,21 @@ main (int argc, char **argv)
g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE); g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
error = NULL; error = NULL;
#ifdef G_OS_WIN32
command_line = g_win32_get_command_line ();
if (!g_option_context_parse_strv (context, &command_line, &error))
{
g_printerr ("%s\n", error->message);
return 1;
}
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))
{ {
g_printerr ("%s\n", error->message); g_printerr ("%s\n", error->message);
return 1; return 1;
} }
#endif
g_option_context_free (context); g_option_context_free (context);
@ -890,7 +901,11 @@ main (int argc, char **argv)
compiler_type = get_compiler_id (compiler); compiler_type = get_compiler_id (compiler);
g_free (compiler); g_free (compiler);
#ifdef G_OS_WIN32
srcfile = command_line[1];
#else
srcfile = argv[1]; srcfile = argv[1];
#endif
xmllint = g_strdup (g_getenv ("XMLLINT")); xmllint = g_strdup (g_getenv ("XMLLINT"));
if (xmllint == NULL) if (xmllint == NULL)
@ -1310,5 +1325,9 @@ main (int argc, char **argv)
g_free (c_name); g_free (c_name);
g_hash_table_unref (files); g_hash_table_unref (files);
#ifdef G_OS_WIN32
g_strfreev (command_line);
#endif
return 0; return 0;
} }