X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fpbd%2Fpathexpand.cc;h=63ae348df1f6f7f5da5c5bd05d5d00026bc8bf0e;hb=34936f365404a42769cb85764ecf72ae065da651;hp=26454e4164fc73a3c30b5e8b7bb4c6e99b7d09f1;hpb=a1a3f6c8265264227ce19f731bf1863aff229a94;p=ardour.git

diff --git a/libs/pbd/pathexpand.cc b/libs/pbd/pathexpand.cc
index 26454e4164..63ae348df1 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,74 +25,18 @@
 
 #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 <stdlib.h>
-#include <glibmm.h>
-
-/****************************************************************
- * Emulate POSIX realpath() using Win32 _fullpath() since realpath()
- * is not available.
- *
- * Returns:
- *    On Success: A pointer to the resolved (absolute) path
- *    On Failure: 0 (NULL)
- */
-
-static char* 
-realpath (const char *original_path, char resolved_path[_MAX_PATH+1])
-{
-	char *rpath = 0;
-	bool bIsSymLink = false; // We'll probably need to test the incoming path
-	                         // to find out if it points to a Windows shortcut
-	                         // (or a hard link) and set this appropriately.
-
-	if (bIsSymLink) {
-		// At the moment I'm not sure if Windows '_fullpath()' is directly
-		// equivalent to POSIX 'realpath()' - in as much as the latter will
-		// resolve the supplied path if it happens to point to a symbolic
-		// link ('_fullpath()' probably DOESN'T do this but I'm not really
-		// sure if Ardour needs such functionality anyway). Therefore we'll
-		// 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 !!
-
-		rpath = _fullpath (temp, Glib::locale_from_utf8 (original_path).c_str(), _MAX_PATH);
-
-		if (0 != rpath) {
-			snprintf (resolved_path, _MAX_PATH+1, "%s", Glib::locale_to_utf8 (temp).c_str());
-		}
-			
-	}
-	
-	return (rpath);
-}
-
-#endif  // COMPILER_MINGW
-
-string
-PBD::canonical_path (const std::string& path)
-{
-	char buf[PATH_MAX+1];
-
-	if (!realpath (path.c_str(), buf) && (errno != ENOENT)) {
-		return path;
-	}
-
-	return string (buf);
-}
-
 string
 PBD::path_expand (string path)
 {
@@ -119,22 +63,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 +95,7 @@ PBD::path_expand (string path)
                 }
 
 		/* go back and do it again with whatever remains after the
-		 * substitution 
+		 * substitution
 		 */
 	}
 
@@ -172,7 +116,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 +129,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;
+}