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

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

View file

@ -3536,7 +3536,8 @@ int playlist_directory_tracksearch(const char* dirname, bool recurse,
if (recurse)
{
/* 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,
callback, context);
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)
{
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)
{