libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-02 23:01:42 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Always use base 0 in strtol when parsing integer command line options / config file entries (this makes it possible to optionally use hex values)

Browse Source 
svn-id: r21911
This commit is contained in:
Max Horn 2006-04-15 13:58:01 +00:00
parent c07fc494d2
commit ebea155b8e
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
base/gameDetector.cpp
View File

@ -294,7 +294,7 @@ GameDescriptor GameDetector::findGame(const String &gameName, const Plugin **plu
DO_OPTION_OPT(shortCmd, longCmd, 0) \
if (!option) usage("Option '%s' requires an argument", argv[i]); \
char *endptr = 0; \
int intValue; intValue = (int)strtol(option, &endptr, 10); \
int intValue; intValue = (int)strtol(option, &endptr, 0); \
if (endptr == NULL || *endptr != 0) usage("--%s: Invalid number '%s'", longCmd, option);
// Use this for boolean options; this distinguishes between "-x" and "-X",
@ -508,14 +508,7 @@ Common::String GameDetector::parseCommandLine(Common::StringMap &settings, int a
END_OPTION
#ifndef DISABLE_SCUMM
DO_LONG_OPTION("tempo")
// Use the special value '0' for the base in (int)strtol.
// Doing that makes it possible to enter hex values
// as "0x1234", but also decimal values ("123").
int value = (int)strtol(option, 0, 0);
char buf[20];
snprintf(buf, sizeof(buf), "%d", value);
settings["tempo"] = buf;
DO_LONG_OPTION_INT("tempo")
END_OPTION
DO_LONG_OPTION_BOOL("demo-mode")

5
common/config-manager.cpp
View File

@ -425,7 +425,10 @@ int ConfigManager::getInt(const String &key, const String &domName) const {
if (value.empty())
return 0;
int ivalue = (int)strtol(value.c_str(), &errpos, 10);
// We zse the special value '0' for the base passed to strtol. Doing that
// makes it possible to enter hex values as "0x1234", but also decimal
// values ("123") are still valid.
int ivalue = (int)strtol(value.c_str(), &errpos, 0);
if (value.c_str() == errpos)
error("ConfigManager::getInt(%s,%s): '%s' is not a valid integer",
key.c_str(), domName.c_str(), errpos);