diff options
author | Igor Pavlov <ipavlov@users.sourceforge.net> | 2006-04-13 04:00:00 +0400 |
---|---|---|
committer | Kornel LesiĆski <kornel@geekhood.net> | 2016-05-28 02:15:47 +0300 |
commit | 83911c8529146922f2d32b04d8d6107aaf338fb8 (patch) | |
tree | 5cef47b652cf2659635a6631bf8eb1a27abd5c93 /7zip/UI/Common/ExtractingFilePath.cpp | |
parent | cb9eea7264409202d974b41b08d976ddbca6d203 (diff) |
4.38 beta
Diffstat (limited to '7zip/UI/Common/ExtractingFilePath.cpp')
-rwxr-xr-x | 7zip/UI/Common/ExtractingFilePath.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/7zip/UI/Common/ExtractingFilePath.cpp b/7zip/UI/Common/ExtractingFilePath.cpp index b1a6d876..a0b17282 100755 --- a/7zip/UI/Common/ExtractingFilePath.cpp +++ b/7zip/UI/Common/ExtractingFilePath.cpp @@ -41,14 +41,20 @@ UString GetCorrectPath(const UString &path) break; while(result.Length() > first) { - if (result[first] == L'\\' || result[first] == L'/') + if ( + #ifdef _WIN32 + result[first] == L'\\' || + #endif + result[first] == L'/') { result.Delete(first); continue; } break; } + #ifdef _WIN32 result.Replace(L"..\\", L""); + #endif result.Replace(L"../", L""); ReplaceDisk(result); |