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

db/update/Walk: use AllocatedPath methods instead of PathTraitsFS

Browse Source
This commit is contained in:
Max Kellermann 2016-04-21 14:15:01 +02:00
parent bec6fa4ad7
commit c98330909a
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/db/update/Walk.cxx
View File

@ -35,7 +35,6 @@
#include "fs/AllocatedPath.hxx" #include "fs/AllocatedPath.hxx"
#include "fs/Traits.hxx" #include "fs/Traits.hxx"
#include "fs/FileSystem.hxx" #include "fs/FileSystem.hxx"
#include "fs/Charset.hxx"
#include "storage/FileInfo.hxx" #include "storage/FileInfo.hxx"
#include "util/Alloc.hxx" #include "util/Alloc.hxx"
#include "util/StringCompare.hxx" #include "util/StringCompare.hxx"
@ -278,12 +277,10 @@ UpdateWalk::SkipSymlink(const Directory *directory,
return false; return false;
} }
const char *target_str = target.c_str(); if (target.IsAbsolute()) {
if (PathTraitsFS::IsAbsolute(target_str)) {
/* if the symlink points to an absolute path, see if /* if the symlink points to an absolute path, see if
that path is inside the music directory */ that path is inside the music directory */
const auto target_utf8 = PathToUTF8(target_str); const auto target_utf8 = target.ToUTF8();
if (target_utf8.empty()) if (target_utf8.empty())
return true; return true;
@ -294,7 +291,7 @@ UpdateWalk::SkipSymlink(const Directory *directory,
: !follow_outside_symlinks; : !follow_outside_symlinks;
} }
const char *p = target_str; const char *p = target.c_str();
while (*p == '.') { while (*p == '.') {
if (p[1] == '.' && PathTraitsFS::IsSeparator(p[2])) { if (p[1] == '.' && PathTraitsFS::IsSeparator(p[2])) {
/* "../" moves to parent directory */ /* "../" moves to parent directory */