diff options
| -rw-r--r-- | console.c | 20 |
1 files changed, 11 insertions, 9 deletions
@@ -448,17 +448,19 @@ void IConsoleError(const char* string) */ bool GetArgumentInteger(uint32 *value, const char *arg) { - int result = sscanf(arg, "%u", value); + char *endptr; - /* Hexadecimal numbers start with 0x, so at least the first number has been parsed */ - if (result == 1 && arg[0] == '0' && (arg[1] == 'x' || arg[1] == 'X')) - result = sscanf(arg, "%x", value); - - if (result == 0 && (strcmp(arg, "on") == 0 || strcmp(arg, "true") == 0 )) {*value = 1; result = 1;} - - if (result == 0 && (strcmp(arg, "off") == 0 || strcmp(arg, "false") == 0)) {*value = 0; result = 1;} + if (strcmp(arg, "on") == 0 || strcmp(arg, "true") == 0) { + *value = 1; + return true; + } + if (strcmp(arg, "off") == 0 || strcmp(arg, "false") == 0) { + *value = 0; + return true; + } - return !!result; + *value = strtoul(arg, &endptr, 0); + return (arg == endptr) ? false : true; } /** |