Add an extra test to prevent 'PBD::path_is_within()' from looping infinitely on Windows

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

diff --git a/libs/pbd/file_utils.cc b/libs/pbd/file_utils.cc
index 099d1be2d680ded1ddfcf78cfe4f0a795b687a33..9523fdd6bdbd5bd7d6379146d574daa7fe556aef 100644 (file)
--- a/libs/pbd/file_utils.cc
+++ b/libs/pbd/file_utils.cc
@@ -50,11 +50,11 @@
 #endif
 
 #include "pbd/compose.h"
-#include "pbd/file_manager.h"
 #include "pbd/file_utils.h"
 #include "pbd/debug.h"
 #include "pbd/error.h"
 #include "pbd/pathexpand.h"
+#include "pbd/scoped_file_descriptor.h"
 #include "pbd/stl_delete.h"
 
 #include "i18n.h"
@@ -282,11 +282,9 @@ copy_file(const std::string & from_path, const std::string & to_path)
 {
        if (!Glib::file_test (from_path, Glib::FILE_TEST_EXISTS)) return false;
 
-       FdFileDescriptor from_file(from_path, false, 0444);
-       FdFileDescriptor to_file(to_path, true, 0666);
+       PBD::ScopedFileDescriptor fd_from (::open (from_path.c_str(), O_RDONLY));
+       PBD::ScopedFileDescriptor fd_to (::open (to_path.c_str(), O_CREAT|O_TRUNC|O_RDWR, 0666));
 
-       int fd_from = from_file.allocate ();
-       int fd_to = to_file.allocate ();
        char buf[4096]; // BUFSIZ  ??
        ssize_t nread;
 
@@ -381,7 +379,7 @@ path_is_within (std::string const & haystack, std::string needle)
                }
 
                needle = Glib::path_get_dirname (needle);
-               if (needle == "." || needle == "/") {
+               if (needle == "." || needle == "/" || Glib::path_skip_root(needle).empty()) {
                        break;
                }
        }
@@ -468,4 +466,21 @@ remove_directory (const std::string& dir)
        remove_directory_internal (dir, 0, 0, false);
 }
 
+string
+tmp_writable_directory (const char* domain, const string& prefix)
+{
+       std::string tmp_dir = Glib::build_filename (g_get_tmp_dir(), domain);
+       std::string dir_name;
+       std::string new_test_dir;
+       do {
+               ostringstream oss;
+               oss << prefix;
+               oss << g_random_int ();
+               dir_name = oss.str();
+               new_test_dir = Glib::build_filename (tmp_dir, dir_name);
+               if (Glib::file_test (new_test_dir, Glib::FILE_TEST_EXISTS)) continue;
+       } while (g_mkdir_with_parents (new_test_dir.c_str(), 0755) != 0);
+       return new_test_dir;
+}
+
 } // namespace PBD