Move PBD::canonical_path to pbd/file_utils.h/cc and reimplement for Windows

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

diff --git a/libs/pbd/pathexpand.cc b/libs/pbd/pathexpand.cc
index 8184624d8930bce5faf34403d9776cfb1b04ce57..63ae348df1f6f7f5da5c5bd05d5d00026bc8bf0e 100644 (file)
--- a/libs/pbd/pathexpand.cc
+++ b/libs/pbd/pathexpand.cc
@@ -28,6 +28,8 @@
 #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"
@@ -35,66 +37,6 @@
 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)) {
-               return path;
-       }
-
-       return string (buf);
-}
-
 string
 PBD::path_expand (string path)
 {
@@ -121,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] == '{') {
@@ -153,7 +95,7 @@ PBD::path_expand (string path)
                 }
 
                /* go back and do it again with whatever remains after the
-                * substitution 
+                * substitution
                 */
        }