diff options
Diffstat (limited to 'cpp/src')
-rw-r--r-- | cpp/src/IcePatch2/Util.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cpp/src/IcePatch2/Util.cpp b/cpp/src/IcePatch2/Util.cpp index a1682caba19..a72bdb2b847 100644 --- a/cpp/src/IcePatch2/Util.cpp +++ b/cpp/src/IcePatch2/Util.cpp @@ -137,6 +137,7 @@ IcePatch2::normalize(const string& path) string::size_type pos; +#ifdef WIN32 for(pos = 0; pos < result.size(); ++pos) { if(result[pos] == '\\') @@ -144,6 +145,7 @@ IcePatch2::normalize(const string& path) result[pos] = '/'; } } +#endif pos = 0; while((pos = result.find("//", pos)) != string::npos) @@ -801,7 +803,7 @@ IcePatch2::operator>>(istream& is, FileInfo& info) string s; getline(is, s, '\t'); - info.path = s; + IceUtil::unescapeString(s, 0, s.size(), info.path); getline(is, s, '\t'); info.checksum = stringToBytes(s); |