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

talk: When mangling paths, use PATH_SEPCH/SEPSTR

Browse source 
Strictly speaking all of our paths need to work this way..

Change-Id: Id30d26cccdb80eceb7daf9ad04dfd53591b1921f
This commit is contained in:
Solomon Peachy 2024-07-28 16:35:11 -04:00
parent 86bff6214d
commit c5e1539c74
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
apps/talk.c
View file

@ -777,7 +777,7 @@ static int _talk_spell(const char* spell, size_t len, bool enqueue)
talk_id(VOICE_DOT, true); talk_id(VOICE_DOT, true);
else if (c == ' ') else if (c == ' ')
talk_id(VOICE_PAUSE, true); talk_id(VOICE_PAUSE, true);
else if (c == '/') else if (c == PATH_SEPCH)
talk_id(VOICE_CHAR_SLASH, true); talk_id(VOICE_CHAR_SLASH, true);
while (QUEUE_LEVEL == QUEUE_SIZE - 1) /* queue full - busy loop */ while (QUEUE_LEVEL == QUEUE_SIZE - 1) /* queue full - busy loop */
@ -1140,12 +1140,12 @@ int talk_file(const char *root, const char *dir, const char *file,
{ {
char buf[MAX_PATH]; char buf[MAX_PATH];
const char *fmt = "%s%s%s%s%s"; const char *fmt = "%s%s%s%s%s";
/* Does root end with a slash */ /* Does root end with a slash? */
if(root && root[0] && root[strlen(root)-1] != '/') if(root && root[0] && root[strlen(root)-1] != PATH_SEPCH)
fmt = "%s/%s%s%s%s"; fmt = "%s" PATH_SEPSTR "%s%s%s%s";
snprintf(buf, MAX_PATH, fmt, snprintf(buf, MAX_PATH, fmt,
root ? root : "", root ? root : "",
dir ? dir : "", dir ? "/" : "", dir ? dir : "", dir ? PATH_SEPSTR : "",
file ? file : "", file ? file : "",
ext ? ext : ""); ext ? ext : "");
return _talk_file(buf, prefix_ids, enqueue); return _talk_file(buf, prefix_ids, enqueue);
@ -1207,14 +1207,14 @@ int talk_fullpath(const char* path, bool enqueue)
{ {
do_enqueue(enqueue); /* cut off all the pending stuff */ do_enqueue(enqueue); /* cut off all the pending stuff */
if(path[0] != '/') if(path[0] != PATH_SEPCH)
/* path ought to start with /... */ /* path ought to start with /... */
return talk_spell(path, true); return talk_spell(path, true);
talk_id(VOICE_CHAR_SLASH, true); talk_id(VOICE_CHAR_SLASH, true);
char buf[MAX_PATH]; char buf[MAX_PATH];
strmemccpy(buf, path, MAX_PATH); strmemccpy(buf, path, MAX_PATH);
char *start = buf+1; /* start of current component */ char *start = buf+1; /* start of current component */
char *ptr = strchr(start, '/'); /* end of current component */ char *ptr = strchr(start, PATH_SEPCH); /* end of current component */
while(ptr) { /* There are more slashes ahead */ while(ptr) { /* There are more slashes ahead */
/* temporarily poke a NULL at end of component to truncate string */ /* temporarily poke a NULL at end of component to truncate string */
*ptr = '\0'; *ptr = '\0';
@ -1226,10 +1226,10 @@ int talk_fullpath(const char* path, bool enqueue)
} else } else
#endif #endif
talk_dir_or_spell(buf, NULL, true); talk_dir_or_spell(buf, NULL, true);
*ptr = '/'; /* restore string */ *ptr = PATH_SEPCH; /* restore string */
talk_id(VOICE_CHAR_SLASH, true); talk_id(VOICE_CHAR_SLASH, true);
start = ptr+1; /* setup for next component */ start = ptr+1; /* setup for next component */
ptr = strchr(start, '/'); ptr = strchr(start, PATH_SEPCH);
} }
/* no more slashes, final component is a filename */ /* no more slashes, final component is a filename */