a better fix for CUE/TOC string escaping: if the text is not Latin-1 already, reject...

[ardour.git] / libs / ardour / utils.cc

diff --git a/libs/ardour/utils.cc b/libs/ardour/utils.cc
index 4175322bb6c187b530c6ff238ebf7cd895004f67..1c52a6f6384e49141186c2a5369f01b6ec12fb78 100644 (file)
--- a/libs/ardour/utils.cc
+++ b/libs/ardour/utils.cc
@@ -25,6 +25,8 @@
 
 #include <cstdio> /* for sprintf */
 #include <cstring>
+#include <climits>
+#include <cstdlib>
 #include <cmath>
 #include <cctype>
 #include <cstring>
@@ -36,20 +38,18 @@
 #include <fcntl.h>
 #include <dirent.h>
 #include <errno.h>
+#include <regex.h>
 
 #include <glibmm/miscutils.h>
 #include <glibmm/fileutils.h>
 
-#ifdef HAVE_WORDEXP
-#include <wordexp.h>
-#endif
-
 #include "pbd/cpus.h"
 #include "pbd/error.h"
 #include "pbd/stacktrace.h"
 #include "pbd/xml++.h"
 #include "pbd/basename.h"
 #include "pbd/strsplit.h"
+#include "pbd/replace_all.h"
 
 #include "ardour/utils.h"
 #include "ardour/rc_configuration.h"
@@ -75,7 +75,7 @@ legalize_for_path (const string& str)
                pos += 1;
        }
 
-       return legal;
+       return string (legal);
 }
 
 string
@@ -280,32 +280,103 @@ path_expand (string path)
                 return path;
         }
 
-#ifdef HAVE_WORDEXP
-       /* Handle tilde and environment variable expansion in session path */
-       string ret = path;
+        /* tilde expansion */
 
-       wordexp_t expansion;
-       switch (wordexp (path.c_str(), &expansion, WRDE_NOCMD|WRDE_UNDEF)) {
-       case 0:
-               break;
-       default:
-               error << string_compose (_("illegal or badly-formed string used for path (%1)"), path) << endmsg;
-               goto out;
+        if (path[0] == '~') {
+                if (path.length() == 1) {
+                        return Glib::get_home_dir();
+                }
+
+                if (path[1] == '/') {
+                        path.replace (0, 1, Glib::get_home_dir());
+                } else {
+                        /* can't handle ~roger, so just leave it */
+                }
+        }
+
+       /* now do $VAR substitution, since wordexp isn't reliable */
+
+       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)) {
+                cerr << "bad regcomp\n";
+                return path;
+        }
+
+       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] == '{') {
+                        /* ${FOO} form */
+                        match = match.substr (2, match.length() - 3);
+                }
+
+               char* matched_value = getenv (match.c_str());
+
+               if (matched_value) {
+                       path.replace (matches[0].rm_so, matches[0].rm_eo - matches[0].rm_so, matched_value);
+               } else {
+                       path.replace (matches[0].rm_so, matches[0].rm_eo - matches[0].rm_so, string());
+                }
+
+               /* go back and do it again with whatever remains after the
+                * substitution 
+                */
        }
 
-       if (expansion.we_wordc > 1) {
-               error << string_compose (_("path (%1) is ambiguous"), path) << endmsg;
-               goto out;
+       regfree (&compiled_pattern);
+
+       /* canonicalize */
+
+       char buf[PATH_MAX+1];
+
+       if (realpath (path.c_str(), buf)) {
+               return buf;
+       } else {
+               return string();
        }
+}
 
-       ret = expansion.we_wordv[0];
-  out:
-       wordfree (&expansion);
-       return ret;
+string
+search_path_expand (string path)
+{
+        if (path.empty()) {
+                return path;
+        }
 
-#else
-       return path;
-#endif
+       vector<string> s;
+       vector<string> n;
+
+       split (path, s, ':');
+
+       for (vector<string>::iterator i = s.begin(); i != s.end(); ++i) {
+               string exp = path_expand (*i);
+               if (!exp.empty()) {
+                       n.push_back (exp);
+               }
+       }
+
+       string r;
+
+       for (vector<string>::iterator i = n.begin(); i != n.end(); ++i) {
+               if (!r.empty()) {
+                       r += ':';
+               }
+               r += *i;
+       }
+
+       return r;
 }
 
 #if __APPLE__
@@ -561,7 +632,19 @@ string_is_affirmative (const std::string& str)
 {
        /* to be used only with XML data - not intended to handle user input */
 
-       return str == "1" || str == "y" || str == "Y" || (!g_strncasecmp(str.c_str(), "yes", str.length()));
+       if (str.empty ()) {
+               return false;
+       }
+
+       /* the use of g_strncasecmp() is solely to get around issues with
+        * charsets posed by trying to use C++ for the same
+        * comparison. switching a std::string to its lower- or upper-case
+        * version has several issues, but handled by default
+        * in the way we desire when doing it in C.
+        */
+
+       return str == "1" || str == "y" || str == "Y" || (!g_strncasecmp(str.c_str(), "yes", str.length())) ||
+               (!g_strncasecmp(str.c_str(), "true", str.length()));
 }
 
 const char*
@@ -674,14 +757,12 @@ how_many_dsp_threads ()
 
 double gain_to_slider_position_with_max (double g, double max_gain)
 {
-       /* max gain is ignored for now */
-        return gain_to_slider_position (g);
+        return gain_to_slider_position (g * 2.0/max_gain);
 }
 
 double slider_position_to_gain_with_max (double g, double max_gain)
 {
-       /* max gain is ignored for now */
-       return slider_position_to_gain (g);
+       return slider_position_to_gain (g * max_gain/2.0);
 }
 
 extern "C" {