Make PBD::sys::exists_and_writable take a string instead of sys::path

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

diff --git a/libs/pbd/filesystem.cc b/libs/pbd/filesystem.cc
index 9c05962a6b8130c78d84ecdb4cf3ba3f0c52260f..105af6ea32c57cf10ab0875e5562a3f915a9ae18 100644 (file)
--- a/libs/pbd/filesystem.cc
+++ b/libs/pbd/filesystem.cc
@@ -21,6 +21,8 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 
+#include <giomm/file.h>
+
 #include <cerrno>
 #include <fstream>
 
@@ -30,6 +32,7 @@
 #include "pbd/filesystem.h"
 #include "pbd/error.h"
 #include "pbd/compose.h"
+#include "pbd/pathscanner.h"
 
 #include "i18n.h"
 
@@ -90,6 +93,37 @@ exists (const path & p)
        return Glib::file_test (p.to_string(), Glib::FILE_TEST_EXISTS);
 }
 
+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.to_string().c_str(), W_OK) != 0) {
+                       return false;
+               }
+       }
+
+       return true;
+}
+
+
 bool
 is_directory (const path & p)
 {
@@ -150,28 +184,7 @@ rename (const path & from_path, const path & to_path)
                throw filesystem_error(g_strerror(errno), errno);
        }
 }
-
-// XXX character encoding.
-void
-copy_file(const path & from_path, const path & to_path)
-{
-       std::ifstream in(from_path.to_string().c_str());
-       std::ofstream out(to_path.to_string().c_str());
-       
-       if (!in || !out) {
-               throw filesystem_error(string_compose(_("Could not open files %1 and %2 for copying"),
-                                       from_path.to_string(), to_path.to_string()));
-       }
        
-       out << in.rdbuf();
-       
-       if (!in || !out) {
-               remove (to_path);
-               throw filesystem_error(string_compose(_("Could not copy existing file %1 to %2"),
-                                       from_path.to_string(), to_path.to_string()));
-       }
-}
-
 string
 basename (const path & p)
 {