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

Treat optional arguments the same for long and short options

Browse Source 
This was noticed in bug 642825 and the change was proposed
by Kjell Ahlstedt.
This commit is contained in:
Matthias Clasen 2011-02-25 08:45:28 -05:00
parent c68c05a420
commit ee9e38ef68
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
glib/goption.c
View File

@ -1485,7 +1485,7 @@ parse_long_option (GOptionContext *context,
value = arg + len + 1; value = arg + len + 1;
else if (*idx < *argc - 1) else if (*idx < *argc - 1)
{ {
if (!(group->entries[j].flags & G_OPTION_FLAG_OPTIONAL_ARG)) if (!OPTIONAL_ARG (&group->entries[j]))
{ {
value = (*argv)[*idx + 1]; value = (*argv)[*idx + 1];
add_pending_null (context, &((*argv)[*idx + 1]), NULL); add_pending_null (context, &((*argv)[*idx + 1]), NULL);
@ -1510,8 +1510,7 @@ parse_long_option (GOptionContext *context,
} }
} }
} }
else if (*idx >= *argc - 1 && else if (*idx >= *argc - 1 && OPTIONAL_ARG (&group->entries[j]))
group->entries[j].flags & G_OPTION_FLAG_OPTIONAL_ARG)
{ {
gboolean retval; gboolean retval;
retval = parse_arg (context, group, &group->entries[j], retval = parse_arg (context, group, &group->entries[j],