remove direct of realpath(2), replace with canonical_path() which is a no-op on windows

1 files changed, 19 insertions, 8 deletions

diff --git a/libs/pbd/pathexpand.cc b/libs/pbd/pathexpand.cc
index 4911f12788..ad53bea37b 100644
--- a/libs/pbd/pathexpand.cc
+++ b/libs/pbd/pathexpand.cc
@@ -18,8 +18,10 @@
 */
 
 #include <vector>
-#include <climits>
 #include <iostream>
+#include <climits>
+#include <cerrno>
+#include <cstdlib>
 
 #include <regex.h>
 
@@ -32,6 +34,21 @@ using std::string;
 using std::vector;
 
 string
+PBD::canonical_path (const std::string& path)
+{
+#ifdef WIN32
+	return path;
+#endif
+	char buf[PATH_MAX+1];
+
+	if (!realpath (path.c_str(), buf) && (errno != ENOENT)) {
+		return path;
+	}
+
+	return string (buf);
+}
+
+string
 PBD::path_expand (string path)
 {
         if (path.empty()) {
@@ -97,13 +114,7 @@ PBD::path_expand (string path)
 
 	/* canonicalize */
 
-	char buf[PATH_MAX+1];
-
-	if (realpath (path.c_str(), buf)) {
-		return buf;
-	} else {
-		return string();
-	}
+	return canonical_path (path);
 }
 
 string