Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

playlist: Unconditionally strip bogus dirs in playlist_peek()

Browse source 
The intent behind the check is to only do this if the filename
comes from an on-disk file. With the RAM buffer is gone this is
now "always" the case.

Change-Id: I4c26e32c482dde176b69a6071e9562e9955d7171
This commit is contained in:
Aidan MacDonald 2023-03-21 12:31:12 +00:00
parent aab6a44fc5
commit a4cfa8ae6a
1 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
apps/playlist.c
View file

@ -3149,25 +3149,22 @@ const char* playlist_peek(int steps, char* buf, size_t buf_size)
temp_ptr = buf; temp_ptr = buf;
if (!playlist->dirplay || control_file) /* remove bogus dirs from beginning of path
(workaround for buggy playlist creation tools) */
while (temp_ptr)
{ {
/* remove bogus dirs from beginning of path if (file_exists(temp_ptr))
(workaround for buggy playlist creation tools) */ break;
while (temp_ptr)
{
if (file_exists(temp_ptr))
break;
temp_ptr = strchr(temp_ptr+1, '/'); temp_ptr = strchr(temp_ptr+1, '/');
} }
if (!temp_ptr) if (!temp_ptr)
{ {
/* Even though this is an invalid file, we still need to pass a /* Even though this is an invalid file, we still need to pass a
file name to the caller because NULL is used to indicate end file name to the caller because NULL is used to indicate end
of playlist */ of playlist */
return buf; return buf;
}
} }
return temp_ptr; return temp_ptr;