From 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Thu, 2 Jun 2011 12:07:03 +0100 Subject: Merge WebKit at r84325: Initial merge by git. Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b --- Source/WebCore/platform/win/FileSystemWin.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'Source/WebCore/platform/win/FileSystemWin.cpp') diff --git a/Source/WebCore/platform/win/FileSystemWin.cpp b/Source/WebCore/platform/win/FileSystemWin.cpp index 03a2eaf..7d1c8f2 100644 --- a/Source/WebCore/platform/win/FileSystemWin.cpp +++ b/Source/WebCore/platform/win/FileSystemWin.cpp @@ -136,7 +136,12 @@ String pathGetFileName(const String& path) String directoryName(const String& path) { - return path.left(path.length() - pathGetFileName(path).length()); + String name = path.left(path.length() - pathGetFileName(path).length()); + if (name.characterStartingAt(name.length() - 1) == '\\') { + // Remove any trailing "\". + name.truncate(name.length() - 1); + } + return name; } static String bundleName() @@ -241,9 +246,11 @@ PlatformFileHandle openFile(const String& path, FileOpenMode mode) case OpenForRead: desiredAccess = GENERIC_READ; creationDisposition = OPEN_EXISTING; + break; case OpenForWrite: desiredAccess = GENERIC_WRITE; creationDisposition = CREATE_ALWAYS; + break; default: ASSERT_NOT_REACHED(); } -- cgit v1.1