Changeset 25577 in webkit

Timestamp:

Sep 14, 2007, 5:10:45 PM (18 years ago)

Author:

oliver

Message:

Need to use _wstat instead of _stat to stat files on windows

_stat doesn't handle multibyte character sequences, unless (afaict)
the current codepage supports them, and then it uses the current
codepage. In order to correctly handle multibyte characters in a
file path we have to use _wstat.

In deference to the fact that the CF implementation may be used on
platforms other than windows i've added fileSize to the FileSystem
helper functions, and added a windows impl.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.vcproj/WebCore.vcproj (modified) (2 diffs)
• platform/FileSystem.h (modified) (1 diff)
• platform/gdk/TemporaryLinkStubs.cpp (modified) (1 diff)
• platform/mac/FileSystemMac.mm (modified) (2 diffs)
• platform/network/cf/FormDataStreamCFNet.cpp (modified) (2 diffs)
• platform/qt/TemporaryLinkStubs.cpp (modified) (1 diff)
• platform/win/FileSystemWin.cpp (copied) (copied from trunk/WebCore/platform/FileSystem.h ) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-09-14  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by Sam and Geoff.
+
+        <rdar://problem/5333272> Cannot upload files when path contains 
+        non-ascii/multibyte characters
+
+        We can't use _stat to determine file size on Windows as it may not 
+        correctly handle multibyte characters, so we have to use _wstat.
+        
+        In deference to the fact that we may one day use the FormDataStreamCFNet.cpp
+        on Mac i've wrapped the call to _wstat with a generic fileSize
+        method in FileSystem.h
+
+        * WebCore.vcproj/WebCore.vcproj:
+        * platform/FileSystem.h:
+        * platform/network/cf/FormDataStreamCFNet.cpp:
+        * platform/win/FileSystemWin.cpp: Added.
+        (WebCore::setHTTPBody):
+        * platform/gdk/TemporaryLinkStubs.cpp:
+        * platform/mac/FileSystemMac.mm:
+        (WebCore::fileSize):
+        * platform/qt/TemporaryLinkStubs.cpp:
+
 2007-09-14  Timothy Hatcher  <timothy@apple.com>
 

trunk/WebCore/WebCore.vcproj/WebCore.vcproj

@@ -3028 +3028 @@
                         </File>
                         <File
+                                RelativePath="..\platform\FileSystem.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\platform\FloatConversion.h"
                                 >
@@ -3480 +3484 @@
                                 <File
                                         RelativePath="..\platform\win\FileChooserWin.cpp"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\platform\win\FileSystemWin.cpp"
                                         >
                                 </File>

trunk/WebCore/platform/FileSystem.h

@@ -36 +36 @@
 bool fileExists(const String&);
 bool deleteFile(const String&);
+bool fileSize(const String&, long long& result);
 
 } // namespace WebCore

trunk/WebCore/platform/gdk/TemporaryLinkStubs.cpp

@@ -183 +183 @@
 bool fileExists(const String& path) { notImplemented(); return false; }
 bool deleteFile(const String& path) { notImplemented(); return false; }
+bool fileSize(const String& path, long long& result) { notImplemented(); return false; }
 void callOnMainThread(void (*)()) { notImplemented(); }
 }

trunk/WebCore/platform/mac/FileSystemMac.mm

@@ -29 +29 @@
 #import "FileSystem.h"
 
+#import "NotImplemented.h"
 #import "PlatformString.h"
 
@@ -57 +58 @@
 }
 
+bool fileSize(const String& path, long long& result)
+{
+    notImplemented();
+    return false;
+}
+
 } //namespace WebCore

trunk/WebCore/platform/network/cf/FormDataStreamCFNet.cpp

@@ -33 +33 @@
 
 #include "CString.h"
+#include "FileSystem.h"
 #include "FormData.h"
 #include <CFNetwork/CFURLRequestPriv.h>
 #include <CoreFoundation/CFStreamAbstract.h>
-#include <sys/stat.h>
 #include <sys/types.h>
 #include <wtf/Assertions.h>
@@ -341 +341 @@
             length += element.m_data.size();
         else {
-            struct _stat64i32 sb;
-            int statResult = _stat(element.m_filename.utf8().data(), &sb);
-            if (statResult == 0 && (sb.st_mode & S_IFMT) == S_IFREG)
-                length += sb.st_size;
+            long long size;
+            if (fileSize(element.m_filename, size))
+                length += size;
             else
                 haveLength = false;

trunk/WebCore/platform/qt/TemporaryLinkStubs.cpp

@@ -84 +84 @@
 
 float userIdleTime() { notImplemented(); return 0.0; }
+bool fileSize(const String& path, long long& result) { notImplemented(); return false; }
 
 }

trunk/WebCore/platform/win/FileSystemWin.cpp

@@ -26 +26 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
- 
-#ifndef FileSystem_h
-#define FileSystem_h
+
+#include "config.h"
+
+#include "FileSystem.h"
+#include "PlatformString.h"
+
+#include <sys/stat.h>
 
 namespace WebCore {
 
-class String;
+bool fileSize(const String& inFilename, long long& result)
+{
+    struct _stat64i32 sb;
+    String filename = inFilename;
+    int statResult = _wstat(filename.charactersWithNullTermination(), &sb);
+    if (statResult != 0 || (sb.st_mode & S_IFMT) != S_IFREG)
+        return false;
+    result = sb.st_size;
+    return true;
+}
 
-bool fileExists(const String&);
-bool deleteFile(const String&);
-
-} // namespace WebCore
-
-#endif // FileSystem_h
+}