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

Mapper: use Path::IsAbsolute()

Browse Source
This commit is contained in:
Max Kellermann
2015-02-28 23:50:18 +01:00
parent 0e00b9009d
commit 77e163e5b8
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Mapper.cxx
View File

@@ -86,11 +86,9 @@ map_uri_fs(const char *uri)
} }
std::string std::string
map_fs_to_utf8(Path _path_fs) map_fs_to_utf8(Path path_fs)
{ {
auto path_fs = _path_fs.c_str(); if (path_fs.IsAbsolute()) {
if (PathTraitsFS::IsSeparator(path_fs[0])) {
if (instance->storage == nullptr) if (instance->storage == nullptr)
return std::string(); return std::string();
@@ -98,12 +96,14 @@ map_fs_to_utf8(Path _path_fs)
if (music_dir_fs.IsNull()) if (music_dir_fs.IsNull())
return std::string(); return std::string();
path_fs = music_dir_fs.Relative(_path_fs); auto relative = music_dir_fs.Relative(path_fs);
if (path_fs == nullptr || *path_fs == 0) if (relative == nullptr || *relative == 0)
return std::string(); return std::string();
path_fs = Path::FromFS(relative);
} }
return PathToUTF8(path_fs); return path_fs.ToUTF8();
} }
#endif #endif