File 0001-Add-g_option_context_parse_utf8.patch of Package mingw32-glib2

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Add-g_option_context_parse_utf8.patch of Package mingw32-glib2 (Revision 975e12612a9be8e30b1f25e3e2065e7c)

Currently displaying revision 975e12612a9be8e30b1f25e3e2065e7c , Show latest

From 0d168a375458689ced2be611509286493add19d9 Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@gnome.org>
Date: Thu, 3 Jun 2010 15:15:43 +0200
Subject: [PATCH 1/3] Add g_option_context_parse_utf8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This patch implements g_option_context_parse_utf()
along the lines of comment 63.

Contrary to the original patch (attachment 116044) I decided that
FILENAME arguments in UTF-8 mode should get the same treatment as in
non-UTF-8 mode, that is they get the exact argument string, and *not*
the string converted to filename encoding, since there's no guarantee it
will be representable in it.

Based on the patches by Tor Lillqvist and Krzysztof Kosiński.

Bug #522131.
---
 docs/reference/glib/glib-sections.txt |    1 +
 glib/glib.symbols                     |    1 +
 glib/goption.c                        |  226 +++++++++++++++++++----------
 glib/goption.h                        |    5 +
 glib/tests/option-context.c           |  261 +++++++++++++++------------------
 5 files changed, 272 insertions(+), 222 deletions(-)

diff --git a/docs/reference/glib/glib-sections.txt b/docs/reference/glib/glib-sections.txt
index 031550b..5f6ad5d 100644
--- a/docs/reference/glib/glib-sections.txt
+++ b/docs/reference/glib/glib-sections.txt
@@ -1107,6 +1107,7 @@ g_option_context_set_translate_func
 g_option_context_set_translation_domain
 g_option_context_free
 g_option_context_parse
+g_option_context_parse_utf8
 g_option_context_set_help_enabled
 g_option_context_get_help_enabled
 g_option_context_set_ignore_unknown_options
diff --git a/glib/glib.symbols b/glib/glib.symbols
index 970fc08..b090bce 100644
--- a/glib/glib.symbols
+++ b/glib/glib.symbols
@@ -908,6 +908,7 @@ g_option_context_get_main_group
 g_option_context_get_summary
 g_option_context_new
 g_option_context_parse
+g_option_context_parse_utf8
 g_option_context_set_description
 g_option_context_set_help_enabled
 g_option_context_set_ignore_unknown_options
diff --git a/glib/goption.c b/glib/goption.c
index f09c7e1..9c4110d 100644
--- a/glib/goption.c
+++ b/glib/goption.c
@@ -1124,14 +1124,38 @@ add_pending_null (GOptionContext *context,
   context->pending_nulls = g_list_prepend (context->pending_nulls, n);
 }
 
+static gchar *
+get_string_arg (const gchar *value,
+                gboolean     utf8_flag,
+                GError     **error)
+{
+  if (utf8_flag)
+    return g_strdup (value);
+
+  return g_locale_to_utf8 (value, -1, NULL, NULL, error);
+}
+
+static gchar *
+get_filename_arg (const gchar *value,
+                  gboolean     utf8_flag,
+                  GError     **error)
+{
+#ifdef G_OS_WIN32
+  if (!utf8_flag)
+    return g_locale_to_utf8 (value, -1, NULL, NULL, error);
+#endif
+
+  return g_strdup (value);
+}
+
 static gboolean
 parse_arg (GOptionContext *context,
-           GOptionGroup   *group,
-           GOptionEntry   *entry,
-           const gchar    *value,
-           const gchar    *option_name,
-           GError        **error)
-
+	   GOptionGroup   *group,
+	   GOptionEntry   *entry,
+	   const gchar    *value,
+	   const gchar    *option_name,
+	   gboolean        utf8_flag,
+	   GError        **error)
 {
   Change *change;
 
@@ -1151,7 +1175,7 @@ parse_arg (GOptionContext *context,
       {
         gchar *data;
 
-        data = g_locale_to_utf8 (value, -1, NULL, NULL, error);
+        data = get_string_arg (value, utf8_flag, error);
 
         if (!data)
           return FALSE;
@@ -1170,7 +1194,7 @@ parse_arg (GOptionContext *context,
       {
         gchar *data;
 
-        data = g_locale_to_utf8 (value, -1, NULL, NULL, error);
+        data = get_string_arg (value, utf8_flag, error);
 
         if (!data)
           return FALSE;
@@ -1202,14 +1226,11 @@ parse_arg (GOptionContext *context,
       {
         gchar *data;
 
-#ifdef G_OS_WIN32
-        data = g_locale_to_utf8 (value, -1, NULL, NULL, error);
+        data = get_filename_arg (value, utf8_flag, error);
 
         if (!data)
           return FALSE;
-#else
-        data = g_strdup (value);
-#endif
+
         change = get_change (context, G_OPTION_ARG_FILENAME,
                              entry->arg_data);
         g_free (change->allocated.str);
@@ -1225,14 +1246,11 @@ parse_arg (GOptionContext *context,
       {
         gchar *data;
 
-#ifdef G_OS_WIN32
-        data = g_locale_to_utf8 (value, -1, NULL, NULL, error);
+        data = get_filename_arg (value, utf8_flag, error);
 
         if (!data)
           return FALSE;
-#else
-        data = g_strdup (value);
-#endif
+
         change = get_change (context, G_OPTION_ARG_STRING_ARRAY,
                              entry->arg_data);
 
@@ -1281,15 +1299,9 @@ parse_arg (GOptionContext *context,
         else if (entry->flags & G_OPTION_FLAG_NO_ARG)
           data = NULL;
         else if (entry->flags & G_OPTION_FLAG_FILENAME)
-          {
-#ifdef G_OS_WIN32
-            data = g_locale_to_utf8 (value, -1, NULL, NULL, error);
-#else
-            data = g_strdup (value);
-#endif
-          }
+          data = get_string_arg (value, utf8_flag, error);
         else
-          data = g_locale_to_utf8 (value, -1, NULL, NULL, error);
+          data = get_string_arg (value, utf8_flag, error);
 
         if (!(entry->flags & (G_OPTION_FLAG_NO_ARG|G_OPTION_FLAG_OPTIONAL_ARG)) &&
             !data)
@@ -1355,6 +1367,7 @@ parse_short_option (GOptionContext *context,
                     gint            idx,
                     gint           *new_idx,
                     gchar           arg,
+                    gboolean        utf8_flag,
                     gint           *argc,
                     gchar        ***argv,
                     GError        **error,
@@ -1417,7 +1430,7 @@ parse_short_option (GOptionContext *context,
             }
 
           if (!parse_arg (context, group, &group->entries[j],
-                          value, option_name, error))
+                          value, option_name, utf8_flag, error))
             {
               g_free (option_name);
               return FALSE;
@@ -1437,6 +1450,7 @@ parse_long_option (GOptionContext *context,
                    gint           *idx,
                    gchar          *arg,
                    gboolean        aliased,
+                   gboolean        utf8_flag,
                    gint           *argc,
                    gchar        ***argv,
                    GError        **error,
@@ -1460,7 +1474,7 @@ parse_long_option (GOptionContext *context,
 
           option_name = g_strconcat ("--", group->entries[j].long_name, NULL);
           retval = parse_arg (context, group, &group->entries[j],
-                              NULL, option_name, error);
+                              NULL, option_name, utf8_flag, error);
           g_free (option_name);
 
           add_pending_null (context, &((*argv)[*idx]), NULL);
@@ -1497,7 +1511,7 @@ parse_long_option (GOptionContext *context,
                         {
                           gboolean retval;
                           retval = parse_arg (context, group, &group->entries[j],
-                                              NULL, option_name, error);
+                                              NULL, option_name, utf8_flag, error);
                           *parsed = TRUE;
                           g_free (option_name);
                           return retval;
@@ -1515,7 +1529,7 @@ parse_long_option (GOptionContext *context,
                 {
                     gboolean retval;
                     retval = parse_arg (context, group, &group->entries[j],
-                                        NULL, option_name, error);
+                                        NULL, option_name, utf8_flag, error);
                     *parsed = TRUE;
                     g_free (option_name);
                     return retval;
@@ -1530,7 +1544,7 @@ parse_long_option (GOptionContext *context,
                 }
 
               if (!parse_arg (context, group, &group->entries[j],
-                              value, option_name, error))
+                              value, option_name, utf8_flag, error))
                 {
                   g_free (option_name);
                   return FALSE;
@@ -1548,6 +1562,7 @@ parse_long_option (GOptionContext *context,
 static gboolean
 parse_remaining_arg (GOptionContext *context,
                      GOptionGroup   *group,
+                     gboolean        utf8_flag,
                      gint           *idx,
                      gint           *argc,
                      gchar        ***argv,
@@ -1570,7 +1585,7 @@ parse_remaining_arg (GOptionContext *context,
 
       add_pending_null (context, &((*argv)[*idx]), NULL);
 
-      if (!parse_arg (context, group, &group->entries[j], (*argv)[*idx], "", error))
+      if (!parse_arg (context, group, &group->entries[j], (*argv)[*idx], "", utf8_flag, error))
         return FALSE;
 
       *parsed = TRUE;
@@ -1658,46 +1673,12 @@ free_pending_nulls (GOptionContext *context,
   context->pending_nulls = NULL;
 }
 
-/**
- * g_option_context_parse:
- * @context: a #GOptionContext
- * @argc: a pointer to the number of command line arguments
- * @argv: a pointer to the array of command line arguments
- * @error: a return location for errors
- *
- * Parses the command line arguments, recognizing options
- * which have been added to @context. A side-effect of
- * calling this function is that g_set_prgname() will be
- * called.
- *
- * If the parsing is successful, any parsed arguments are
- * removed from the array and @argc and @argv are updated
- * accordingly. A '--' option is stripped from @argv
- * unless there are unparsed options before and after it,
- * or some of the options after it start with '-'. In case
- * of an error, @argc and @argv are left unmodified.
- *
- * If automatic <option>--help</option> support is enabled
- * (see g_option_context_set_help_enabled()), and the
- * @argv array contains one of the recognized help options,
- * this function will produce help output to stdout and
- * call <literal>exit (0)</literal>.
- *
- * Note that function depends on the
- * <link linkend="setlocale">current locale</link> for
- * automatic character set conversion of string and filename
- * arguments.
- *
- * Return value: %TRUE if the parsing was successful,
- *               %FALSE if an error occurred
- *
- * Since: 2.6
- **/
-gboolean
-g_option_context_parse (GOptionContext   *context,
-                        gint             *argc,
-                        gchar          ***argv,
-                        GError          **error)
+static gboolean
+option_context_parse_internal (GOptionContext   *context,
+                               gboolean          utf8_flag,
+                               gint             *argc,
+                               gchar          ***argv,
+                               GError          **error)
 {
   gint i, j, k;
   GList *list;
@@ -1792,7 +1773,7 @@ g_option_context_parse (GOptionContext   *context,
 
                   if (context->main_group &&
                       !parse_long_option (context, context->main_group, &i, arg,
-                                          FALSE, argc, argv, error, &parsed))
+                                          FALSE, utf8_flag, argc, argv, error, &parsed))
                     goto fail;
 
                   if (parsed)
@@ -1805,7 +1786,7 @@ g_option_context_parse (GOptionContext   *context,
                       GOptionGroup *group = list->data;
 
                       if (!parse_long_option (context, group, &i, arg,
-                                              FALSE, argc, argv, error, &parsed))
+                                              FALSE, utf8_flag, argc, argv, error, &parsed))
                         goto fail;
 
                       if (parsed)
@@ -1830,7 +1811,7 @@ g_option_context_parse (GOptionContext   *context,
                           if (strncmp (group->name, arg, dash - arg) == 0)
                             {
                               if (!parse_long_option (context, group, &i, dash + 1,
-                                                      TRUE, argc, argv, error, &parsed))
+                                                      TRUE, utf8_flag, argc, argv, error, &parsed))
                                 goto fail;
 
                               if (parsed)
@@ -1861,7 +1842,7 @@ g_option_context_parse (GOptionContext   *context,
                       parsed = FALSE;
                       if (context->main_group &&
                           !parse_short_option (context, context->main_group,
-                                               i, &new_i, arg[j],
+                                               i, &new_i, arg[j], utf8_flag,
                                                argc, argv, error, &parsed))
                         goto fail;
                       if (!parsed)
@@ -1872,7 +1853,7 @@ g_option_context_parse (GOptionContext   *context,
                             {
                               GOptionGroup *group = list->data;
                               if (!parse_short_option (context, group, i, &new_i, arg[j],
-                                                       argc, argv, error, &parsed))
+                                                       utf8_flag, argc, argv, error, &parsed))
                                 goto fail;
                               if (parsed)
                                 break;
@@ -1927,7 +1908,7 @@ g_option_context_parse (GOptionContext   *context,
             {
               /* Collect remaining args */
               if (context->main_group &&
-                  !parse_remaining_arg (context, context->main_group, &i,
+                  !parse_remaining_arg (context, context->main_group, utf8_flag, &i,
                                         argc, argv, error, &parsed))
                 goto fail;
 
@@ -2015,6 +1996,95 @@ g_option_context_parse (GOptionContext   *context,
 }
 
 /**
+ * g_option_context_parse:
+ * @context: a #GOptionContext
+ * @argc: (inout): a pointer to the number of command line arguments
+ * @argv: (inout) (array lenth=argc) (element-type filename): a pointer to an array of command line arguments
+ * @error: (allow-none): a location to store a #GError, or %NULL
+ *
+ * Parses the command line arguments, recognizing options
+ * which have been added to @context. A side-effect of
+ * calling this function is that g_set_prgname() will be
+ * called.
+ *
+ * If the parsing is successful, any parsed arguments are
+ * removed from the array and @argc and @argv are updated
+ * accordingly. A '--' option is stripped from @argv
+ * unless there are unparsed options before and after it,
+ * or some of the options after it start with '-'. In case
+ * of an error, @argc and @argv are left unmodified.
+ *
+ * If automatic <option>--help</option> support is enabled
+ * (see g_option_context_set_help_enabled()), and the
+ * @argv array contains one of the recognized help options,
+ * this function will produce help output to stdout and
+ * call <literal>exit (0)</literal>.
+ *
+ * Note that function depends on the
+ * <link linkend="setlocale">current locale</link> for
+ * automatic character set conversion of string and filename
+ * arguments.
+ *
+ * Return value: %TRUE if the parsing was successful,
+ *               %FALSE if an error occurred
+ *
+ * Since: 2.6
+ **/
+gboolean
+g_option_context_parse (GOptionContext   *context,
+                        gint             *argc,
+                        gchar          ***argv,
+                        GError          **error)
+{
+  return option_context_parse_internal (context, FALSE, argc, argv, error);
+}
+
+/**
+ * g_option_context_parse_utf8:
+ * @context: a #GOptionContext
+ * @argc: (inout): a pointer to the number of strings in @argv
+ * @argv: (inout) (array length=argc) (element-type utf-8): a pointer to an array of UTF-8 strings
+ * @error: (allow-none): a location to store a #GError, or %NULL
+ *
+ * A variant of g_option_context_parse() that treats @argv as an
+ * array of UTF-8 strings.
+ *
+ * This function is suitable for use with the wide arguments array
+ * returned from g_win32_get_wargv().
+ *
+ * Note that arguments for %G_OPTION_ARG_FILENAME and
+ * %G_OPTION_ARG_FILENAME_ARRAY options, and %G_OPTION_ARG_CALLBACK
+ * options with %G_OPTION_FLAG_FILENAME will be passed the unchanged
+ * UTF-8 strings, and not strings converted to filename encoding
+ * (see g_filename_from_utf8()).
+ *
+ * Return value: %TRUE if the parsing was successful,
+ *               %FALSE if an error occurred
+ *
+ * Since: 2.26
+ **/
+gboolean
+g_option_context_parse_utf8 (GOptionContext   *context,
+                             gint             *argc,
+                             gchar          ***argv,
+                             GError          **error)
+{
+  gint i;
+
+  for (i = 0; i < *argc; ++i)
+    {
+      if (!g_utf8_validate ((*argv)[i], -1, NULL))
+        {
+          g_set_error (error, G_OPTION_ERROR, G_OPTION_ERROR_BAD_VALUE,
+                       "Argument is not UTF-8");
+          return FALSE;
+        }
+    }
+
+  return option_context_parse_internal (context, TRUE, argc, argv, error);
+}
+
+/**
  * g_option_group_new:
  * @name: the name for the option group, this is used to provide
  *   help for the options in this group with <option>--help-</option>@name
diff --git a/glib/goption.h b/glib/goption.h
index 557d8f7..01d6ef8 100644
--- a/glib/goption.h
+++ b/glib/goption.h
@@ -329,6 +329,11 @@ gboolean        g_option_context_parse            (GOptionContext      *context,
 						   gint                *argc,
 						   gchar             ***argv,
 						   GError             **error);
+gboolean	g_option_context_parse_utf8       (GOptionContext      *context,
+						   gint                *argc,
+						   gchar             ***argv,
+						   GError             **error);
+
 void            g_option_context_set_translate_func (GOptionContext     *context,
 						     GTranslateFunc      func,
 						     gpointer            data,
diff --git a/glib/tests/option-context.c b/glib/tests/option-context.c
index 81096db..ee28d6e 100644
--- a/glib/tests/option-context.c
+++ b/glib/tests/option-context.c
@@ -33,14 +33,16 @@ group_captions (void)
   gchar *help_variants[] = { "--help", "--help-all", "--help-test" };
 
   GOptionEntry main_entries[] = {
-    { "main-switch", 0, 0,
+    { "main-switch", 0,
+      G_OPTION_FLAG_NO_ARG,
       G_OPTION_ARG_NONE, NULL,
       "A switch that is in the main group", NULL },
     { NULL }
   };
 
   GOptionEntry group_entries[] = {
-    { "test-switch", 0, 0,
+    { "test-switch", 0,
+      G_OPTION_FLAG_NO_ARG,
       G_OPTION_ARG_NONE, NULL,
       "A switch that is in the test group", NULL },
     { NULL }
@@ -1706,7 +1708,7 @@ missing_arg_test (void)
   g_strfreev (argv);
 
   /* Try parsing again */
-  argv = split_string ("program -t", &argc);
+  argv = split_string ("program --t", &argc);
 
   retval = g_option_context_parse (context, &argc, &argv, &error);
   g_assert (retval == FALSE);
@@ -1715,152 +1717,123 @@ missing_arg_test (void)
   g_option_context_free (context);
 }
 
-static gchar *test_arg;
-
-static gboolean cb (const gchar  *option_name,
-                    const gchar  *value,
-                    gpointer      data,
-                    GError      **error)
-{
-  test_arg = g_strdup (value);
-  return TRUE;
-}
-
-void
-dash_arg_test (void)
+static void
+utf8_test_invalid (void)
 {
   GOptionContext *context;
   gboolean retval;
   GError *error = NULL;
   gchar **argv;
   int argc;
-  gboolean argb = FALSE;
+  gchar *arg = NULL;
   GOptionEntry entries [] =
-    { { "test", 't', G_OPTION_FLAG_OPTIONAL_ARG, G_OPTION_ARG_CALLBACK, cb, NULL, NULL },
-      { "three", '3', 0, G_OPTION_ARG_NONE, &argb, NULL, NULL },
+    { { "test", 't', 0, G_OPTION_ARG_STRING, &arg, NULL, NULL },
       { NULL } };
 
-  g_test_bug ("577638");
-
   context = g_option_context_new (NULL);
   g_option_context_add_main_entries (context, entries, NULL);
 
   /* Now try parsing */
-  argv = split_string ("program --test=-3", &argc);
+  argv = split_string ("program --test \xdf", &argc);
 
-  test_arg = NULL;
-  error = NULL;
-  retval = g_option_context_parse (context, &argc, &argv, &error);
-  g_assert (retval);
-  g_assert_no_error (error);
-  g_assert_cmpstr (test_arg, ==, "-3");
+  retval = g_option_context_parse_utf8 (context, &argc, &argv, &error);
+  g_assert_error (error, G_OPTION_ERROR, G_OPTION_ERROR_BAD_VALUE);
+  g_clear_error (&error);
 
   g_strfreev (argv);
-  g_free (test_arg);
-  test_arg = NULL;
-
-  /* Try parsing again */
-  argv = split_string ("program --test -3", &argc);
-
-  error = NULL;
-  retval = g_option_context_parse (context, &argc, &argv, &error);
-  g_assert_no_error (error);
-  g_assert (retval);
-  g_assert_cmpstr (test_arg, ==, NULL);
-
   g_option_context_free (context);
 }
 
 static void
-test_basic (void)
+utf8_test_arg_string (void)
 {
   GOptionContext *context;
+  gboolean retval;
+  GError *error = NULL;
+  gchar **argv;
+  const gchar *locale;
+  int argc;
   gchar *arg = NULL;
   GOptionEntry entries [] =
-    { { "test", 't', 0, G_OPTION_ARG_STRING, &arg, NULL, NULL },
+    { { "string", 's', 0, G_OPTION_ARG_STRING, &arg, NULL, NULL },
       { NULL } };
 
   context = g_option_context_new (NULL);
   g_option_context_add_main_entries (context, entries, NULL);
 
-  g_assert (g_option_context_get_help_enabled (context));
-  g_assert (!g_option_context_get_ignore_unknown_options (context));
-  g_assert_cmpstr (g_option_context_get_summary (context), ==, NULL);
-  g_assert_cmpstr (g_option_context_get_description (context), ==, NULL);
+  /* Now try parsing */
+  argv = split_string ("program --string \341\272\236", &argc);
 
-  g_option_context_set_help_enabled (context, FALSE);
-  g_option_context_set_ignore_unknown_options (context, TRUE);
-  g_option_context_set_summary (context, "summary");
-  g_option_context_set_description(context, "description");
+  retval = g_option_context_parse_utf8 (context, &argc, &argv, &error);
+  g_assert_no_error (error);
 
-  g_assert (!g_option_context_get_help_enabled (context));
-  g_assert (g_option_context_get_ignore_unknown_options (context));
-  g_assert_cmpstr (g_option_context_get_summary (context), ==, "summary");
-  g_assert_cmpstr (g_option_context_get_description (context), ==, "description");
+  g_assert_cmpstr (arg, ==, "\341\272\236");
+  g_free (arg);
+  arg = NULL;
 
-  g_option_context_free (context);
-}
+  g_strfreev (argv);
 
-static void
-test_main_group (void)
-{
-  GOptionContext *context;
-  GOptionGroup *group;
+  /* Check that parsing is locale independent */
+  argv = split_string ("program --string \341\272\236", &argc);
 
-  context = g_option_context_new (NULL);
-  g_assert (g_option_context_get_main_group (context) == NULL);
-  group = g_option_group_new ("name", "description", "hlep", NULL, NULL);
-  g_option_context_add_group (context, group);
-  g_assert (g_option_context_get_main_group (context) == NULL);
-  group = g_option_group_new ("name", "description", "hlep", NULL, NULL);
-  g_option_context_set_main_group (context, group);
-  g_assert (g_option_context_get_main_group (context) == group);
+  locale = setlocale (LC_ALL, "de_DE.ISO-8859-1");
 
-  g_option_context_free (context);
-}
+  retval = g_option_context_parse_utf8 (context, &argc, &argv, &error);
+  g_assert_no_error (error);
 
-static gboolean error_func_called = FALSE;
+  g_assert_cmpstr (arg, ==, "\341\272\236");
+  g_free (arg);
 
-static void
-error_func (GOptionContext  *context,
-            GOptionGroup    *group,
-            gpointer         data,
-            GError         **error)
-{
-  g_assert_cmpint (GPOINTER_TO_INT(data), ==, 1234);
-  error_func_called = TRUE;
+  setlocale (LC_ALL, locale);
+
+  g_strfreev (argv);
+
+  g_option_context_free (context);
 }
 
 static void
-test_error_hook (void)
+utf8_test_arg_filename (void)
 {
   GOptionContext *context;
+  gboolean retval;
+  GError *error = NULL;
+  gchar **argv;
+  const gchar *locale;
+  int argc;
   gchar *arg = NULL;
   GOptionEntry entries [] =
-    { { "test", 't', 0, G_OPTION_ARG_STRING, &arg, NULL, NULL },
+    { { "filename", 'f', 0, G_OPTION_ARG_FILENAME, &arg, NULL, NULL },
       { NULL } };
-  GOptionGroup *group;
-  gchar **argv;
-  gint argc;
-  gboolean retval;
-  GError *error = NULL;
 
   context = g_option_context_new (NULL);
-  group = g_option_group_new ("name", "description", "hlep", GINT_TO_POINTER(1234), NULL);
-  g_option_group_add_entries (group, entries);
-  g_option_context_set_main_group (context, group);
-  g_option_group_set_error_hook (g_option_context_get_main_group (context),
-                                 error_func);
+  g_option_context_add_main_entries (context, entries, NULL);
 
-  argv = split_string ("program --test", &argc);
+  /* Now try parsing */
+  argv = split_string ("program --filename \341\272\236", &argc);
 
-  retval = g_option_context_parse (context, &argc, &argv, &error);
-  g_assert (retval == FALSE);
-  g_clear_error (&error);
+  retval = g_option_context_parse_utf8 (context, &argc, &argv, &error);
+  g_assert_no_error (error);
 
-  g_assert (error_func_called);
+  g_assert_cmpstr (arg, ==, "\341\272\236");
+  g_free (arg);
 
   g_strfreev (argv);
+
+  /* Check that parsing is locale independent */
+  argv = split_string ("program --filename \341\272\236", &argc);
+
+  locale = setlocale (LC_ALL, "de_DE.ISO-8859-1");
+
+  retval = g_option_context_parse_utf8 (context, &argc, &argv, &error);
+  g_assert_no_error (error);
+
+  g_assert_cmpstr (arg, ==, "\341\272\236");
+  g_free (arg);
+
+  setlocale (LC_ALL, locale);
+
+  g_strfreev (argv);
+
   g_option_context_free (context);
 }
 
@@ -1871,76 +1844,76 @@ main (int   argc,
   g_test_init (&argc, &argv, NULL);
 
   g_test_bug_base ("http://bugzilla.gnome.org/");
-
-  g_test_add_func ("/option/basic", test_basic);
-  g_test_add_func ("/option/group/captions", group_captions);
-  g_test_add_func ("/option/group/main", test_main_group);
-  g_test_add_func ("/option/group/error-hook", test_error_hook);
+  g_test_add_func ("/group/captions", group_captions);
 
   /* Test that restoration on failure works */
-  g_test_add_func ("/option/restoration/int", error_test1);
-  g_test_add_func ("/option/restoration/string", error_test2);
-  g_test_add_func ("/option/restoration/boolean", error_test3);
+  g_test_add_func ("/restoration/int", error_test1);
+  g_test_add_func ("/restoration/string", error_test2);
+  g_test_add_func ("/restoration/boolean", error_test3);
   
   /* Test that special argument parsing works */
-  g_test_add_func ("/option/arg/repetition/int", arg_test1);
-  g_test_add_func ("/option/arg/repetition/string", arg_test2);
-  g_test_add_func ("/option/arg/repetition/filename", arg_test3);
-  g_test_add_func ("/option/arg/repetition/double", arg_test4);
-  g_test_add_func ("/option/arg/repetition/locale", arg_test5);
-  g_test_add_func ("/option/arg/repetition/int64", arg_test6);
+  g_test_add_func ("/arg/repetition/int", arg_test1);
+  g_test_add_func ("/arg/repetition/string", arg_test2);
+  g_test_add_func ("/arg/repetition/filename", arg_test3);
+  g_test_add_func ("/arg/repetition/double", arg_test4);
+  g_test_add_func ("/arg/repetition/locale", arg_test5);
+  g_test_add_func ("/arg/repetition/int64", arg_test6);
 
   /* Test string arrays */
-  g_test_add_func ("/option/arg/array/string", array_test1);
+  g_test_add_func ("/arg/array/string", array_test1);
 
   /* Test callback args */
-  g_test_add_func ("/option/arg/callback/string", callback_test1);
-  g_test_add_func ("/option/arg/callback/count", callback_test2);
+  g_test_add_func ("/arg/callback/string", callback_test1);
+  g_test_add_func ("/arg/callback/count", callback_test2);
 
   /* Test optional arg flag for callback */
-  g_test_add_func ("/option/arg/callback/optional1", callback_test_optional_1);
-  g_test_add_func ("/option/arg/callback/optional2", callback_test_optional_2);
-  g_test_add_func ("/option/arg/callback/optional3", callback_test_optional_3);
-  g_test_add_func ("/option/arg/callback/optional4", callback_test_optional_4);
-  g_test_add_func ("/option/arg/callback/optional5", callback_test_optional_5);
-  g_test_add_func ("/option/arg/callback/optional6", callback_test_optional_6);
-  g_test_add_func ("/option/arg/callback/optional7", callback_test_optional_7);
-  g_test_add_func ("/option/arg/callback/optional8", callback_test_optional_8);
+  g_test_add_func ("/arg/callback/optional1", callback_test_optional_1);
+  g_test_add_func ("/arg/callback/optional2", callback_test_optional_2);
+  g_test_add_func ("/arg/callback/optional3", callback_test_optional_3);
+  g_test_add_func ("/arg/callback/optional4", callback_test_optional_4);
+  g_test_add_func ("/arg/callback/optional5", callback_test_optional_5);
+  g_test_add_func ("/arg/callback/optional6", callback_test_optional_6);
+  g_test_add_func ("/arg/callback/optional7", callback_test_optional_7);
+  g_test_add_func ("/arg/callback/optional8", callback_test_optional_8);
 
   /* Test callback with G_OPTION_REMAINING */
-  g_test_add_func ("/option/arg/remaining/callback", callback_remaining_test1);
+  g_test_add_func ("/arg/remaining/callback", callback_remaining_test1);
   
   /* Test callbacks which return FALSE */
-  g_test_add_func ("/option/arg/remaining/callback-false", callback_returns_false);
+  g_test_add_func ("/arg/remaining/callback-false", callback_returns_false);
   
   /* Test ignoring options */
-  g_test_add_func ("/option/arg/ignore/long", ignore_test1);
-  g_test_add_func ("/option/arg/ignore/short", ignore_test2);
-  g_test_add_func ("/option/arg/ignore/arg", ignore_test3);
+  g_test_add_func ("/arg/ignore/long", ignore_test1);
+  g_test_add_func ("/arg/ignore/short", ignore_test2);
+  g_test_add_func ("/arg/ignore/arg", ignore_test3);
 
-  g_test_add_func ("/option/context/add", add_test1);
+  g_test_add_func ("/context/add", add_test1);
 
   /* Test parsing empty args */
-  g_test_add_func ("/option/context/empty1", empty_test1);
-  g_test_add_func ("/option/context/empty2", empty_test2);
-  g_test_add_func ("/option/context/empty3", empty_test3);
+  g_test_add_func ("/context/empty1", empty_test1);
+  g_test_add_func ("/context/empty2", empty_test2);
+  g_test_add_func ("/context/empty3", empty_test3);
 
   /* Test handling of rest args */
-  g_test_add_func ("/option/arg/rest/non-option", rest_test1);
-  g_test_add_func ("/option/arg/rest/separator1", rest_test2);
-  g_test_add_func ("/option/arg/rest/separator2", rest_test2a);
-  g_test_add_func ("/option/arg/rest/separator3", rest_test2b);
-  g_test_add_func ("/option/arg/rest/separator4", rest_test2c);
-  g_test_add_func ("/option/arg/rest/separator5", rest_test2d);
-  g_test_add_func ("/option/arg/remaining/non-option", rest_test3);
-  g_test_add_func ("/option/arg/remaining/separator", rest_test4);
-  g_test_add_func ("/option/arg/remaining/array", rest_test5);
+  g_test_add_func ("/arg/rest/non-option", rest_test1);
+  g_test_add_func ("/arg/rest/separator1", rest_test2);
+  g_test_add_func ("/arg/rest/separator2", rest_test2a);
+  g_test_add_func ("/arg/rest/separator3", rest_test2b);
+  g_test_add_func ("/arg/rest/separator4", rest_test2c);
+  g_test_add_func ("/arg/rest/separator5", rest_test2d);
+  g_test_add_func ("/arg/remaining/non-option", rest_test3);
+  g_test_add_func ("/arg/remaining/separator", rest_test4);
+  g_test_add_func ("/arg/remaining/array", rest_test5);
 
   /* regression tests for individual bugs */
-  g_test_add_func ("/option/bug/unknown-short", unknown_short_test);
-  g_test_add_func ("/option/bug/lonely-dash", lonely_dash_test);
-  g_test_add_func ("/option/bug/missing-arg", missing_arg_test);
-  g_test_add_func ("/option/bug/dash-arg", dash_arg_test);
+  g_test_add_func ("/bug/unknown-short", unknown_short_test);
+  g_test_add_func ("/bug/lonely-dash", lonely_dash_test);
+  g_test_add_func ("/bug/missing-arg", missing_arg_test);
+
+  /* UTF-8 parsing */
+  g_test_add_func ("/utf8/invalid", utf8_test_invalid);
+  g_test_add_func ("/utf8/arg/string", utf8_test_arg_string);
+  g_test_add_func ("/utf8/arg/filename", utf8_test_arg_filename);
 
   return g_test_run();
 }
-- 
1.6.4.2

Places

File 0001-Add-g_option_context_parse_utf8.patch of Package mingw32-glib2 (Revision 975e12612a9be8e30b1f25e3e2065e7c)

Places