mirror of
https://github.com/libretro/RetroArch
synced 2025-02-07 12:39:54 +00:00
Should fix Android strtol regression (when converting from sscanf) (#14183)
This commit is contained in:
LibretroAdmin
GitHub
parent
fbd765f167
commit
87240556ea
@ -579,10 +579,7 @@ static void frontend_android_get_version_sdk(int32_t *sdk)
|
||||
system_property_get("getprop", "ro.build.version.sdk", os_version_str);
|
||||
*sdk = 0;
|
||||
if (os_version_str[0])
|
||||
{
|
||||
char *ptr = NULL;
|
||||
sdk = (int32_t)strtol(os_version_str, &ptr, 10);
|
||||
}
|
||||
sscanf(os_version_str, "%d", sdk);
|
||||
}
|
||||
|
||||
static bool device_is_xperia_play(const char *name)
|
||||
|
||||
@ -348,14 +348,10 @@ static void menu_input_st_uint_cb(void *userdata, const char *str)
|
||||
{
|
||||
if (str && *str)
|
||||
{
|
||||
const char *label = menu_input_dialog_get_label_setting_buffer();
|
||||
rarch_setting_t *setting = menu_setting_find(label);
|
||||
|
||||
const char *ptr = NULL;
|
||||
unsigned value = 0;
|
||||
int chars_read = 0;
|
||||
int ret = 0;
|
||||
bool minus_found = false;
|
||||
|
||||
/* Ensure that input string contains a valid
|
||||
* unsigned value
|
||||
@ -366,16 +362,20 @@ static void menu_input_st_uint_cb(void *userdata, const char *str)
|
||||
{
|
||||
if (*ptr == '-')
|
||||
{
|
||||
minus_found = true;
|
||||
break;
|
||||
menu_input_dialog_end();
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (!minus_found)
|
||||
ret = sscanf(str, "%u %n", &value, &chars_read);
|
||||
ret = sscanf(str, "%u %n", &value, &chars_read);
|
||||
|
||||
if ((ret == 1) && !str[chars_read])
|
||||
{
|
||||
const char *label =
|
||||
menu_input_dialog_get_label_setting_buffer();
|
||||
rarch_setting_t *setting = menu_setting_find(label);
|
||||
setting_set_with_string_representation(setting, str);
|
||||
}
|
||||
}
|
||||
|
||||
menu_input_dialog_end();
|
||||
@ -385,19 +385,20 @@ static void menu_input_st_int_cb(void *userdata, const char *str)
|
||||
{
|
||||
if (str && *str)
|
||||
{
|
||||
const char *label = menu_input_dialog_get_label_setting_buffer();
|
||||
rarch_setting_t *setting = menu_setting_find(label);
|
||||
|
||||
int value = 0;
|
||||
int chars_read = 0;
|
||||
int ret = 0;
|
||||
|
||||
int value = 0;
|
||||
int chars_read = 0;
|
||||
/* Ensure that input string contains a valid
|
||||
* unsigned value */
|
||||
ret = sscanf(str, "%d %n", &value, &chars_read);
|
||||
int ret = sscanf(str, "%d %n", &value, &chars_read);
|
||||
|
||||
if ((ret == 1) && !str[chars_read])
|
||||
{
|
||||
const char *label =
|
||||
menu_input_dialog_get_label_setting_buffer();
|
||||
rarch_setting_t
|
||||
*setting = menu_setting_find(label);
|
||||
setting_set_with_string_representation(setting, str);
|
||||
}
|
||||
}
|
||||
|
||||
menu_input_dialog_end();
|
||||
@ -460,19 +461,19 @@ static void menu_input_st_float_cb(void *userdata, const char *str)
|
||||
{
|
||||
if (str && *str)
|
||||
{
|
||||
const char *label = menu_input_dialog_get_label_setting_buffer();
|
||||
rarch_setting_t *setting = menu_setting_find(label);
|
||||
|
||||
float value = 0.0f;
|
||||
int chars_read = 0;
|
||||
int ret = 0;
|
||||
|
||||
float value = 0.0f;
|
||||
int chars_read = 0;
|
||||
/* Ensure that input string contains a valid
|
||||
* floating point value */
|
||||
ret = sscanf(str, "%f %n", &value, &chars_read);
|
||||
int ret = sscanf(str, "%f %n", &value, &chars_read);
|
||||
|
||||
if ((ret == 1) && !str[chars_read])
|
||||
{
|
||||
const char *label =
|
||||
menu_input_dialog_get_label_setting_buffer();
|
||||
rarch_setting_t *setting = menu_setting_find(label);
|
||||
setting_set_with_string_representation(setting, str);
|
||||
}
|
||||
}
|
||||
|
||||
menu_input_dialog_end();
|
||||
@ -482,17 +483,18 @@ static void menu_input_st_string_cb(void *userdata, const char *str)
|
||||
{
|
||||
if (str && *str)
|
||||
{
|
||||
rarch_setting_t *setting = NULL;
|
||||
const char *label = menu_input_dialog_get_label_setting_buffer();
|
||||
const char *label = menu_input_dialog_get_label_setting_buffer();
|
||||
|
||||
if (!string_is_empty(label))
|
||||
setting = menu_setting_find(label);
|
||||
|
||||
if (setting)
|
||||
{
|
||||
setting_set_with_string_representation(setting, str);
|
||||
menu_setting_generic(setting, 0, false);
|
||||
rarch_setting_t *setting = NULL;
|
||||
if ((setting = menu_setting_find(label)))
|
||||
{
|
||||
setting_set_with_string_representation(setting, str);
|
||||
menu_setting_generic(setting, 0, false);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
menu_input_dialog_end();
|
||||
@ -655,8 +657,7 @@ static int setting_bind_action_start(rarch_setting_t *setting)
|
||||
if (!setting)
|
||||
return -1;
|
||||
|
||||
keybind = (struct retro_keybind*)setting->value.target.keybind;
|
||||
if (!keybind)
|
||||
if (!(keybind = (struct retro_keybind*)setting->value.target.keybind))
|
||||
return -1;
|
||||
|
||||
keybind->joykey = NO_BTN;
|
||||
@ -666,10 +667,10 @@ static int setting_bind_action_start(rarch_setting_t *setting)
|
||||
input_keyboard_mapping_bits(0, keybind->key);
|
||||
|
||||
if (setting->index_offset)
|
||||
def_binds = (struct retro_keybind*)retro_keybinds_rest;
|
||||
def_binds = (struct retro_keybind*)retro_keybinds_rest;
|
||||
|
||||
bind_type = setting_get_bind_type(setting);
|
||||
keybind->key = def_binds[bind_type - MENU_SETTINGS_BIND_BEGIN].key;
|
||||
bind_type = setting_get_bind_type(setting);
|
||||
keybind->key = def_binds[bind_type - MENU_SETTINGS_BIND_BEGIN].key;
|
||||
|
||||
keybind->mbutton = NO_BTN;
|
||||
|
||||
@ -689,12 +690,13 @@ static void setting_get_string_representation_hex(rarch_setting_t *setting,
|
||||
}
|
||||
#endif
|
||||
|
||||
void setting_get_string_representation_hex_and_uint(rarch_setting_t *setting,
|
||||
char *s, size_t len)
|
||||
void setting_get_string_representation_hex_and_uint(
|
||||
rarch_setting_t *setting, char *s, size_t len)
|
||||
{
|
||||
if (setting)
|
||||
snprintf(s, len, "%u (%08X)",
|
||||
*setting->value.target.unsigned_integer, *setting->value.target.unsigned_integer);
|
||||
*setting->value.target.unsigned_integer,
|
||||
*setting->value.target.unsigned_integer);
|
||||
}
|
||||
|
||||
void setting_get_string_representation_uint(rarch_setting_t *setting,
|
||||
@ -705,16 +707,16 @@ void setting_get_string_representation_uint(rarch_setting_t *setting,
|
||||
*setting->value.target.unsigned_integer);
|
||||
}
|
||||
|
||||
void setting_get_string_representation_size(rarch_setting_t *setting,
|
||||
char *s, size_t len)
|
||||
void setting_get_string_representation_size(
|
||||
rarch_setting_t *setting, char *s, size_t len)
|
||||
{
|
||||
if (setting)
|
||||
snprintf(s, len, "%" PRI_SIZET,
|
||||
*setting->value.target.sizet);
|
||||
}
|
||||
|
||||
void setting_get_string_representation_size_in_mb(rarch_setting_t *setting,
|
||||
char *s, size_t len)
|
||||
void setting_get_string_representation_size_in_mb(
|
||||
rarch_setting_t *setting, char *s, size_t len)
|
||||
{
|
||||
if (setting)
|
||||
snprintf(s, len, "%" PRI_SIZET,
|
||||
@ -723,8 +725,7 @@ void setting_get_string_representation_size_in_mb(rarch_setting_t *setting,
|
||||
|
||||
#ifdef HAVE_CHEATS
|
||||
static void setting_get_string_representation_uint_as_enum(
|
||||
rarch_setting_t *setting,
|
||||
char *s, size_t len)
|
||||
rarch_setting_t *setting, char *s, size_t len)
|
||||
{
|
||||
if (setting)
|
||||
snprintf(s, len, "%s",
|
||||
@ -759,33 +760,33 @@ static float recalc_step_based_on_length_of_action(rarch_setting_t *setting)
|
||||
int setting_uint_action_left_default(
|
||||
rarch_setting_t *setting, size_t idx, bool wraparound)
|
||||
{
|
||||
double min = 0.0f;
|
||||
bool overflowed = false;
|
||||
float step = 0.0f;
|
||||
|
||||
if (!setting)
|
||||
return -1;
|
||||
|
||||
min = setting->min;
|
||||
step = recalc_step_based_on_length_of_action(setting);
|
||||
|
||||
(void)wraparound; /* TODO/FIXME - handle this */
|
||||
|
||||
step = recalc_step_based_on_length_of_action(setting);
|
||||
overflowed = step > *setting->value.target.unsigned_integer;
|
||||
|
||||
if (!overflowed)
|
||||
if (step > *setting->value.target.unsigned_integer)
|
||||
overflowed = true;
|
||||
else
|
||||
*setting->value.target.unsigned_integer =
|
||||
*setting->value.target.unsigned_integer - step;
|
||||
|
||||
if (setting->enforce_minrange)
|
||||
{
|
||||
double min = setting->min;
|
||||
if (overflowed || *setting->value.target.unsigned_integer < min)
|
||||
{
|
||||
settings_t *settings = config_get_ptr();
|
||||
double max = setting->max;
|
||||
|
||||
if (settings && settings->bools.menu_navigation_wraparound_enable)
|
||||
if (settings &&
|
||||
settings->bools.menu_navigation_wraparound_enable)
|
||||
{
|
||||
double max = setting->max;
|
||||
*setting->value.target.unsigned_integer = max;
|
||||
}
|
||||
else
|
||||
*setting->value.target.unsigned_integer = min;
|
||||
}
|
||||
@ -797,14 +798,12 @@ int setting_uint_action_left_default(
|
||||
int setting_uint_action_right_default(
|
||||
rarch_setting_t *setting, size_t idx, bool wraparound)
|
||||
{
|
||||
double max = 0.0f;
|
||||
float step = 0.0f;
|
||||
|
||||
if (!setting)
|
||||
return -1;
|
||||
|
||||
max = setting->max;
|
||||
step =
|
||||
step =
|
||||
recalc_step_based_on_length_of_action(setting);
|
||||
|
||||
*setting->value.target.unsigned_integer =
|
||||
@ -812,6 +811,7 @@ int setting_uint_action_right_default(
|
||||
|
||||
if (setting->enforce_maxrange)
|
||||
{
|
||||
double max = setting->max;
|
||||
if (*setting->value.target.unsigned_integer > max)
|
||||
{
|
||||
settings_t *settings = config_get_ptr();
|
||||
@ -870,8 +870,9 @@ int setting_bool_action_left_with_refresh(
|
||||
int setting_uint_action_left_with_refresh(
|
||||
rarch_setting_t *setting, size_t idx, bool wraparound)
|
||||
{
|
||||
int retval = setting_uint_action_left_default(setting, idx, wraparound);
|
||||
bool refresh = false;
|
||||
int retval = setting_uint_action_left_default(
|
||||
setting, idx, wraparound);
|
||||
bool refresh = false;
|
||||
|
||||
menu_entries_ctl(MENU_ENTRIES_CTL_SET_REFRESH, &refresh);
|
||||
menu_driver_ctl(RARCH_MENU_CTL_SET_PREVENT_POPULATE, NULL);
|
||||
@ -883,25 +884,20 @@ int setting_uint_action_left_with_refresh(
|
||||
static int setting_size_action_left_default(
|
||||
rarch_setting_t *setting, size_t idx, bool wraparound)
|
||||
{
|
||||
double min = 0.0f;
|
||||
bool overflowed = false;
|
||||
float step = 0.0f;
|
||||
|
||||
if (!setting)
|
||||
return -1;
|
||||
|
||||
min = setting->min;
|
||||
|
||||
(void)wraparound; /* TODO/FIXME - handle this */
|
||||
|
||||
step = recalc_step_based_on_length_of_action(setting);
|
||||
overflowed = step > *setting->value.target.sizet;
|
||||
|
||||
if (!overflowed)
|
||||
if (!(overflowed = step > *setting->value.target.sizet))
|
||||
*setting->value.target.sizet = *setting->value.target.sizet - step;
|
||||
|
||||
if (setting->enforce_minrange)
|
||||
{
|
||||
double min = setting->min;
|
||||
if (overflowed || *setting->value.target.sizet < min)
|
||||
{
|
||||
settings_t *settings = config_get_ptr();
|
||||
@ -920,16 +916,11 @@ static int setting_size_action_left_default(
|
||||
static int setting_size_action_right_default(
|
||||
rarch_setting_t *setting, size_t idx, bool wraparound)
|
||||
{
|
||||
double max = 0.0f;
|
||||
float step = 0.0f;
|
||||
|
||||
if (!setting)
|
||||
return -1;
|
||||
|
||||
max = setting->max;
|
||||
|
||||
(void)wraparound; /* TODO/FIXME - handle this */
|
||||
|
||||
step = recalc_step_based_on_length_of_action(setting);
|
||||
|
||||
*setting->value.target.sizet =
|
||||
@ -937,6 +928,7 @@ static int setting_size_action_right_default(
|
||||
|
||||
if (setting->enforce_maxrange)
|
||||
{
|
||||
double max = setting->max;
|
||||
if (*setting->value.target.sizet > max)
|
||||
{
|
||||
settings_t *settings = config_get_ptr();
|
||||
@ -958,8 +950,6 @@ int setting_generic_action_ok_default(
|
||||
if (!setting)
|
||||
return -1;
|
||||
|
||||
(void)wraparound; /* TODO/FIXME - handle this */
|
||||
|
||||
if (setting->cmd_trigger_idx != CMD_EVENT_NONE)
|
||||
setting->cmd_trigger_event_triggered = true;
|
||||
|
||||
@ -993,7 +983,8 @@ static void setting_get_string_representation_int_gpu_index(rarch_setting_t *set
|
||||
}
|
||||
}
|
||||
|
||||
static void setting_get_string_representation_int(rarch_setting_t *setting,
|
||||
static void setting_get_string_representation_int(
|
||||
rarch_setting_t *setting,
|
||||
char *s, size_t len)
|
||||
{
|
||||
if (setting)
|
||||
@ -1011,6 +1002,7 @@ static void setting_get_string_representation_int(rarch_setting_t *setting,
|
||||
int setting_set_with_string_representation(rarch_setting_t* setting,
|
||||
const char* value)
|
||||
{
|
||||
char *ptr;
|
||||
double min, max;
|
||||
uint64_t flags;
|
||||
if (!setting || !value)
|
||||
@ -1023,7 +1015,7 @@ int setting_set_with_string_representation(rarch_setting_t* setting,
|
||||
switch (setting->type)
|
||||
{
|
||||
case ST_INT:
|
||||
sscanf(value, "%d", setting->value.target.integer);
|
||||
*setting->value.target.integer = (int)strtol(value, &ptr, 10);
|
||||
if (flags & SD_FLAG_HAS_RANGE)
|
||||
{
|
||||
if (setting->enforce_minrange && *setting->value.target.integer < min)
|
||||
@ -1039,7 +1031,7 @@ int setting_set_with_string_representation(rarch_setting_t* setting,
|
||||
}
|
||||
break;
|
||||
case ST_UINT:
|
||||
sscanf(value, "%u", setting->value.target.unsigned_integer);
|
||||
*setting->value.target.unsigned_integer = (unsigned int)strtoul(value, &ptr, 10);
|
||||
if (flags & SD_FLAG_HAS_RANGE)
|
||||
{
|
||||
if (setting->enforce_minrange && *setting->value.target.unsigned_integer < min)
|
||||
@ -1071,7 +1063,11 @@ int setting_set_with_string_representation(rarch_setting_t* setting,
|
||||
}
|
||||
break;
|
||||
case ST_FLOAT:
|
||||
#if defined(_MSC_VER) && _MSC_VER < 1800
|
||||
sscanf(value, "%f", setting->value.target.fraction);
|
||||
#else
|
||||
*setting->value.target.fraction = strtof(value, &ptr);
|
||||
#endif
|
||||
if (flags & SD_FLAG_HAS_RANGE)
|
||||
{
|
||||
if (setting->enforce_minrange && *setting->value.target.fraction < min)
|
||||
@ -1113,19 +1109,15 @@ int setting_set_with_string_representation(rarch_setting_t* setting,
|
||||
static int setting_fraction_action_left_default(
|
||||
rarch_setting_t *setting, size_t idx, bool wraparound)
|
||||
{
|
||||
double min = 0.0f;
|
||||
|
||||
if (!setting)
|
||||
return -1;
|
||||
|
||||
min = setting->min;
|
||||
|
||||
(void)wraparound; /* TODO/FIXME - handle this */
|
||||
|
||||
*setting->value.target.fraction = *setting->value.target.fraction - setting->step;
|
||||
*setting->value.target.fraction =
|
||||
*setting->value.target.fraction - setting->step;
|
||||
|
||||
if (setting->enforce_minrange)
|
||||
{
|
||||
double min = setting->min;
|
||||
if (*setting->value.target.fraction < min)
|
||||
{
|
||||
settings_t *settings = config_get_ptr();
|
||||
@ -1144,20 +1136,15 @@ static int setting_fraction_action_left_default(
|
||||
static int setting_fraction_action_right_default(
|
||||
rarch_setting_t *setting, size_t idx, bool wraparound)
|
||||
{
|
||||
double max = 0.0f;
|
||||
|
||||
if (!setting)
|
||||
return -1;
|
||||
|
||||
max = setting->max;
|
||||
|
||||
(void)wraparound; /* TODO/FIXME - handle this */
|
||||
|
||||
*setting->value.target.fraction =
|
||||
*setting->value.target.fraction + setting->step;
|
||||
|
||||
if (setting->enforce_maxrange)
|
||||
{
|
||||
double max = setting->max;
|
||||
if (*setting->value.target.fraction > max)
|
||||
{
|
||||
settings_t *settings = config_get_ptr();
|
||||
@ -1257,8 +1244,10 @@ static void setting_get_string_representation_st_bool(rarch_setting_t *setting,
|
||||
char *s, size_t len)
|
||||
{
|
||||
if (setting)
|
||||
strlcpy(s, *setting->value.target.boolean ? setting->boolean.on_label :
|
||||
setting->boolean.off_label, len);
|
||||
strlcpy(s, *setting->value.target.boolean
|
||||
? setting->boolean.on_label
|
||||
: setting->boolean.off_label,
|
||||
len);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -1283,8 +1272,9 @@ static void setting_get_string_representation_st_dir(rarch_setting_t *setting,
|
||||
{
|
||||
if (setting)
|
||||
strlcpy(s,
|
||||
*setting->value.target.string ?
|
||||
setting->value.target.string : setting->dir.empty_path,
|
||||
*setting->value.target.string
|
||||
? setting->value.target.string
|
||||
: setting->dir.empty_path,
|
||||
len);
|
||||
}
|
||||
|
||||
@ -1327,12 +1317,8 @@ static int setting_action_action_ok(
|
||||
{
|
||||
if (!setting)
|
||||
return -1;
|
||||
|
||||
(void)wraparound; /* TODO/FIXME - handle this */
|
||||
|
||||
if (setting->cmd_trigger_idx != CMD_EVENT_NONE)
|
||||
command_event(setting->cmd_trigger_idx, NULL);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -1861,25 +1847,21 @@ static rarch_setting_t setting_bind_setting(const char* name,
|
||||
static int setting_int_action_left_default(
|
||||
rarch_setting_t *setting, size_t idx, bool wraparound)
|
||||
{
|
||||
double min = 0.0f;
|
||||
|
||||
if (!setting)
|
||||
return -1;
|
||||
|
||||
min = setting->min;
|
||||
|
||||
(void)wraparound; /* TODO/FIXME - handle this */
|
||||
|
||||
*setting->value.target.integer = *setting->value.target.integer - setting->step;
|
||||
|
||||
if (setting->enforce_minrange)
|
||||
{
|
||||
double min = setting->min;
|
||||
if (*setting->value.target.integer < min)
|
||||
{
|
||||
settings_t *settings = config_get_ptr();
|
||||
double max = setting->max;
|
||||
|
||||
if (settings && settings->bools.menu_navigation_wraparound_enable)
|
||||
if ( settings
|
||||
&& settings->bools.menu_navigation_wraparound_enable)
|
||||
*setting->value.target.integer = max;
|
||||
else
|
||||
*setting->value.target.integer = min;
|
||||
@ -1895,10 +1877,10 @@ static int setting_bool_action_ok_default(
|
||||
if (!setting)
|
||||
return -1;
|
||||
|
||||
(void)wraparound; /* TODO/FIXME - handle this */
|
||||
|
||||
setting_set_with_string_representation(setting,
|
||||
*setting->value.target.boolean ? "false" : "true");
|
||||
*setting->value.target.boolean
|
||||
? "false"
|
||||
: "true");
|
||||
|
||||
return 0;
|
||||
}
|
||||
@ -1909,10 +1891,10 @@ static int setting_bool_action_toggle_default(
|
||||
if (!setting)
|
||||
return -1;
|
||||
|
||||
(void)wraparound; /* TODO/FIXME - handle this */
|
||||
|
||||
setting_set_with_string_representation(setting,
|
||||
*setting->value.target.boolean ? "false" : "true");
|
||||
*setting->value.target.boolean
|
||||
? "false"
|
||||
: "true");
|
||||
|
||||
return 0;
|
||||
}
|
||||
@ -3067,11 +3049,9 @@ static void setting_get_string_representation_video_record_quality(rarch_setting
|
||||
static void setting_get_string_representation_video_filter(rarch_setting_t *setting,
|
||||
char *s, size_t len)
|
||||
{
|
||||
if (!setting)
|
||||
return;
|
||||
|
||||
fill_pathname(s, path_basename(setting->value.target.string),
|
||||
"", len);
|
||||
if (setting)
|
||||
fill_pathname(s, path_basename(setting->value.target.string),
|
||||
"", len);
|
||||
}
|
||||
|
||||
static void setting_get_string_representation_state_slot(rarch_setting_t *setting,
|
||||
@ -3097,19 +3077,15 @@ static void setting_get_string_representation_percentage(rarch_setting_t *settin
|
||||
static void setting_get_string_representation_float_video_msg_color(rarch_setting_t *setting,
|
||||
char *s, size_t len)
|
||||
{
|
||||
if (!setting)
|
||||
return;
|
||||
|
||||
snprintf(s, len, "%d", (int)(*setting->value.target.fraction * 255.0f));
|
||||
if (setting)
|
||||
snprintf(s, len, "%d", (int)(*setting->value.target.fraction * 255.0f));
|
||||
}
|
||||
|
||||
static void setting_get_string_representation_max_users(rarch_setting_t *setting,
|
||||
char *s, size_t len)
|
||||
{
|
||||
if (!setting)
|
||||
return;
|
||||
|
||||
snprintf(s, len, "%d", *setting->value.target.unsigned_integer);
|
||||
if (setting)
|
||||
snprintf(s, len, "%d", *setting->value.target.unsigned_integer);
|
||||
}
|
||||
|
||||
#ifdef HAVE_CHEEVOS
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user