ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix custom getopt_long for certain arguments. 

getopt_long() treats this as equivalent: {"-c", "foo"}, {"-cfoo"}.
This is fixed.
This commit is contained in:
Themaister 2012-01-21 16:27:51 +01:00
parent 8f0a47e6c3
commit 0a3dc05c27
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
getopt.c
View File

@ -71,18 +71,29 @@ static int parse_short(const char *optstring, char * const *argv)
if (!opt) if (!opt)
return '?'; return '?';
bool multiple_opt = argv[0][2]; bool extra_opt = argv[0][2];
bool takes_arg = opt[1] == ':'; bool takes_arg = opt[1] == ':';
if (multiple_opt && takes_arg) // Makes little sense to allow.
return '?'; // If we take an argument, and we see additional characters,
// this is in fact the argument (i.e. -cfoo is same as -c foo).
bool embedded_arg = extra_opt && takes_arg;
if (takes_arg) if (takes_arg)
{
if (embedded_arg)
{
optarg = argv[0] + 2;
optind++;
}
else
{ {
optarg = argv[1]; optarg = argv[1];
optind += 2; optind += 2;
}
return optarg ? opt[0] : '?'; return optarg ? opt[0] : '?';
} }
else if (multiple_opt) else if (embedded_arg) // If we see additional characters, and they don't take arguments, this means we have multiple flags in one.
{ {
memmove(&argv[0][1], &argv[0][2], strlen(&argv[0][2]) + 1); memmove(&argv[0][1], &argv[0][2], strlen(&argv[0][2]) + 1);
return opt[0]; return opt[0];