aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Dunbar <daniel@zuster.org>2009-04-09 00:33:08 +0000
committerDaniel Dunbar <daniel@zuster.org>2009-04-09 00:33:08 +0000
commit6ddf2c1930d896cbe738fab7d07dc977df41918e (patch)
tree905a40f9d96fa08d8cea66a2271db3c7e6dd7589
parent2eb65e292cf7724d2f5f6773e2460b9420cee34c (diff)
Add sys::Path::makeAbsolute().
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@68663 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--include/llvm/System/Path.h4
-rw-r--r--lib/System/Path.cpp12
2 files changed, 16 insertions, 0 deletions
diff --git a/include/llvm/System/Path.h b/include/llvm/System/Path.h
index d28e11e545..de2f173ae4 100644
--- a/include/llvm/System/Path.h
+++ b/include/llvm/System/Path.h
@@ -459,6 +459,10 @@ namespace sys {
/// @brief Make the current path name unique in the file system.
bool makeUnique( bool reuse_current /*= true*/, std::string* ErrMsg );
+ /// The current Path name is made absolute by prepending the
+ /// current working directory if necessary.
+ void makeAbsolute();
+
/// @}
/// @name Disk Mutators
/// @{
diff --git a/lib/System/Path.cpp b/lib/System/Path.cpp
index c5a4b0676f..4c965db722 100644
--- a/lib/System/Path.cpp
+++ b/lib/System/Path.cpp
@@ -207,6 +207,18 @@ bool Path::hasMagicNumber(const std::string &Magic) const {
return false;
}
+void Path::makeAbsolute() {
+ if (isAbsolute())
+ return;
+
+ Path CWD = Path::GetCurrentDirectory();
+ assert(CWD.isAbsolute() && "GetCurrentDirectory returned relative path!");
+
+ CWD.appendComponent(path);
+
+ path = CWD.toString();
+}
+
static void getPathList(const char*path, std::vector<Path>& Paths) {
const char* at = path;
const char* delim = strchr(at, PathSeparator);