NO-OP: whitespace

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

diff --git a/libs/pbd/file_utils.cc b/libs/pbd/file_utils.cc
index a83d116d027505f37bc110a682ac3f842285d3de..3fc3cdf99edb814b6d304915c3748d984be512f1 100644 (file)
--- a/libs/pbd/file_utils.cc
+++ b/libs/pbd/file_utils.cc
@@ -22,7 +22,7 @@
 #include <vector>
 
 #include <glib.h>
-#include <glib/gstdio.h>
+#include "pbd/gstdio_compat.h"
 
 #ifdef COMPILER_MINGW
 #include <io.h> // For W_OK
@@ -57,13 +57,13 @@
 #include "pbd/scoped_file_descriptor.h"
 #include "pbd/stl_delete.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 
 namespace PBD {
 
-void
+static void
 run_functor_for_paths (vector<string>& result,
                        const Searchpath& paths,
                        bool (*functor)(const string &, void *),
@@ -127,7 +127,7 @@ run_functor_for_paths (vector<string>& result,
                                }
                        }
                }
-               catch (Glib::FileError& err)
+               catch (Glib::FileError const& err)
                {
                        warning << err.what() << endmsg;
                }
@@ -361,6 +361,65 @@ get_absolute_path (const std::string & p)
        return Glib::build_filename (Glib::get_current_dir(), p);
 }
 
+string
+canonical_path (const std::string& path)
+{
+#ifdef PLATFORM_WINDOWS
+       wchar_t resolved_wpath[_MAX_PATH];
+
+       // sizeof(wchar_t) is 2 bytes using gcc/mingw and VC++ but 4 bytes using gcc/linux
+       assert (sizeof(wchar_t) == 2);
+
+       wchar_t* wfilepath = (wchar_t*)g_utf8_to_utf16 (path.c_str(), -1, NULL, NULL, NULL);
+
+       if (wfilepath == NULL) {
+               DEBUG_TRACE (
+                   DEBUG::FileUtils,
+                   string_compose ("PBD::canonical_path: Unable to convert path from utf8 to utf16 : %1\n",
+                                   path));
+               return path;
+       }
+
+       if (_wfullpath (resolved_wpath, wfilepath, _MAX_PATH) == NULL) {
+               DEBUG_TRACE (DEBUG::FileUtils,
+                            string_compose ("PBD::canonical_path: Unable to resolve %1\n", wfilepath));
+               return path;
+       }
+
+       gchar* resolved_utf8_path =
+           g_utf16_to_utf8 (reinterpret_cast<const gunichar2*>(resolved_wpath), -1, NULL, NULL, NULL);
+
+       if (resolved_utf8_path == NULL) {
+               DEBUG_TRACE (
+                   DEBUG::FileUtils,
+                   string_compose ("PBD::canonical_path: Unable to convert path from utf16 to utf8 : %1\n",
+                                   resolved_wpath));
+               return path;
+       }
+
+       const string retval(resolved_utf8_path);
+
+       g_free (wfilepath);
+       g_free (resolved_utf8_path);
+
+       return retval;
+
+#else
+       char buf[PATH_MAX+1];
+
+       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);
+#endif
+}
+
 std::string
 get_suffix (const std::string & p)
 {
@@ -440,29 +499,31 @@ remove_directory_internal (const string& dir, size_t* size, vector<string>* path
        get_paths (tmp_paths, dir, just_remove_files, true);
 
        for (vector<string>::const_iterator i = tmp_paths.begin();
-            i != tmp_paths.end(); ++i) {
+                       i != tmp_paths.end(); ++i) {
 
-                if (g_stat (i->c_str(), &statbuf)) {
+               if (g_stat (i->c_str(), &statbuf)) {
                        continue;
                }
 
-                if (::g_remove (i->c_str())) {
-                        error << string_compose (_("cannot remove path %1 (%2)"), *i, strerror (errno))
-                              << endmsg;
-                        ret = 1;
-                }
+               if (::g_remove (i->c_str())) {
+                       error << string_compose (_("cannot remove path %1 (%2)"), *i, strerror (errno))
+                               << endmsg;
+                       ret = 1;
+                       continue;
+               }
 
-                if (paths) {
-                        paths->push_back (Glib::path_get_basename(*i));
-                }
+               if (paths) {
+                       paths->push_back (Glib::path_get_basename(*i));
+               }
 
-                if (size) {
-                        *size += statbuf.st_size;
-                }
+               // statbuf.st_size is off_t
+               if (size && statbuf.st_size > 0) {
+                       *size += statbuf.st_size;
+               }
 
        }
 
-        return ret;
+       return ret;
 }
 
 int
@@ -476,6 +537,7 @@ void
 remove_directory (const std::string& dir)
 {
        remove_directory_internal (dir, 0, 0, false);
+       g_rmdir (dir.c_str());
 }
 
 string
@@ -500,7 +562,7 @@ toggle_file_existence (string const & path)
 {
        if (Glib::file_test (path, Glib::FILE_TEST_IS_REGULAR)) {
                return g_unlink (path.c_str());
-       } 
+       }
 
        PBD::ScopedFileDescriptor fd = g_open (path.c_str(), O_CREAT|O_TRUNC|O_RDWR, 0666);
        return !((int) fd >= 0);