mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-03 13:14:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rewrite some more strlcat calls

Browse Source
This commit is contained in:
libretroadmin 2023-06-20 19:52:38 +02:00
parent e3db17bf2d
commit 46d6240f21
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
retroarch.c
View File

@ -5564,13 +5564,14 @@ static bool retroarch_parse_input_and_config(
if (first_run)
{
size_t _len = 0;
/* Copy the args into a buffer so launch arguments can be reused */
for (i = 0; i < (unsigned)argc; i++)
{
strlcat(p_rarch->launch_arguments,
argv[i], sizeof(p_rarch->launch_arguments));
strlcat(p_rarch->launch_arguments, " ",
sizeof(p_rarch->launch_arguments));
_len += strlcpy(p_rarch->launch_arguments + _len,
argv[i], sizeof(p_rarch->launch_arguments) - _len);
_len += strlcpy(p_rarch->launch_arguments + _len,
" ", sizeof(p_rarch->launch_arguments) - _len);
}
string_trim_whitespace_left(p_rarch->launch_arguments);
string_trim_whitespace_right(p_rarch->launch_arguments);

18
runtime_file.c
View File

@ -572,7 +572,7 @@ static void runtime_log_get_last_played_time(runtime_log_t *runtime_log,
static bool runtime_last_played_human(runtime_log_t *runtime_log,
char *str, size_t len)
{
size_t _len;
size_t _len, _len2;
struct tm time_info;
time_t last_played;
time_t current;
@ -612,16 +612,16 @@ static bool runtime_last_played_human(runtime_log_t *runtime_log,
/* Generate string */
_len = snprintf(tmp, sizeof(tmp), "%u ", (int)delta);
if (delta == 1)
strlcpy(tmp + _len, msg_hash_to_str((enum msg_hash_enums)units[i][0]),
sizeof(tmp) - _len);
else
strlcpy(tmp + _len, msg_hash_to_str((enum msg_hash_enums)units[i][1]),
_len += strlcpy (tmp + _len,
msg_hash_to_str((enum msg_hash_enums)units[i][(delta == 1) ? 0 : 1]),
sizeof(tmp) - _len);
strlcat(str, tmp, len);
strlcat(str, " ", len);
strlcat(str, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_TIME_UNIT_AGO), len);
_len2 = strlcat(str, tmp, len);
str[ _len2] = ' ';
str[++_len2] = '\0';
_len2 += strlcpy(str + _len2,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_TIME_UNIT_AGO),
len - _len2);
return true;
}