X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fpbd%2Fpathexpand.cc;h=a92005a08621e9a0d850be26675d53bd3581ca02;hb=368a091acdcf0476ed9b3f3b79aab1d77794104e;hp=3398bd11521594bd70e4db5d64c39bbd7d73e534;hpb=8f930477be9e2c88859a8ea30b213fba3f7fc443;p=ardour.git

diff --git a/libs/pbd/pathexpand.cc b/libs/pbd/pathexpand.cc
index 3398bd1152..a92005a086 100644
--- a/libs/pbd/pathexpand.cc
+++ b/libs/pbd/pathexpand.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Paul Davis
+    Copyright (C) 2013-2014 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -25,16 +25,21 @@
 
 #include <regex.h>
 
+#include <glibmm/fileutils.h>
 #include <glibmm/miscutils.h>
 
+#include "pbd/compose.h"
+#include "pbd/debug.h"
 #include "pbd/pathexpand.h"
 #include "pbd/strsplit.h"
+#include "pbd/tokenizer.h"
 
 using std::string;
 using std::vector;
 
 #ifdef COMPILER_MINGW
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <glibmm.h>
 
@@ -47,7 +52,7 @@ using std::vector;
  *    On Failure: 0 (NULL)
  */
 
-static char* 
+static char*
 realpath (const char *original_path, char resolved_path[_MAX_PATH+1])
 {
 	char *rpath = 0;
@@ -64,7 +69,7 @@ realpath (const char *original_path, char resolved_path[_MAX_PATH+1])
 		// possibly need to add that functionality here at a later date.
 	} else {
 		char temp[(_MAX_PATH+1)*6]; // Allow for maximum length of a path in wchar characters
-		
+
 		// POSIX 'realpath()' requires that the buffer size is at
 		// least PATH_MAX+1, so assume that the user knew this !!
 
@@ -73,9 +78,9 @@ realpath (const char *original_path, char resolved_path[_MAX_PATH+1])
 		if (0 != rpath) {
 			snprintf (resolved_path, _MAX_PATH+1, "%s", Glib::locale_to_utf8 (temp).c_str());
 		}
-			
+
 	}
-	
+
 	return (rpath);
 }
 
@@ -86,10 +91,15 @@ PBD::canonical_path (const std::string& path)
 {
 	char buf[PATH_MAX+1];
 
-	if (!realpath (path.c_str(), buf)) {
+	if (realpath (path.c_str(), buf) == NULL) {
+		DEBUG_TRACE (DEBUG::FileUtils,
+				string_compose("PBD::canonical_path: Unable to resolve %1: %2\n", path, g_strerror(errno)));
 		return path;
 	}
 
+	DEBUG_TRACE (DEBUG::FileUtils,
+			string_compose("PBD::canonical_path %1 resolved to: %2\n", path, string(buf)));
+
 	return string (buf);
 }
 
@@ -119,22 +129,22 @@ PBD::path_expand (string path)
 	regex_t compiled_pattern;
 	const int nmatches = 100;
 	regmatch_t matches[nmatches];
-	
+
 	if (regcomp (&compiled_pattern, "\\$([a-zA-Z_][a-zA-Z0-9_]*|\\{[a-zA-Z_][a-zA-Z0-9_]*\\})", REG_EXTENDED)) {
 		std::cerr << "bad regcomp\n";
                 return path;
         }
 
-	while (true) { 
+	while (true) {
 
 		if (regexec (&compiled_pattern, path.c_str(), nmatches, matches, 0)) {
 			break;
 		}
-		
+
 		/* matches[0] gives the entire match */
-		
+
 		string match = path.substr (matches[0].rm_so, matches[0].rm_eo - matches[0].rm_so);
-		
+
 		/* try to get match from the environment */
 
                 if (match[1] == '{') {
@@ -151,7 +161,7 @@ PBD::path_expand (string path)
                 }
 
 		/* go back and do it again with whatever remains after the
-		 * substitution 
+		 * substitution
 		 */
 	}
 
@@ -172,7 +182,7 @@ PBD::search_path_expand (string path)
 	vector<string> s;
 	vector<string> n;
 
-	split (path, s, ':');
+	split (path, s, G_SEARCHPATH_SEPARATOR);
 
 	for (vector<string>::iterator i = s.begin(); i != s.end(); ++i) {
 		string exp = path_expand (*i);
@@ -185,10 +195,36 @@ PBD::search_path_expand (string path)
 
 	for (vector<string>::iterator i = n.begin(); i != n.end(); ++i) {
 		if (!r.empty()) {
-			r += ':';
+			r += G_SEARCHPATH_SEPARATOR;
 		}
 		r += *i;
 	}
 
 	return r;
 }
+
+std::vector <std::string>
+PBD::parse_path(std::string path, bool check_if_exists)
+{
+	vector <std::string> pathlist;
+	vector <std::string> tmp;
+	PBD::tokenize (path, string(G_SEARCHPATH_SEPARATOR_S), std::back_inserter (tmp));
+
+	for(vector<std::string>::const_iterator i = tmp.begin(); i != tmp.end(); ++i) {
+		if ((*i).empty()) continue;
+		std::string dir;
+#ifndef PLATFORM_WINDOWS
+		if ((*i).substr(0,1) == "~") {
+			dir = Glib::build_filename(Glib::get_home_dir(), (*i).substr(1));
+		}
+		else
+#endif
+		{
+			dir = *i;
+		}
+		if (!check_if_exists || Glib::file_test (dir, Glib::FILE_TEST_IS_DIR)) {
+			pathlist.push_back(dir);
+		}
+	}
+  return pathlist;
+}