tweak transport bar spacing

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

diff --git a/libs/pbd/filesystem.cc b/libs/pbd/filesystem.cc
index 7943e40b7430cef9ae20b28d87ae102b5f66b5d7..661e21cbd5074bf971fb5e5b12c9225ede2912c0 100644 (file)
--- a/libs/pbd/filesystem.cc
+++ b/libs/pbd/filesystem.cc
@@ -21,18 +21,22 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 
+#include <giomm/file.h>
+
 #include <cerrno>
 #include <fstream>
 
 #include <glibmm/fileutils.h>
 #include <glibmm/miscutils.h>
 
-#include <pbd/filesystem.h>
-#include <pbd/error.h>
-#include <pbd/compose.h>
+#include "pbd/filesystem.h"
+#include "pbd/error.h"
+#include "pbd/compose.h"
 
 #include "i18n.h"
 
+using namespace std;
+
 namespace PBD {
 
 namespace sys {
@@ -88,6 +92,30 @@ exists (const path & p)
        return Glib::file_test (p.to_string(), Glib::FILE_TEST_EXISTS);
 }
 
+bool
+exists_and_writable (const path & 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.to_string().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;
+               }
+       }
+
+       return true;
+}
+
+
 bool
 is_directory (const path & p)
 {
@@ -136,11 +164,23 @@ remove(const path & p)
        return true;
 }
 
+void
+rename (const path & from_path, const path & to_path)
+{
+       // g_rename is a macro that evaluates to ::rename on
+       // POSIX systems, without the global namespace qualifier
+       // it would evaluate to a recursive call(if it compiled)
+       if ( ::g_rename( from_path.to_string().c_str(),
+                               to_path.to_string().c_str() ) == -1 )
+       {
+               throw filesystem_error(g_strerror(errno), errno);
+       }
+}
+
+// XXX character encoding.
 void
 copy_file(const path & from_path, const path & to_path)
 {
-       // this implementation could use mucho memory
-       // for big files.
        std::ifstream in(from_path.to_string().c_str());
        std::ofstream out(to_path.to_string().c_str());
        
@@ -152,9 +192,9 @@ copy_file(const path & from_path, const path & to_path)
        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()));
-               remove (to_path);
        }
 }
 
@@ -184,6 +224,14 @@ extension (const path & p)
 
 }
 
+/** Take a (possibly) relative path and make it absolute */
+path
+get_absolute_path (const path & p)
+{
+       Glib::RefPtr<Gio::File> f = Gio::File::create_for_path (p.to_string ());
+       return f->get_path ();
+}
+
 } // namespace sys
 
 } // namespace PBD