Merge branch 'master' into cairocanvas

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

diff --git a/libs/pbd/file_utils.cc b/libs/pbd/file_utils.cc
index 31db84e88f27a10c083c3314f156fe01fb656c8c..bb290fa6aaf1ae9ccdeba64e9a3941ed734b0184 100644 (file)
--- a/libs/pbd/file_utils.cc
+++ b/libs/pbd/file_utils.cc
@@ -18,6 +18,7 @@
 */
 
 #include <algorithm>
+#include <vector>
 
 #include <glib.h>
 #include <glib/gstdio.h>
@@ -32,6 +33,7 @@
 #include "pbd/file_utils.h"
 #include "pbd/error.h"
 #include "pbd/pathscanner.h"
+#include "pbd/stl_delete.h"
 
 #include "i18n.h"
 
@@ -165,10 +167,14 @@ copy_files(const std::string & from_path, const std::string & to_dir)
 {
        PathScanner scanner;
        vector<string*>* files = scanner (from_path, accept_all_files, 0, true, false);
-       for (vector<string*>::iterator i = files->begin(); i != files->end(); ++i) {
-               std::string from = Glib::build_filename (from_path, **i);
-               std::string to = Glib::build_filename (to_dir, **i);
-               copy_file (from, to);
+
+       if (files) {
+               for (vector<string*>::iterator i = files->begin(); i != files->end(); ++i) {
+                       std::string from = Glib::build_filename (from_path, **i);
+                       std::string to = Glib::build_filename (to_dir, **i);
+                       copy_file (from, to);
+               }
+               vector_delete (files);
        }
 }
 
@@ -207,4 +213,34 @@ path_is_within (std::string const & haystack, std::string needle)
        return false;
 }
 
+bool
+exists_and_writable (const std::string & p)
+{
+       /* writable() really reflects the whole folder, but if for any
+          reason the session state file can't be written to, still
+          make us unwritable.
+       */
+
+       struct stat statbuf;
+
+       if (g_stat (p.c_str(), &statbuf) != 0) {
+               /* doesn't exist - not writable */
+               return false;
+       } else {
+               if (!(statbuf.st_mode & S_IWUSR)) {
+                       /* exists and is not writable */
+                       return false;
+               }
+               /* filesystem may be mounted read-only, so even though file
+                * permissions permit access, the mount status does not.
+                * access(2) seems like the best test for this.
+                */
+               if (g_access (p.c_str(), W_OK) != 0) {
+                       return false;
+               }
+       }
+
+       return true;
+}
+
 } // namespace PBD