Split openFileForRead into Windows and Unix versions.

This has some advantages:

* Lets us use native, utf16 windows functions.
* Easy to produce good errors on windows about trying to use a
directory when we want a file.
* Simplifies the unix version a bit.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@186511 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Support/Path.cpp b/lib/Support/Path.cpp
index 0fb7666aeba749c8f95e9695850758ad44cd0c56..171ccc3970eeed2061cfdc8cb98b19477b70585c 100644 (file)
--- a/lib/Support/Path.cpp
+++ b/lib/Support/Path.cpp
@@ -722,21 +722,6 @@ error_code openFileForWrite(const Twine &Name, int &ResultFD,
   return error_code::success();
 }
 
-error_code openFileForRead(const Twine &Name, int &ResultFD) {
-  int OpenFlags = O_RDONLY;
-#ifdef O_BINARY
-  OpenFlags |= O_BINARY; // Open input file in binary mode on win32.
-#endif
-
-  SmallString<128> Storage;
-  StringRef P = Name.toNullTerminatedStringRef(Storage);
-  while ((ResultFD = open(P.begin(), OpenFlags)) < 0) {
-    if (errno != EINTR)
-      return error_code(errno, system_category());
-  }
-  return error_code::success();
-}
-
 error_code make_absolute(SmallVectorImpl<char> &path) {
   StringRef p(path.data(), path.size());
 

diff --git a/lib/Support/Unix/Path.inc b/lib/Support/Unix/Path.inc
index 0c1623acdc7b35f30c45b4ead60b6e0cdc9cac21..84f8d37493126bb2b9c53677a8a391cf4e36622f 100644 (file)
--- a/lib/Support/Unix/Path.inc
+++ b/lib/Support/Unix/Path.inc
@@ -815,6 +815,15 @@ error_code unmap_file_pages(void *base, size_t size) {
   return error_code::success();
 }
 
+error_code openFileForRead(const Twine &Name, int &ResultFD) {
+  SmallString<128> Storage;
+  StringRef P = Name.toNullTerminatedStringRef(Storage);
+  while ((ResultFD = open(P.begin(), O_RDONLY)) < 0) {
+    if (errno != EINTR)
+      return error_code(errno, system_category());
+  }
+  return error_code::success();
+}
 
 } // end namespace fs
 } // end namespace sys

diff --git a/lib/Support/Windows/Path.inc b/lib/Support/Windows/Path.inc
index 5a62a609b830145a5a92ee65d70ae55a64b4cb89..1da60d67118e15df8cb307cf6cbf537d52fbb02b 100644 (file)
--- a/lib/Support/Windows/Path.inc
+++ b/lib/Support/Windows/Path.inc
@@ -1041,7 +1041,38 @@ error_code unmap_file_pages(void *base, size_t size) {
   return windows_error::invalid_function;
 }
 
+error_code openFileForRead(const Twine &Name, int &ResultFD) {
+  SmallString<128> PathStorage;
+  SmallVector<wchar_t, 128> PathUTF16;
+
+  if (error_code EC = UTF8ToUTF16(Name.toStringRef(PathStorage),
+                                  PathUTF16))
+    return EC;
 
+  HANDLE H = ::CreateFileW(PathUTF16.begin(), GENERIC_READ,
+                           FILE_SHARE_READ, NULL,
+                           OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+  if (H == INVALID_HANDLE_VALUE) {
+    error_code EC = windows_error(::GetLastError());
+    // Provide a better error massage when trying to open directories.
+    // This only runs if we failed to open the file, so there is probably
+    // no performances issues.
+    if (EC != windows_error::access_denied)
+      return EC;
+    if (is_directory(Name))
+      return error_code(errc::is_a_directory, posix_category());
+    return EC;
+  }
+
+  int FD = ::_open_osfhandle(intptr_t(H), 0);
+  if (FD == -1) {
+    ::CloseHandle(H);
+    return windows_error::invalid_handle;
+  }
+
+  ResultFD = FD;
+  return error_code::success();
+}
 
 } // end namespace fs
 } // end namespace sys

diff --git a/test/Object/directory.ll b/test/Object/directory.ll
index 0d047b811a922dcfa374c17c2eac9af1a8d09a90..bf8ff3259502f37aef392aeaecba899c2f06f08f 100644 (file)
--- a/test/Object/directory.ll
+++ b/test/Object/directory.ll
@@ -3,8 +3,7 @@
 ;CHECK: .: Is a directory
 
 ; Opening a directory works on cygwin and freebsd.
-; On windows we just get a "Permission denied."
-;XFAIL: freebsd, win32, mingw32, cygwin
+;XFAIL: freebsd, cygwin
 
 ;RUN: rm -f %T/test.a
 ;RUN: touch %T/a-very-long-file-name