Add platform::NormalizePath.

Signed-off-by: Vassil Vassilev <vvasilev@cern.ch>

include/cling/Utils/Platform.h

@@ -28,6 +28,10 @@ namespace platform {
   ///
   bool GetSystemLibraryPaths(llvm::SmallVectorImpl<std::string>& Paths);
 
+  ///\brief Returns a normalized version of the given Path
+  ///
+  std::string NormalizePath(const std::string& Path);
+
 #if defined(LLVM_ON_UNIX)
 
 #if defined(__APPLE__)

lib/Interpreter/DynamicLibraryManager.cpp

@@ -27,11 +27,6 @@
 #ifdef LLVM_ON_WIN32
 #include <Windows.h>
 #else
-#ifdef __APPLE__
- #include <sys/syslimits.h> // PATH_MAX
-#else
- #include <limits.h> // PATH_MAX
-#endif
 #include <dlfcn.h>
 #endif
 
@@ -153,42 +148,29 @@ namespace cling {
     }
 
     if (foundDyLib.empty())
-      return "";
+      return std::string();
 
     // get canonical path name and check if already loaded
-#if defined(LLVM_ON_WIN32)
-    llvm::SmallString<_MAX_PATH> FullPath("");
-    char *res = _fullpath((char *)FullPath.data(), foundDyLib.c_str(), _MAX_PATH);
-#else
-    llvm::SmallString<PATH_MAX+1> FullPath("");
-    char *res = realpath(foundDyLib.c_str(), (char *)FullPath.data());
-#endif
-    if (res == 0) {
+    const std::string Path = platform::NormalizePath(foundDyLib);
+    if (Path.empty()) {
       llvm::errs() << "cling::DynamicLibraryManager::lookupLibMaybeAddExt(): "
         "error getting real (canonical) path of library " << foundDyLib << '\n';
       return foundDyLib;
     }
-    FullPath.set_size(strlen(res));
-    return FullPath.str();
+    return Path;
   }
 
   std::string DynamicLibraryManager::normalizePath(llvm::StringRef path) {
     // Make the path canonical if the file exists.
+    const std::string Path = path.str();
     struct stat buffer;
-    if (stat(path.data(), &buffer) != 0)
-      return "";
-#if defined(LLVM_ON_WIN32)
-    char buf[_MAX_PATH];
-    char *res = _fullpath(buf, path.data(), _MAX_PATH);
-#else
-    char buf[PATH_MAX+1];
-    char *res = realpath(path.data(), buf);
-#endif
-    if (res == 0) {
-      assert(0 && "Cannot normalize!?");
-      return "";
-    }
-    return res;
+    if (::stat(Path.c_str(), &buffer) != 0)
+      return std::string();
+
+    const std::string NPath = platform::NormalizePath(Path);
+    if (NPath.empty())
+      llvm::errs() << "Could not normalize: " << Path << '\n';
+    return NPath;
   }
 
   std::string
@@ -202,7 +184,7 @@ namespace cling {
       if (isSharedLib(libStem))
         return normalizePath(libStem);
       else
-        return "";
+        return std::string();
     }
 
     std::string foundName = lookupLibMaybeAddExt(libStem);
@@ -211,9 +193,10 @@ namespace cling {
       foundName = lookupLibMaybeAddExt("lib" + libStem.str());
     }
 
-    if (isSharedLib(foundName))
-      return normalizePath(foundName);
-    return "";
+    if (!foundName.empty() && isSharedLib(foundName))
+      return platform::NormalizePath(foundName);
+
+    return std::string();
   }
 
   DynamicLibraryManager::LoadLibResult

lib/Utils/PlatformPosix.cpp

@@ -22,12 +22,14 @@
  #include <limits.h>
 #endif
 
+#define PATH_MAXC (PATH_MAX+1)
+
 namespace cling {
 namespace utils {
 namespace platform {
 
 std::string GetCwd() {
-  char Buffer[PATH_MAX+1];
+  char Buffer[PATH_MAXC];
   if (::getcwd(Buffer, sizeof(Buffer)))
     return Buffer;
 
@@ -35,6 +37,15 @@ std::string GetCwd() {
   return std::string();
 }
 
+std::string NormalizePath(const std::string& Path) {
+  char Buf[PATH_MAXC];
+  if (const char* Result = ::realpath(Path.c_str(), Buf))
+    return std::string(Result);
+
+  ::perror("realpath");
+  return std::string();
+}
+
 bool GetSystemLibraryPaths(llvm::SmallVectorImpl<std::string>& Paths) {
 #if defined(__APPLE__) || defined(__CYGWIN__)
   Paths.push_back("/usr/local/lib/");

lib/Utils/PlatformWin.cpp

@@ -454,6 +454,7 @@ bool IsDLL(const std::string& Path) {
   ::CloseHandle(hFile);
   return isDLL;
 }
+  
 } // namespace windows
 
 std::string GetCwd() {
@@ -465,6 +466,15 @@ std::string GetCwd() {
   return std::string();
 }
 
+std::string NormalizePath(const std::string& Path) {
+  char Buf[MAX_PATHC];
+  if (const char* Result = ::_fullpath(Buf, Path.c_str(), sizeof(Buf)))
+    return std::string(Result);
+
+  ReportLastError("_fullpath");
+  return std::string();
+}
+
 bool GetSystemLibraryPaths(llvm::SmallVectorImpl<std::string>& Paths) {
   char Buf[MAX_PATHC];
   // Generic form of C:\Windows\System32