Fix some capitalisation in the preferences dialog.

[ardour.git] / libs / pbd / pathexpand.cc

diff --git a/libs/pbd/pathexpand.cc b/libs/pbd/pathexpand.cc
index 4935297ea0858163dd623d3d193f1305392b4c8d..8184624d8930bce5faf34403d9776cfb1b04ce57 100644 (file)
--- 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,17 +25,19 @@
 
 #include <regex.h>
 
+#include <glibmm/fileutils.h>
 #include <glibmm/miscutils.h>
 
 #include "pbd/pathexpand.h"
 #include "pbd/strsplit.h"
+#include "pbd/tokenizer.h"
 
 using std::string;
 using std::vector;
 
 #ifdef COMPILER_MINGW
 
-#include <WTypes.h>
+#include <stdlib.h>
 #include <glibmm.h>
 
 /****************************************************************
@@ -63,7 +65,7 @@ realpath (const char *original_path, char resolved_path[_MAX_PATH+1])
                // 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
+               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 !!
@@ -71,7 +73,7 @@ realpath (const char *original_path, char resolved_path[_MAX_PATH+1])
                rpath = _fullpath (temp, Glib::locale_from_utf8 (original_path).c_str(), _MAX_PATH);
 
                if (0 != rpath) {
-                       snprintf (resolved_path, _MAX_PATH+1, Glib::locale_to_utf8 (temp).c_str());
+                       snprintf (resolved_path, _MAX_PATH+1, "%s", Glib::locale_to_utf8 (temp).c_str());
                }
                        
        }
@@ -86,7 +88,7 @@ PBD::canonical_path (const std::string& path)
 {
        char buf[PATH_MAX+1];
 
-       if (!realpath (path.c_str(), buf) && (errno != ENOENT)) {
+       if (!realpath (path.c_str(), buf)) {
                return path;
        }
 
@@ -172,7 +174,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 +187,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;
+}