goption: Don't include parsed option values in G_OPTION_REMAINING

After a call to g_option_context_set_ignore_unknown_options(context, TRUE),
the values of short options were included in the array returned by a
G_OPTION_REMAINING option.

https://bugzilla.gnome.org/show_bug.cgi?id=729563

diff --git a/glib/goption.c b/glib/goption.c
index a11971f..2e45292 100644 (file)
--- a/glib/goption.c
+++ b/glib/goption.c
@@ -2038,6 +2038,7 @@ g_option_context_parse (GOptionContext   *context,
                       if (new_arg)
                         new_arg[arg_index] = '\0';
                       add_pending_null (context, &((*argv)[i]), new_arg);
+                      i = new_i;
                     }
                   else if (parsed)
                     {