libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-05 17:57:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed DO_OPTION_OPT so that the '=' is no longer required in long options. (The

Browse Source 
value is, as the name implies, optional.) This fixes bug #1526483.

svn-id: r23561
This commit is contained in:
Torbjörn Andersson 2006-07-22 15:16:28 +00:00
parent 3f81726437
commit e3ab20ee90
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
base/commandLine.cpp
View File

@ -261,12 +261,15 @@ void registerDefaults() {
// Use this for options which have an *optional* value
#define DO_OPTION_OPT(shortCmd, longCmd, defaultVal) \
if (isLongCmd ? (!memcmp(s+2, longCmd"=", sizeof(longCmd"=") - 1)) : (tolower(s[1]) == shortCmd)) { \
if (isLongCmd ? (!strcmp(s+2, longCmd) || !memcmp(s+2, longCmd"=", sizeof(longCmd"=") - 1)) : (tolower(s[1]) == shortCmd)) { \
s += 2; \
if (isLongCmd) \
s += sizeof(longCmd"=") - 1; \
if (isLongCmd) { \
s += sizeof(longCmd) - 1; \
if (*s == '=') \
s++; \
} \
const char *option = s; \
if (*s == '\0') { option = s2; i++; } \
if (*s == '\0' && !isLongCmd) { option = s2; i++; } \
if (!option) option = defaultVal; \
if (option) settings[longCmd] = option;