From cb4469d100359a58a0116530ed5c93921d4a1d8b Mon Sep 17 00:00:00 2001
From: Marc Laukien <marc@zeroc.com>
Date: Sat, 4 Dec 2004 00:47:01 +0000
Subject: fixes

---
 cpp/src/IcePatch2/Calc.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'cpp/src/IcePatch2/Calc.cpp')

diff --git a/cpp/src/IcePatch2/Calc.cpp b/cpp/src/IcePatch2/Calc.cpp
index a236dde862e..df8fe85fbe0 100644
--- a/cpp/src/IcePatch2/Calc.cpp
+++ b/cpp/src/IcePatch2/Calc.cpp
@@ -88,12 +88,14 @@ main(int argc, char* argv[])
 
     try
     {
-	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
-- 
cgit v1.2.3