diff options
| author | Marc Laukien <marc@zeroc.com> | 2002-04-05 19:45:21 +0000 |
|---|---|---|
| committer | Marc Laukien <marc@zeroc.com> | 2002-04-05 19:45:21 +0000 |
| commit | fc9d9318b32340f1b451952cdd8ae6bdc22e008f (patch) | |
| tree | 9407fe7058061caccbad519e0a460ce891931b26 /cpp/src | |
| parent | fixes for WIN32 (diff) | |
| download | ice-fc9d9318b32340f1b451952cdd8ae6bdc22e008f.tar.bz2 ice-fc9d9318b32340f1b451952cdd8ae6bdc22e008f.tar.xz ice-fc9d9318b32340f1b451952cdd8ae6bdc22e008f.zip | |
win fixes
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IcePatch/Util.cpp | 16 | ||||
| -rw-r--r-- | cpp/src/IcePatch/icepatchS.dsp | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/cpp/src/IcePatch/Util.cpp b/cpp/src/IcePatch/Util.cpp index 7646d4c929c..3c69a39b63e 100644 --- a/cpp/src/IcePatch/Util.cpp +++ b/cpp/src/IcePatch/Util.cpp @@ -179,7 +179,7 @@ IcePatch::readDirectory(const string& path) #ifdef WIN32 struct _finddata_t data; - long h = _findfirst(path.c_str(), &data); + long h = _findfirst((path + "/*").c_str(), &data); if (h == -1) { NodeAccessException ex; @@ -267,7 +267,7 @@ ByteSeq IcePatch::getMD5(const string& path) { string pathMD5 = path + ".md5"; - ifstream fileMD5(pathMD5.c_str()); + ifstream fileMD5(pathMD5.c_str(), ios::binary); if (!fileMD5) { NodeAccessException ex; @@ -377,7 +377,7 @@ IcePatch::createMD5(const string& path) // Read the original file. // { - ifstream file(path.c_str()); + ifstream file(path.c_str(), ios::binary); if (!file) { NodeAccessException ex; @@ -410,7 +410,7 @@ IcePatch::createMD5(const string& path) // Save the MD5 hash value to the MD5 file. // { - ofstream fileMD5(tmpName.c_str()); + ofstream fileMD5(tmpName.c_str(), ios::binary); if (!fileMD5) { NodeAccessException ex; @@ -478,7 +478,7 @@ ByteSeq IcePatch::getBytesBZ2(const string& path, Int pos, Int num) { string pathBZ2 = path + ".bz2"; - ifstream fileBZ2(pathBZ2.c_str()); + ifstream fileBZ2(pathBZ2.c_str(), ios::binary); if (!fileBZ2) { NodeAccessException ex; @@ -582,7 +582,7 @@ IcePatch::createBZ2(const string& path) // Read the original file in blocks and write the BZ2 file. // { - ifstream file(path.c_str()); + ifstream file(path.c_str(), ios::binary); if (!file) { NodeAccessException ex; @@ -708,7 +708,7 @@ IcePatch::getFile(const FilePrx& file, ProgressCB& progressCB) Int totalBZ2 = file->getSizeBZ2(); progressCB.start(totalBZ2); - ofstream fileBZ2(pathBZ2.c_str()); + ofstream fileBZ2(pathBZ2.c_str(), ios::binary); if (!fileBZ2) { NodeAccessException ex; @@ -752,7 +752,7 @@ IcePatch::getFile(const FilePrx& file, ProgressCB& progressCB) // Read the BZ2 file in blocks and write the original file. // { - ofstream file(path.c_str()); + ofstream file(path.c_str(), ios::binary); if (!file) { NodeAccessException ex; diff --git a/cpp/src/IcePatch/icepatchS.dsp b/cpp/src/IcePatch/icepatchS.dsp index eb372377e0e..e35495d4454 100644 --- a/cpp/src/IcePatch/icepatchS.dsp +++ b/cpp/src/IcePatch/icepatchS.dsp @@ -51,7 +51,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
-# ADD LINK32 setargv.obj /nologo /subsystem:console /machine:I386 /out:"../../bin/icepatch.exe" /libpath:"../../../lib"
+# ADD LINK32 setargv.obj /nologo /subsystem:console /machine:I386 /out:"../../bin/icepatchserver.exe" /libpath:"../../../lib"
# SUBTRACT LINK32 /debug /nodefaultlib
!ELSEIF "$(CFG)" == "IcePatchS - Win32 Debug"
@@ -77,7 +77,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 setargv.obj /nologo /subsystem:console /debug /machine:I386 /out:"../../bin/icepatch.exe" /pdbtype:sept /libpath:"../../../lib"
+# ADD LINK32 setargv.obj /nologo /subsystem:console /debug /machine:I386 /out:"../../bin/icepatchserver.exe" /pdbtype:sept /libpath:"../../../lib"
# SUBTRACT LINK32 /nodefaultlib
!ENDIF
|