summaryrefslogtreecommitdiff
path: root/cpp/src/IcePatch2/ClientUtil.cpp
diff options
context:
space:
mode:
authorMarc Laukien <marc@zeroc.com>2004-12-04 00:47:01 +0000
committerMarc Laukien <marc@zeroc.com>2004-12-04 00:47:01 +0000
commitcb4469d100359a58a0116530ed5c93921d4a1d8b (patch)
treed38c2bd75d07c884cdde613c6c8682df35f11f67 /cpp/src/IcePatch2/ClientUtil.cpp
parenttested Python 2.4 (diff)
downloadice-cb4469d100359a58a0116530ed5c93921d4a1d8b.tar.bz2
ice-cb4469d100359a58a0116530ed5c93921d4a1d8b.tar.xz
ice-cb4469d100359a58a0116530ed5c93921d4a1d8b.zip
fixes
Diffstat (limited to 'cpp/src/IcePatch2/ClientUtil.cpp')
-rwxr-xr-xcpp/src/IcePatch2/ClientUtil.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/cpp/src/IcePatch2/ClientUtil.cpp b/cpp/src/IcePatch2/ClientUtil.cpp
index 9670736406a..d24669c72c8 100755
--- a/cpp/src/IcePatch2/ClientUtil.cpp
+++ b/cpp/src/IcePatch2/ClientUtil.cpp
@@ -156,12 +156,14 @@ IcePatch2::Patcher::Patcher(const CommunicatorPtr& communicator, const PatcherFe
const_cast<Int&>(_chunkSize) = 1;
}
- if(_dataDir[0] != '/')
- {
#ifdef _WIN32
+ if(_dataDir[0] != '/' && !(_dataDir.size() > 1 && isalpha(_dataDir[0]) && _dataDir[1] == ':'))
+ {
char cwd[_MAX_PATH];
if(_getcwd(cwd, _MAX_PATH) == NULL)
#else
+ if(_dataDir[0] != '/')
+ {
char cwd[PATH_MAX];
if(getcwd(cwd, PATH_MAX) == NULL)
#endif