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

ConfigPath: simplify the duplicate tilde check

Browse Source
This commit is contained in:
Max Kellermann 2013-09-12 10:21:37 +02:00
parent 3aaf013dd1
commit 1c65908cdb
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ConfigPath.cxx
View File

@ -87,11 +87,7 @@ ParsePath(const char *path, Error &error)
return Path::Null(); return Path::Null();
#ifndef WIN32 #ifndef WIN32
if (!g_path_is_absolute(path) && path[0] != '~') { if (path[0] == '~') {
error.Format(path_domain,
"not an absolute path: %s", path);
return Path::Null();
} else if (path[0] == '~') {
Path home = Path::Null(); Path home = Path::Null();
if (path[1] == '/' || path[1] == '\0') { if (path[1] == '/' || path[1] == '\0') {
@ -116,6 +112,10 @@ ParsePath(const char *path, Error &error)
return Path::Null(); return Path::Null();
return Path::Build(home, path2); return Path::Build(home, path2);
} else if (!g_path_is_absolute(path)) {
error.Format(path_domain,
"not an absolute path: %s", path);
return Path::Null();
} else { } else {
#endif #endif
return path2; return path2;