#endif
#include "pbd/compose.h"
+#include "pbd/file_manager.h"
#include "pbd/file_utils.h"
#include "pbd/debug.h"
#include "pbd/error.h"
}
}
-void
-get_directory_contents (const std::string& directory_path,
- vector<string>& result,
- bool files_only,
- bool recurse)
+static
+bool accept_all_files (string const &, void *)
{
- // perhaps we don't need this check assuming an exception is thrown
- // as it would save checking that the path is a directory twice when
- // recursing
- if (!Glib::file_test (directory_path, Glib::FILE_TEST_IS_DIR)) return;
-
- try
- {
- Glib::Dir dir(directory_path);
- Glib::DirIterator i = dir.begin();
-
- while (i != dir.end()) {
-
- string fullpath = Glib::build_filename (directory_path, *i);
-
- bool is_dir = Glib::file_test (fullpath, Glib::FILE_TEST_IS_DIR);
-
- if (is_dir && recurse) {
- DEBUG_TRACE (DEBUG::FileUtils,
- string_compose("Descending into directory: %1\n",
- fullpath));
- get_directory_contents (fullpath, result, files_only, recurse);
- }
-
- i++;
+ return true;
+}
- if (is_dir && files_only) {
- continue;
- }
- result.push_back (fullpath);
- }
- }
- catch (Glib::FileError& err)
- {
- warning << err.what() << endmsg;
- }
+void
+get_paths (vector<string>& result,
+ const Searchpath& paths,
+ bool files_only,
+ bool recurse)
+{
+ run_functor_for_paths (result, paths, accept_all_files, 0,
+ files_only, true, true, recurse);
}
void
-get_files_in_directory (const std::string& directory_path, vector<string>& result)
+get_files (vector<string>& result, const Searchpath& paths)
{
- return get_directory_contents (directory_path, result, true, false);
+ return get_paths (result, paths, true, false);
}
static
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
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
{
if (!Glib::file_test (from_path, Glib::FILE_TEST_EXISTS)) return false;
- int fd_from = -1;
- int fd_to = -1;
+ FdFileDescriptor from_file(from_path, false, 0444);
+ FdFileDescriptor to_file(to_path, true, 0666);
+
+ int fd_from = from_file.allocate ();
+ int fd_to = to_file.allocate ();
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) {
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;
-}
-
-static
-bool accept_all_files (string const &, void *)
-{
return true;
}
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)
{
bool just_remove_files)
{
vector<string> tmp_paths;
- struct stat statbuf;
+ GStatBuf statbuf;
int ret = 0;
- get_directory_contents (dir, tmp_paths, just_remove_files, true);
+ get_paths (tmp_paths, dir, just_remove_files, true);
for (vector<string>::const_iterator i = tmp_paths.begin();
i != tmp_paths.end(); ++i) {
projects / ardour.git / blobdiff