oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge tag 'v0.21.22'

Browse Source 
release v0.21.22
This commit is contained in:
Max Kellermann
2020-04-02 18:02:10 +02:00
parent 7d7bd51bc0 5ccfcffcc1
commit 12b97bbe38
48 changed files with 605 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/db/plugins/simple/Directory.cxx
View File

@@ -32,6 +32,7 @@
#include "fs/Traits.hxx"
#include "util/Alloc.hxx"
#include "util/DeleteDisposer.hxx"
#include "util/StringCompare.hxx"
#include <cassert>
@@ -70,7 +71,15 @@ Directory::GetName() const noexcept
{
assert(!IsRoot());
return PathTraitsUTF8::GetBase(path.c_str());
if (parent->IsRoot())
return path.c_str();
assert(StringAfterPrefix(path.c_str(), parent->path.c_str()) != nullptr);
assert(*StringAfterPrefix(path.c_str(), parent->path.c_str()) == PathTraitsUTF8::SEPARATOR);
/* strip the parent directory path and the slash separator
from this directory's path, and the base name remains */
return path.c_str() + parent->path.length() + 1;
}
Directory *