diff options
| author | Michi Henning <michi@zeroc.com> | 2005-03-02 02:06:05 +0000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2005-03-02 02:06:05 +0000 |
| commit | ad193ea9e13b334df57472f1b14d7cd4b0545f37 (patch) | |
| tree | 0f69b35a7b3cc42283d70fc1587408e4616ab94a /cpp/src/IcePatch2/ClientUtil.cpp | |
| parent | VC71 release crash work-around (diff) | |
| download | ice-ad193ea9e13b334df57472f1b14d7cd4b0545f37.tar.bz2 ice-ad193ea9e13b334df57472f1b14d7cd4b0545f37.tar.xz ice-ad193ea9e13b334df57472f1b14d7cd4b0545f37.zip | |
Fixed bug in IcePatch2: / couldn't be used as the data dir.
Diffstat (limited to 'cpp/src/IcePatch2/ClientUtil.cpp')
| -rwxr-xr-x | cpp/src/IcePatch2/ClientUtil.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/IcePatch2/ClientUtil.cpp b/cpp/src/IcePatch2/ClientUtil.cpp index fcfb2c0ce94..e5bbed6d9ba 100755 --- a/cpp/src/IcePatch2/ClientUtil.cpp +++ b/cpp/src/IcePatch2/ClientUtil.cpp @@ -190,7 +190,7 @@ IcePatch2::Patcher::Patcher(const CommunicatorPtr& communicator, const PatcherFe } #endif - const_cast<string&>(_dataDir) = string(cwd) + '/' + _dataDir; + const_cast<string&>(_dataDir) = simplify(string(cwd) + '/' + _dataDir); } PropertiesPtr properties = communicator->getProperties(); @@ -475,7 +475,7 @@ IcePatch2::Patcher::patch(const string& d) } else { - string dirWithSlash = dir + '/'; + string dirWithSlash = simplify(dir + '/'); FileInfoSeq::const_iterator p; @@ -706,12 +706,12 @@ IcePatch2::Patcher::updateFilesInternal(const FileInfoSeq& files, const Decompre if(p->size == 0) { - string path = _dataDir + '/' + p->path; + string path = simplify(_dataDir + '/' + p->path); ofstream file(path.c_str(), ios::binary); } else { - string pathBZ2 = _dataDir + '/' + p->path + ".bz2"; + string pathBZ2 = simplify(_dataDir + '/' + p->path + ".bz2"); string dir = getDirname(pathBZ2); if(!dir.empty()) |