Provide configuration support and usage for MINGW32 platform

[oota-llvm.git] / lib / System / Path.cpp

diff --git a/lib/System/Path.cpp b/lib/System/Path.cpp
index 3187bfee590da6e041c80b8d72d71e06b685c61c..9ee0a3e852785261a93bd63b40f86ac2f6e2a90d 100644 (file)
--- a/lib/System/Path.cpp
+++ b/lib/System/Path.cpp
@@ -1,10 +1,10 @@
 //===-- Path.cpp - Implement OS Path Concept --------------------*- C++ -*-===//
-// 
+//
 //                     The LLVM Compiler Infrastructure
 //
-// This file was developed by Reid Spencer and is distributed under the 
+// This file was developed by Reid Spencer and is distributed under the
 // University of Illinois Open Source License. See LICENSE.TXT for details.
-// 
+//
 //===----------------------------------------------------------------------===//
 //
 //  This header file implements the operating system Path concept.
@@ -20,20 +20,20 @@ using namespace sys;
 
 //===----------------------------------------------------------------------===//
 //=== WARNING: Implementation here must contain only TRULY operating system
-//===          independent code. 
+//===          independent code.
 //===----------------------------------------------------------------------===//
 
 Path
 Path::GetLLVMConfigDir() {
   Path result;
 #ifdef LLVM_ETCDIR
-  if (result.setDirectory(LLVM_ETCDIR))
+  if (result.set(LLVM_ETCDIR))
     return result;
 #endif
   return GetLLVMDefaultConfigDir();
 }
 
-LLVMFileType 
+LLVMFileType
 sys::IdentifyFileType(const char*magic, unsigned length) {
   assert(magic && "Invalid magic number string");
   assert(length >=4 && "Invalid magic number length");
@@ -62,14 +62,14 @@ sys::IdentifyFileType(const char*magic, unsigned length) {
 
 bool
 Path::isArchive() const {
-  if (readable())
+  if (canRead())
     return hasMagicNumber("!<arch>\012");
   return false;
 }
 
 bool
 Path::isDynamicLibrary() const {
-  if (readable()) 
+  if (canRead())
     return hasMagicNumber("\177ELF");
   return false;
 }
@@ -80,10 +80,10 @@ Path::FindLibrary(std::string& name) {
   GetSystemLibraryPaths(LibPaths);
   for (unsigned i = 0; i < LibPaths.size(); ++i) {
     sys::Path FullPath(LibPaths[i]);
-    FullPath.appendFile("lib" + name + LTDL_SHLIB_EXT);
+    FullPath.appendComponent("lib" + name + LTDL_SHLIB_EXT);
     if (FullPath.isDynamicLibrary())
       return FullPath;
-    FullPath.elideSuffix();
+    FullPath.eraseSuffix();
     FullPath.appendSuffix("a");
     if (FullPath.isArchive())
       return FullPath;
@@ -101,10 +101,9 @@ Path::GetDLLSuffix() {
 // Include the truly platform-specific parts of this class.
 
 #if defined(LLVM_ON_UNIX)
-#include "Unix/Path.cpp"
+#include "Unix/Path.inc"
 #endif
 #if defined(LLVM_ON_WIN32)
-#include "Win32/Path.cpp"
+#include "Win32/Path.inc"
 #endif
 
-// vim: sw=2 smartindent smarttab tw=80 autoindent expandtab