len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 18:17:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

playlist save: ensure required file exists, proper filename used

Browse source 
Trying to save a current playlist associated with a
file that doesn't exist anymore, is likely to result
in a panic.

+return to keyboard picker after
complaining about missing dir.

Change-Id: I00ea0b08521d4a4503243d636af01252119939bc
This commit is contained in:
Christian Soffke 2025-03-11 17:57:27 +01:00
parent 8d2226f952
commit a77cb9dc77
3 changed files with 29 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

23
apps/playlist_catalog.c
View file

@ -411,16 +411,33 @@ static int remove_extension(char* path)
bool catalog_pick_new_playlist_name(char *pl_name, size_t buf_size,
const char* curr_pl_name)
{
char bmark_file[MAX_PATH + 7];
char bmark_file[MAX_PATH + 7], *p;
bool do_save = false;
while (!do_save && !remove_extension(pl_name) &&
!kbd_input(pl_name, buf_size - 7, NULL))
{
do_save = true;
if (*pl_name == PATH_SEPCH) /* Require absolute filenames */
{
p = strrchr(pl_name, PATH_SEPCH);
do_save = *(p + 1); /* Disallow empty filename */
/* prevent illegal characters */
fix_path_part(p, 1, strlen(p + 1));
/* Create dir if necessary */
if (do_save && p != (char *) pl_name)
{
*p = '\0';
do_save = dir_exists(pl_name) || mkdir(pl_name) == 0;
if (!do_save)
splashf(HZ*2, ID2P(LANG_CATALOG_NO_DIRECTORY), pl_name);
*p = PATH_SEPCH;
}
}
apply_playlist_extension(pl_name, buf_size);
/* warn before overwriting existing (different) playlist */
if (!curr_pl_name || strcmp(curr_pl_name, pl_name))
if (do_save && (!curr_pl_name || strcmp(curr_pl_name, pl_name)))
{
if (file_exists(pl_name))
do_save = yesno_pop(ID2P(LANG_REALLY_OVERWRITE));