summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKjell Ahlstedt <kjell.ahlstedt@bredband.net>2014-05-05 14:40:31 +0200
committerMatthias Clasen <mclasen@redhat.com>2014-05-05 20:29:29 -0400
commit85606f609363092e8f47db57b05762a0728ec80e (patch)
treea022191677087bff6619c3c6055e7b02056d706a
parent1565a4914494e56275d6ff393b90b8fb1b712708 (diff)
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
-rw-r--r--glib/goption.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/glib/goption.c b/glib/goption.c
index a11971fe9..2e4529215 100644
--- 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)
{