Unreviewed, fix Windows file loading in JSC shell after r189583

https://bugs.webkit.org/show_bug.cgi?id=148917

Should load the script files with the binary mode.
Since these loading functions are only used for the simple test scripts,
we just use ftell / fseek now.

* jsc.cpp:
(fillBufferWithContentsOfFile):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@189591 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index b97ea8e..0e47f1e 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,15 @@
+2015-09-10  Yusuke Suzuki  <utatane.tea@gmail.com>
+
+        Unreviewed, fix Windows file loading in JSC shell after r189583
+        https://bugs.webkit.org/show_bug.cgi?id=148917
+
+        Should load the script files with the binary mode.
+        Since these loading functions are only used for the simple test scripts,
+        we just use ftell / fseek now.
+
+        * jsc.cpp:
+        (fillBufferWithContentsOfFile):
+
 2015-09-10  Michael Saboff  <msaboff@apple.com>
 
         REGRESSION(r189575): Appears to break ARM64 linux builds

diff --git a/Source/JavaScriptCore/jsc.cpp b/Source/JavaScriptCore/jsc.cpp
index 1379700..2369a9d 100644 (file)
--- a/Source/JavaScriptCore/jsc.cpp
+++ b/Source/JavaScriptCore/jsc.cpp
@@ -892,7 +892,7 @@ static void fillBufferWithContentsOfFile(FILE* file, Vector<char>& buffer)
 
 static bool fillBufferWithContentsOfFile(const String& fileName, Vector<char>& buffer)
 {
-    FILE* f = fopen(fileName.utf8().data(), "r");
+    FILE* f = fopen(fileName.utf8().data(), "rb");
     if (!f) {
         fprintf(stderr, "Could not open file: %s\n", fileName.utf8().data());
         return false;