X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fpbd%2Ffile_utils.cc;h=6cf43f3fd2bfd3324895151c4b8bc4a274246b4d;hb=8de12a40158683c665fc0bf242b2fc150d3ad538;hp=632347c41aadf056eccbe9f8bb61383174031ac5;hpb=851db83fc46ebe41f1b88503895be6e0436d5a6f;p=ardour.git diff --git a/libs/pbd/file_utils.cc b/libs/pbd/file_utils.cc index 632347c41a..6cf43f3fd2 100644 --- a/libs/pbd/file_utils.cc +++ b/libs/pbd/file_utils.cc @@ -22,7 +22,7 @@ #include #include -#include +#include "pbd/gstdio_compat.h" #ifdef COMPILER_MINGW #include // For W_OK @@ -54,6 +54,7 @@ #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" @@ -141,18 +142,18 @@ bool accept_all_files (string const &, void *) void get_paths (vector& result, - const std::string& directory_path, + const Searchpath& paths, bool files_only, bool recurse) { - run_functor_for_paths (result, directory_path, accept_all_files, 0, + run_functor_for_paths (result, paths, accept_all_files, 0, files_only, true, true, recurse); } void -get_files (vector& result, const std::string& directory_path) +get_files (vector& result, const Searchpath& paths) { - return get_paths (result, directory_path, true, false); + return get_paths (result, paths, true, false); } static @@ -224,7 +225,8 @@ regexp_filter (const string& str, void *arg) void find_files_matching_regex (vector& result, const Searchpath& paths, - const std::string& regexp) + const std::string& regexp, + bool recurse) { int err; char msg[256]; @@ -249,7 +251,7 @@ find_files_matching_regex (vector& result, find_files_matching_filter (result, paths, regexp_filter, &compiled_pattern, - true, true, false); + true, true, recurse); regfree (&compiled_pattern); } @@ -259,10 +261,10 @@ find_paths_matching_filter (vector& result, const Searchpath& paths, bool (*filter)(const string &, void *), void *arg, - bool match_fullpath, bool return_fullpath, + bool pass_fullpath, bool return_fullpath, bool recurse) { - run_functor_for_paths (result, paths, filter, arg, false, match_fullpath, return_fullpath, recurse); + run_functor_for_paths (result, paths, filter, arg, false, pass_fullpath, return_fullpath, recurse); } void @@ -270,10 +272,10 @@ find_files_matching_filter (vector& result, const Searchpath& paths, bool (*filter)(const string &, void *), void *arg, - bool match_fullpath, bool return_fullpath, + bool pass_fullpath, bool return_fullpath, bool recurse) { - run_functor_for_paths (result, paths, filter, arg, true, match_fullpath, return_fullpath, recurse); + run_functor_for_paths (result, paths, filter, arg, true, pass_fullpath, return_fullpath, recurse); } bool @@ -281,19 +283,17 @@ copy_file(const std::string & from_path, const std::string & to_path) { if (!Glib::file_test (from_path, Glib::FILE_TEST_EXISTS)) return false; - int fd_from = -1; - int fd_to = -1; + 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)); + char buf[4096]; // BUFSIZ ?? ssize_t nread; - fd_from = ::open(from_path.c_str(), O_RDONLY); - if (fd_from < 0) { - goto copy_error; - } - - fd_to = ::open(to_path.c_str(), O_WRONLY | O_CREAT, 0666); - if (fd_to < 0) { - goto copy_error; + if ((fd_from < 0) || (fd_to < 0)) { + error << string_compose (_("Unable to Open files %1 to %2 for Copying(%3)"), + from_path, to_path, g_strerror(errno)) + << endmsg; + return false; } while (nread = ::read(fd_from, buf, sizeof(buf)), nread > 0) { @@ -304,34 +304,15 @@ copy_file(const std::string & from_path, const std::string & to_path) nread -= nwritten; out_ptr += nwritten; } else if (errno != EINTR) { - goto copy_error; + error << string_compose (_("Unable to Copy files %1 to %2(%3)"), + from_path, to_path, g_strerror(errno)) + << endmsg; + return false; } } while (nread > 0); } - if (nread == 0) { - if (::close(fd_to)) { - fd_to = -1; - goto copy_error; - } - ::close(fd_from); - return true; - } - -copy_error: - int saved_errno = errno; - - if (fd_from >= 0) { - ::close(fd_from); - } - if (fd_to >= 0) { - ::close(fd_to); - } - - error << string_compose (_("Unable to Copy file %1 to %2 (%3)"), - from_path, to_path, strerror(saved_errno)) - << endmsg; - return false; + return true; } void @@ -347,6 +328,32 @@ copy_files(const std::string & from_path, const std::string & to_dir) } } +void +copy_recurse(const std::string & from_path, const std::string & to_dir) +{ + vector files; + find_files_matching_filter (files, from_path, accept_all_files, 0, false, true, true); + + const size_t prefix_len = from_path.size(); + for (vector::iterator i = files.begin(); i != files.end(); ++i) { + std::string from = *i; + std::string to = Glib::build_filename (to_dir, (*i).substr(prefix_len)); + g_mkdir_with_parents (Glib::path_get_dirname (to).c_str(), 0755); + copy_file (from, to); + } +} + +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) { @@ -354,6 +361,16 @@ get_absolute_path (const std::string & p) return Glib::build_filename (Glib::get_current_dir(), p); } +std::string +get_suffix (const std::string & p) +{ + string::size_type period = p.find_last_of ('.'); + if (period == string::npos || period == p.length() - 1) { + return string(); + } + return p.substr (period+1); +} + bool equivalent_paths (const std::string& a, const std::string& b) { @@ -374,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; } } @@ -417,35 +434,37 @@ remove_directory_internal (const string& dir, size_t* size, vector* path bool just_remove_files) { vector tmp_paths; - struct stat statbuf; + GStatBuf statbuf; int ret = 0; get_paths (tmp_paths, dir, just_remove_files, true); for (vector::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 @@ -459,6 +478,35 @@ void remove_directory (const std::string& dir) { remove_directory_internal (dir, 0, 0, false); + g_rmdir (dir.c_str()); +} + +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; +} + +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