diff options
| author | Max Kellermann <max@duempel.org> | 2013-10-17 23:23:25 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-10-17 23:23:25 +0200 |
| commit | b3611524f45c2a478f9decd6d22ecd1dbbbb64b9 (patch) | |
| tree | d15d0c161e24e5db7d77b768458aa11cb6650878 /src/UpdateWalk.cxx | |
| parent | a63613dba0374367907180be5e244db450ff234b (diff) | |
| download | mpd-b3611524f45c2a478f9decd6d22ecd1dbbbb64b9.tar.gz mpd-b3611524f45c2a478f9decd6d22ecd1dbbbb64b9.tar.xz mpd-b3611524f45c2a478f9decd6d22ecd1dbbbb64b9.zip | |
fs/Path: move definitions to struct PathTraits
Diffstat (limited to 'src/UpdateWalk.cxx')
| -rw-r--r-- | src/UpdateWalk.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/UpdateWalk.cxx b/src/UpdateWalk.cxx index bb9b307dc..82a0959b1 100644 --- a/src/UpdateWalk.cxx +++ b/src/UpdateWalk.cxx @@ -35,6 +35,7 @@ #include "ConfigGlobal.hxx" #include "ConfigOption.hxx" #include "fs/Path.hxx" +#include "fs/Traits.hxx" #include "fs/FileSystem.hxx" #include "fs/DirectoryReader.hxx" #include "util/UriUtil.hxx" @@ -295,7 +296,7 @@ skip_symlink(const Directory *directory, const char *utf8_name) const char *target_str = target.c_str(); - if (Path::IsAbsoluteFS(target_str)) { + if (PathTraits::IsAbsoluteFS(target_str)) { /* if the symlink points to an absolute path, see if that path is inside the music directory */ const char *relative = map_to_relative_path(target_str); @@ -306,7 +307,7 @@ skip_symlink(const Directory *directory, const char *utf8_name) const char *p = target_str; while (*p == '.') { - if (p[1] == '.' && Path::IsSeparatorFS(p[2])) { + if (p[1] == '.' && PathTraits::IsSeparatorFS(p[2])) { /* "../" moves to parent directory */ directory = directory->parent; if (directory == NULL) { @@ -316,7 +317,7 @@ skip_symlink(const Directory *directory, const char *utf8_name) return !follow_outside_symlinks; } p += 3; - } else if (Path::IsSeparatorFS(p[1])) + } else if (PathTraits::IsSeparatorFS(p[1])) /* eliminate "./" */ p += 2; else |