devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

replace strlcpy with strmemccpy

Browse source 
replace applicable calls to strlcpy with calls to strmemccpy
which null terminates on truncation

in theory the strmemccpy calls should be slightly faster since they
don't traverse the rest of the source string on truncation
but I seriously doubt there is too much of that going on in the code base

Change-Id: Ia0251514e36a6242bbf3f03c5e0df123aba60ed2
This commit is contained in:
William Wilgus 2022-11-14 11:32:34 -05:00 • committed by William Wilgus
parent b25a9d8f99
commit f6c719d7ec
43 changed files with 236 additions and 174 deletions
Download patch file Download diff file Expand all files Collapse all files

12
apps/playlist.c
View file

@ -1457,7 +1457,7 @@ static int get_filename(struct playlist_info* playlist, int index, int seek,
}
}
strlcpy(dir_buf, playlist->filename, playlist->dirlen);
strmemccpy(dir_buf, playlist->filename, playlist->dirlen);
return format_track_path(buf, tmp_buf, buf_length, dir_buf);
@ -1551,7 +1551,7 @@ static int get_next_dir(char *dir, bool is_forward)
/* if the current file is within our base dir, use its dir instead */
if (base_len == 0 || !strncmp(playlist->filename, dir, base_len))
strlcpy(dir, playlist->filename, playlist->dirlen);
strmemccpy(dir, playlist->filename, playlist->dirlen);
/* use the tree browser dircache to load files */
*(tc->dirfilter) = SHOW_ALL;
@ -2034,7 +2034,7 @@ void playlist_init(void)
mutex_init(&created_playlist_mutex);
playlist->current = true;
strlcpy(playlist->control_filename, PLAYLIST_CONTROL_FILE,
strmemccpy(playlist->control_filename, PLAYLIST_CONTROL_FILE,
sizeof(playlist->control_filename));
playlist->fd = -1;
playlist->control_fd = -1;
@ -2955,7 +2955,7 @@ int playlist_set_current(struct playlist_info* playlist)
empty_playlist(&current_playlist, false);
strlcpy(current_playlist.filename, playlist->filename,
strmemccpy(current_playlist.filename, playlist->filename,
sizeof(current_playlist.filename));
current_playlist.utf8 = playlist->utf8;
@ -3517,7 +3517,7 @@ char *playlist_name(const struct playlist_info* playlist, char *buf,
if (!playlist)
playlist = &current_playlist;
strlcpy(buf, playlist->filename+playlist->dirlen, buf_size);
strmemccpy(buf, playlist->filename+playlist->dirlen, buf_size);
if (!buf[0])
return NULL;
@ -3537,7 +3537,7 @@ char *playlist_get_name(const struct playlist_info* playlist, char *buf,
if (!playlist)
playlist = &current_playlist;
strlcpy(buf, playlist->filename, buf_size);
strmemccpy(buf, playlist->filename, buf_size);
if (!buf[0])
return NULL;