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/Calc.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/Calc.cpp')
| -rw-r--r-- | cpp/src/IcePatch2/Calc.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/cpp/src/IcePatch2/Calc.cpp b/cpp/src/IcePatch2/Calc.cpp index 4e4d82d7151..0e4e7e40321 100644 --- a/cpp/src/IcePatch2/Calc.cpp +++ b/cpp/src/IcePatch2/Calc.cpp @@ -213,8 +213,13 @@ main(int argc, char* argv[]) } } - string absDataDirWithSlash = absDataDir + '/'; - + // + // We must call simplify() here: under Cygwin, any path starting with + // a double slash simply doesn't work. But, if dataDir is "/", we end + // up with paths that start with "//" unless we call simplify(). + // + string absDataDirWithSlash = simplify(absDataDir + '/'); + for(p = fileSeq.begin(); p != fileSeq.end(); ++p) { if(p->compare(0, absDataDirWithSlash.size(), absDataDirWithSlash) != 0) |