windows: handle binary files correctly.

Author: hiirotsuki

src/analysis/FatExtract.cpp

@@ -42,7 +42,7 @@ void FatExtract::onEntry(FatEntry &parent, FatEntry &entry, string name)
 
         string target = targetDirectory + name;
         cout << "Extracting " << name << " to " << target << endl;
-        FILE *output = fopen(target.c_str(), "w+");
+        FILE *output = fopen(target.c_str(), "wb+");
         system.readFile(entry.cluster, entry.size, output, contiguous);
         fclose(output);
 

src/core/FatSystem.cpp

@@ -38,7 +38,7 @@ FatSystem::FatSystem(string filename_, unsigned long long globalOffset_, OutputF
     rootEntries(0)
 {
     this->_outputFormat = outputFormat_;
-    fd = open(filename.c_str(), O_RDONLY|O_LARGEFILE);
+    fd = open(filename.c_str(), O_RDONLY | O_LARGEFILE | O_BINARY);
     writeMode = false;
 
     if (fd < 0) {
@@ -64,7 +64,7 @@ void FatSystem::enableCache()
 void FatSystem::enableWrite()
 {
     close(fd);
-    fd = open(filename.c_str(), O_RDWR|O_LARGEFILE);
+    fd = open(filename.c_str(), O_RDWR | O_LARGEFILE | O_BINARY);
 
     if (fd < 0) {
         ostringstream oss;

src/core/FatSystem.h

@@ -9,14 +9,15 @@
 #include "FatPath.h"
 #include "OutputFormatType.h"
 
-#ifdef __APPLE__
+#if defined(__APPLE__) || defined(_WIN32)
 #define O_LARGEFILE 0
 #define lseek64 lseek
 #endif
-#ifdef _WIN32
-#define O_LARGEFILE 0
-#define lseek64 lseek
+
+#ifndef O_BINARY
+#define O_BINARY 0
 #endif
+
 using namespace std;
 
 // Last cluster

src/table/FatBackup.cpp

@@ -20,7 +20,7 @@ void FatBackup::backup(string backupFile, int fat)
     int size = system.fatSize;
     int n = 0;
     int offset = 0;
-    FILE *backup = fopen(backupFile.c_str(), "w+");
+    FILE *backup = fopen(backupFile.c_str(), "wb+");
 
     if (fat == 0) {
         size *= 2;
@@ -55,7 +55,7 @@ void FatBackup::patch(string backupFile, int fat)
     char buffer[CHUNKS_SIZES];
 
     // Opening the file
-    FILE *backup = fopen(backupFile.c_str(), "r");
+    FILE *backup = fopen(backupFile.c_str(), "rb");
     if (backup == NULL) {
         ostringstream oss;
         oss << "Unable to open file " << backupFile << " for reading";