diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-02-05 17:38:54 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-02-05 17:38:54 +0300 |
| commit | 8db4a7da23c36718152ca29cfb067bcfc759a92f (patch) | |
| tree | 0dc6ef2f71248d20a3a00432d644140b4cda68e2 /src/utils | |
| parent | 261ff1fa32cb75254d68d214f13f8a5aaec33962 (diff) | |
| download | manaplus-8db4a7da23c36718152ca29cfb067bcfc759a92f.tar.gz manaplus-8db4a7da23c36718152ca29cfb067bcfc759a92f.tar.bz2 manaplus-8db4a7da23c36718152ca29cfb067bcfc759a92f.tar.xz manaplus-8db4a7da23c36718152ca29cfb067bcfc759a92f.zip | |
Move path functions from stringutils to paths.
Diffstat (limited to 'src/utils')
| -rw-r--r-- | src/utils/paths.cpp | 10 | ||||
| -rw-r--r-- | src/utils/paths.h | 2 | ||||
| -rw-r--r-- | src/utils/stringutils.cpp | 10 | ||||
| -rw-r--r-- | src/utils/stringutils.h | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/src/utils/paths.cpp b/src/utils/paths.cpp index 8decb6e95..faa1882e6 100644 --- a/src/utils/paths.cpp +++ b/src/utils/paths.cpp @@ -55,3 +55,13 @@ bool isRealPath(const std::string &str) std::string path = getRealPath(str); return str == path; } + +bool checkPath(std::string path) +{ + if (path.empty()) + return true; + return path.find("../") == std::string::npos + && path.find("..\\") == std::string::npos + && path.find("/..") == std::string::npos + && path.find("\\..") == std::string::npos; +} diff --git a/src/utils/paths.h b/src/utils/paths.h index 804900587..f92fcdcb5 100644 --- a/src/utils/paths.h +++ b/src/utils/paths.h @@ -27,4 +27,6 @@ std::string getRealPath(const std::string &str); bool isRealPath(const std::string &str); +bool checkPath(std::string path); + #endif // UTILS_PATHS_H diff --git a/src/utils/stringutils.cpp b/src/utils/stringutils.cpp index b07a4e367..16542526f 100644 --- a/src/utils/stringutils.cpp +++ b/src/utils/stringutils.cpp @@ -592,13 +592,3 @@ std::string &removeProtocol(std::string &url) url = url.substr(i + 3); return url; } - -bool checkPath(std::string path) -{ - if (path.empty()) - return true; - return path.find("../") == std::string::npos - && path.find("..\\") == std::string::npos - && path.find("/..") == std::string::npos - && path.find("\\..") == std::string::npos; -} diff --git a/src/utils/stringutils.h b/src/utils/stringutils.h index a685a9b17..7b512b081 100644 --- a/src/utils/stringutils.h +++ b/src/utils/stringutils.h @@ -204,6 +204,4 @@ bool findCutFirst(std::string &str1, std::string str2); std::string &removeProtocol(std::string &url); -bool checkPath(std::string path); - #endif // UTILS_STRINGUTILS_H |