Move file utility function into pbd/file_utils.h and into PBD namespace

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

diff --git a/libs/pbd/filesystem.cc b/libs/pbd/filesystem.cc
index 7943e40b7430cef9ae20b28d87ae102b5f66b5d7..a154ed8b8eb70dbd454fc884c94312e11e52e096 100644 (file)
--- a/libs/pbd/filesystem.cc
+++ b/libs/pbd/filesystem.cc
@@ -21,18 +21,23 @@
 #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 "pbd/pathscanner.h"
 
 #include "i18n.h"
 
+using namespace std;
+
 namespace PBD {
 
 namespace sys {
@@ -137,27 +142,18 @@ remove(const path & p)
 }
 
 void
-copy_file(const path & from_path, const path & to_path)
+rename (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());
-       
-       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) {
-               throw filesystem_error(string_compose(_("Could not copy existing file %1 to %2"),
-                                       from_path.to_string(), to_path.to_string()));
-               remove (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);
        }
 }
-
+       
 string
 basename (const path & p)
 {