X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fpbd%2Ffile_utils.cc;h=26f80f971981965e61ca8f29c3ac4747993504c4;hb=aa77c2eb581a1952c48706cb0b74af1d74f27334;hp=849d7f05fd216e804cd963931a9bfe1d3d6cab20;hpb=1abe8f4e42542cad9b455f0b009707d8da47f496;p=ardour.git

diff --git a/libs/pbd/file_utils.cc b/libs/pbd/file_utils.cc
index 849d7f05fd..26f80f9719 100644
--- 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
@@ -50,14 +50,14 @@
 #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"
+#include "pbd/i18n.h"
 
 using namespace std;
 
@@ -225,7 +225,8 @@ regexp_filter (const string& str, void *arg)
 void
 find_files_matching_regex (vector<string>& result,
                            const Searchpath& paths,
-                           const std::string& regexp)
+                           const std::string& regexp,
+                           bool recurse)
 {
 	int err;
 	char msg[256];
@@ -250,7 +251,7 @@ find_files_matching_regex (vector<string>& result,
 
 	find_files_matching_filter (result, paths,
 	                            regexp_filter, &compiled_pattern,
-	                            true, true, false);
+	                            true, true, recurse);
 
 	regfree (&compiled_pattern);
 }
@@ -282,11 +283,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 (g_open (from_path.c_str(), O_RDONLY, 0444));
+	PBD::ScopedFileDescriptor fd_to (g_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;
 
@@ -344,6 +343,17 @@ copy_recurse(const std::string & from_path, const std::string & to_dir)
 	}
 }
 
+bool
+touch_file (const std::string& path)
+{
+	int fd = g_open (path.c_str(), O_RDWR|O_CREAT, 0660);
+	if (fd >= 0) {
+		close (fd);
+		return true;
+	}
+	return false;
+}
+
 std::string
 get_absolute_path (const std::string & p)
 {
@@ -381,7 +391,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;
 		}
 	}
@@ -430,29 +440,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
@@ -466,6 +478,7 @@ void
 remove_directory (const std::string& dir)
 {
 	remove_directory_internal (dir, 0, 0, false);
+	g_rmdir (dir.c_str());
 }
 
 string
@@ -485,4 +498,15 @@ tmp_writable_directory (const char* domain, const string& prefix)
 	return new_test_dir;
 }
 
+int
+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);
+}
+
 } // namespace PBD