suppress realloc-poll debug messages in optimized builds

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

diff --git a/libs/pbd/pathexpand.cc b/libs/pbd/pathexpand.cc
index 8184624d8930bce5faf34403d9776cfb1b04ce57..a92005a08621e9a0d850be26675d53bd3581ca02 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"
@@ -37,6 +39,7 @@ using std::vector;
 
 #ifdef COMPILER_MINGW
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <glibmm.h>
 
@@ -49,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;
@@ -66,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 !!
 
@@ -75,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);
 }
 
@@ -88,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);
 }
 
@@ -121,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] == '{') {
@@ -153,7 +161,7 @@ PBD::path_expand (string path)
                 }
 
                /* go back and do it again with whatever remains after the
-                * substitution 
+                * substitution
                 */
        }