len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-09 21:22:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

FS#11725: fix duplicationg slash indicating root in filename.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28705 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Teruaki Kawashima 2010-11-29 12:51:44 +00:00
parent 4fd775f7f0
commit 47f670d3c2
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
apps/playlist.c
View file

@ -3536,7 +3536,8 @@ int playlist_directory_tracksearch(const char* dirname, bool recurse,
if (recurse) if (recurse)
{ {
/* recursively add directories */ /* recursively add directories */
snprintf(buf, sizeof(buf), "%s/%s", dirname, files[i].name); snprintf(buf, sizeof(buf), "%s/%s",
dirname[1]? dirname: "", files[i].name);
result = playlist_directory_tracksearch(buf, recurse, result = playlist_directory_tracksearch(buf, recurse,
callback, context); callback, context);
if (result < 0) if (result < 0)
@ -3562,7 +3563,8 @@ int playlist_directory_tracksearch(const char* dirname, bool recurse,
} }
else if ((files[i].attr & FILE_ATTR_MASK) == FILE_ATTR_AUDIO) else if ((files[i].attr & FILE_ATTR_MASK) == FILE_ATTR_AUDIO)
{ {
snprintf(buf, sizeof(buf), "%s/%s", dirname, files[i].name); snprintf(buf, sizeof(buf), "%s/%s",
dirname[1]? dirname: "", files[i].name);
if (callback(buf, context) != 0) if (callback(buf, context) != 0)
{ {

3
apps/recorder/recording.c
View file

@ -621,7 +621,8 @@ char *rec_create_filename(char *buffer)
pref = prestr[global_settings.rec_source]; pref = prestr[global_settings.rec_source];
} }
strcpy(buffer, global_settings.rec_directory); strcpy(buffer, !strcmp(global_settings.rec_directory, "/")?
"": global_settings.rec_directory);
snprintf(ext, sizeof(ext), ".%s", snprintf(ext, sizeof(ext), ".%s",
REC_FILE_ENDING(global_settings.rec_format)); REC_FILE_ENDING(global_settings.rec_format));