[llvm-commits] [llvm] r125239 - in /llvm/trunk: include/llvm/Support/PathV2.h lib/Support/Unix/PathV2.inc

[Douglas Gregor]

Author: dgregor
Date: Wed Feb  9 17:33:15 2011
New Revision: 125239

URL: http://llvm.org/viewvc/llvm-project?rev=125239&view=rev
Log:
Rip out realpath() support. It's expensive, and often a bad idea, and
I have another way to achieve the same goal.

Modified:
    llvm/trunk/include/llvm/Support/PathV2.h
    llvm/trunk/lib/Support/Unix/PathV2.inc

Modified: llvm/trunk/include/llvm/Support/PathV2.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/PathV2.h?rev=125239&r1=125238&r2=125239&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Support/PathV2.h (original)
+++ llvm/trunk/include/llvm/Support/PathV2.h Wed Feb  9 17:33:15 2011
@@ -244,15 +244,6 @@
 /// @result The stem of \a path.
 const StringRef stem(StringRef path);
 
-/// Convert path to a canonical form, resolving symbolic links and removing
-/// unnecessary path elements (e.g., "foo/../", "./"). 
-///
-/// @param path A path that is going to be canonicalized by resolving symlinks
-/// and removing unnecessary path elements (e.g., "./").
-///
-/// @param buffer The resulting canonical path.
-void canonical(const char *path, SmallVectorImpl<char> &result);
-  
 /// @brief Get extension.
 ///
 /// If filename contains a dot but not solely one or two dots, result is the

Modified: llvm/trunk/lib/Support/Unix/PathV2.inc
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Unix/PathV2.inc?rev=125239&r1=125238&r2=125239&view=diff
==============================================================================
--- llvm/trunk/lib/Support/Unix/PathV2.inc (original)
+++ llvm/trunk/lib/Support/Unix/PathV2.inc Wed Feb  9 17:33:15 2011
@@ -503,35 +503,5 @@
 }
 
 } // end namespace fs
-
-namespace path {
-
-void canonical(const char *path, SmallVectorImpl<char> &buffer) {
-  buffer.resize(PATH_MAX);
-  char *result = realpath(path, buffer.data());
-  if (result) {
-    buffer.resize(strlen(result));
-    return;
-  }
-
-  // A common extension is to support memory allocation of the result when
-  // passing NULL as the second argument.
-  result = realpath(path, 0);
-  if (result) {
-    size_t length = strlen(result);
-    buffer.resize(length);
-    memcpy(buffer.data(), result, length);
-    free(result);
-    return;
-  }
-
-  size_t length = strlen(path);
-  buffer.resize(length);
-  memcpy(buffer.data(), path, length);
-  return;
-}
-
-} // end namespace path
-
 } // end namespace sys
 } // end namespace llvm