more correctly fix no-option parsing to still parse when no non-arg options are found

SVN revision: 54862
This commit is contained in:
Mike Blumenkrantz 2010-11-23 10:56:50 +00:00
parent c6732ad9cc
commit a1c347ecd5
1 changed files with 1 additions and 2 deletions

View File

@ -1638,7 +1638,6 @@ ecore_getopt_parse(const Ecore_Getopt *parser, Ecore_Getopt_Value *values, int a
else
prog = parser->prog;
if (argc == 1) return 0;
nonargs = _ecore_getopt_parse_find_nonargs_base(parser, argc, argv);
if (nonargs < 0)
goto error;
@ -1647,7 +1646,7 @@ ecore_getopt_parse(const Ecore_Getopt *parser, Ecore_Getopt_Value *values, int a
nonargs = argc;
i = 1;
while (i < nonargs)
while ((i < nonargs ? nonargs : argc) && (argv[i]))
if (!_ecore_getopt_parse_arg(parser, values, argc, argv, &i, &nonargs))
goto error;