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

skin_tokens.c get_dir() improve path detection

Browse source 
get_dir grabs a component of a path
it now handles
multiple slashes, no leading slashes

Change-Id: I6c4a377796652808a02b44f6da0a63b201dd8f46
This commit is contained in:
William Wilgus 2024-04-03 23:10:07 -04:00 • committed by William Wilgus
parent 3714288f7a
commit 76a9a524c0
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
apps/gui/skin_engine/skin_tokens.c
View file

@ -87,6 +87,7 @@ static const char* get_codectype(const struct mp3entry* id3)
* level - what to extract. 0 is file name, 1 is parent of file, 2 is * level - what to extract. 0 is file name, 1 is parent of file, 2 is
* parent of parent, etc. * parent of parent, etc.
* *
* path does not need to be absolute, ignores multiple slashes
* Returns buf if the desired level was found, NULL otherwise. * Returns buf if the desired level was found, NULL otherwise.
*/ */
char* get_dir(char* buf, int buf_size, const char* path, int level) char* get_dir(char* buf, int buf_size, const char* path, int level)
@ -94,7 +95,7 @@ char* get_dir(char* buf, int buf_size, const char* path, int level)
const char* sep; const char* sep;
const char* last_sep; const char* last_sep;
int len; int len;
buf[0] = '\0';
sep = path + strlen(path); sep = path + strlen(path);
last_sep = sep; last_sep = sep;
@ -105,15 +106,19 @@ char* get_dir(char* buf, int buf_size, const char* path, int level)
if (!level) if (!level)
break; break;
level--;
last_sep = sep - 1; last_sep = sep - 1;
if (*last_sep != '/') /* ignore multiple separators */
level--;
} }
} }
if (level || (last_sep <= sep)) if (level || (last_sep <= sep)) /* level was not found */
return NULL; return NULL;
len = MIN(last_sep - sep, buf_size - 1); if (sep == path && *sep != '/') /* for paths without leading separator */
sep = path - 1;
len = MIN((last_sep - sep), buf_size - 1);
strmemccpy(buf, sep + 1, len + 1); strmemccpy(buf, sep + 1, len + 1);
return buf; return buf;
} }