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

[Bugfix] filetree.c ft_assemble_path() absolute currdir

Browse source 
path_append throws away the basepath if currdir starts with a slash
I thought I had this fixed but it was just getting covered up

instead step past all the slashes and use that for our append dir

Change-Id: I170a2af99455cea09e6e695dfb89fdd42733bd4b
This commit is contained in:
William Wilgus 2024-06-08 01:05:58 -04:00
parent 935fb736e8
commit de4a08f319
1 changed files with 39 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

57
apps/filetree.c
View file

@ -473,43 +473,64 @@ static void ft_apply_skin_file(char *buf, char *file, const int maxlen)
settings_apply_skins(); settings_apply_skins();
} }
static const char *strip_slash(const char *path, const char *def)
{
if (path)
{
while (*path == PATH_SEPCH)
path++; /* we don't want this treated as an absolute path */
return path;
}
return def;
}
int ft_assemble_path(char *buf, size_t bufsz, const char* currdir, const char* filename) int ft_assemble_path(char *buf, size_t bufsz, const char* currdir, const char* filename)
{ {
size_t len; size_t len;
if (!filename) const char *cd = strip_slash(currdir, "");
filename = ""; filename = strip_slash(filename, "");
/* remove slashes and NULL strings to make logic below simpler */
#ifdef HAVE_MULTIVOLUME #ifdef HAVE_MULTIVOLUME
if (currdir && currdir[0] && currdir[1]) /* Not in / */ /* Multi-volume device drives might be enumerated in root so everything
should be an absolute qualified path with <drive>/ prepended */
if (*cd != '\0') /* Not in / */
{ {
if (currdir[1] != VOL_START_TOK) if (*cd == VOL_START_TOK)
{ {
len = path_append(buf, root_realpath(), currdir, bufsz); /* use currdir, here we want the slash as it already contains the <drive> */
if (len < bufsz) len = path_append(buf, currdir, filename, bufsz);
len = path_append(buf + len, PA_SEP_HARD, filename, bufsz - len); } /* buf => /currdir/filename */
} else
len = path_append(buf, currdir, filename, bufsz); {
len = path_append(buf, root_realpath(), cd, bufsz); /* /<drive>/currdir */
if(len < bufsz)
len += path_append(buf + len, PA_SEP_HARD, filename, bufsz - len);
} /* buf => /<drive>/currdir/filename */
} }
else /* In / */ else /* In / */
{ {
if (filename[0] != VOL_START_TOK) if (*filename == VOL_START_TOK)
{
len = path_append(buf, PATH_SEPSTR, filename, bufsz);
} /* buf => /filename */
else
{ {
len = path_append(buf, root_realpath(), filename, bufsz); len = path_append(buf, root_realpath(), filename, bufsz);
} } /* buf => /<drive>/filename */
else
len = path_append(buf, PATH_SEPSTR, filename, bufsz);
} }
#else #else
if (currdir && currdir[0] && currdir[1]) /* Not in / */ /* Other devices might need a specific drive/dir prepended but its usually '/' */
if (*cd != '\0') /* Not in / */
{ {
len = path_append(buf, root_realpath(), currdir, bufsz); len = path_append(buf, root_realpath(), cd, bufsz);/* /currdir */
if(len < bufsz) if(len < bufsz)
len = path_append(buf + len, PA_SEP_HARD, filename, bufsz - len); len += path_append(buf + len, PA_SEP_HARD, filename, bufsz - len);
} } /* buf => /currdir/filename */
else /* In / */ else /* In / */
{ {
len = path_append(buf, root_realpath(), filename, bufsz); len = path_append(buf, root_realpath(), filename, bufsz);
} } /* buf => /filename */
#endif #endif
if (len > bufsz) if (len > bufsz)