2007-08-26 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>

	Merged Ross's patch: Removed setmode(). Use _CRT_fmode to enable 
binary
	IO.
	* src/DefaultBtProgressInfoFile.cc
	* src/MetaFileUtil.cc
	* src/SimpleLogger.cc
	* src/SegmentMan.cc
	* src/Util.cc
	* src/Platform.cc

6 files changed, 3 insertions, 15 deletions

diff --git a/src/DefaultBtProgressInfoFile.cc b/src/DefaultBtProgressInfoFile.cc
index a2da4816..4fc0156f 100644
--- a/src/DefaultBtProgressInfoFile.cc
+++ b/src/DefaultBtProgressInfoFile.cc
@@ -162,9 +162,6 @@ FILE* DefaultBtProgressInfoFile::openFile(const string& filename,
     throw new DlAbortEx(EX_SEGMENT_FILE_OPEN,
 			filename.c_str(), strerror(errno));
   }
-#ifdef HAVE_SETMODE
-  setmode(fileno(file), O_BINARY);
-#endif
   return file;
 }
 
diff --git a/src/MetaFileUtil.cc b/src/MetaFileUtil.cc
index c687bad5..455123a9 100644
--- a/src/MetaFileUtil.cc
+++ b/src/MetaFileUtil.cc
@@ -48,9 +48,6 @@ MetaEntry* MetaFileUtil::parseMetaFile(const string& file) {
     if(fp == NULL) {
       throw new DlAbortEx("cannot open metainfo file");
     }
-#ifdef HAVE_SETMODE
-    setmode(fileno(fp), O_BINARY);
-#endif
     if(fread(buf, len, 1, fp) != 1) {
       fclose(fp);
       throw new DlAbortEx("cannot read metainfo");
diff --git a/src/Platform.cc b/src/Platform.cc
index f363c6b1..b8eb6896 100644
--- a/src/Platform.cc
+++ b/src/Platform.cc
@@ -50,8 +50,11 @@
 #include "common.h"
 #include "DlAbortEx.h"
 #include "Platform.h"
+#include <stdlib.h> /* _fmode */
+#include <fcntl.h> /*  _O_BINARY */
 
 Platform::Platform() {
+  unsigned int _CRT_fmode = _O_BINARY;
   WSADATA wsaData;
   memset((char*)&wsaData, 0, sizeof(wsaData));
   if (WSAStartup(MAKEWORD(1, 1), &wsaData)) {
diff --git a/src/SegmentMan.cc b/src/SegmentMan.cc
index bcd784dd..7ad4f984 100644
--- a/src/SegmentMan.cc
+++ b/src/SegmentMan.cc
@@ -148,9 +148,6 @@ FILE* SegmentMan::openSegFile(const string& segFilename, const string& mode) con
     throw new DlAbortEx(EX_SEGMENT_FILE_OPEN,
 			segFilename.c_str(), strerror(errno));
   }
-#ifdef HAVE_SETMODE
-  setmode(fileno(segFile), O_BINARY);
-#endif
   return segFile;
 }
 
diff --git a/src/SimpleLogger.cc b/src/SimpleLogger.cc
index cd650f57..cc8068ff 100644
--- a/src/SimpleLogger.cc
+++ b/src/SimpleLogger.cc
@@ -72,9 +72,6 @@ void SimpleLogger::openFile(const string& filename) {
   if(file == NULL) {
     throw new DlAbortEx(EX_FILE_OPEN, filename.c_str(), strerror(errno));
   }
-#ifdef HAVE_SETMODE
-  setmode(fileno(file), O_BINARY);
-#endif
 }
 
 void SimpleLogger::closeFile() {
diff --git a/src/Util.cc b/src/Util.cc
index 70152d08..e5805bb3 100644
--- a/src/Util.cc
+++ b/src/Util.cc
@@ -314,9 +314,6 @@ string Util::toHex(const unsigned char* src, int32_t len) {
 
 FILE* Util::openFile(const string& filename, const string& mode) {
   FILE* file = fopen(filename.c_str(), mode.c_str());
-#ifdef HAVE_SETMODE
-  setmode(fileno(file), O_BINARY);
-#endif
   return file;
 }