add config.h

[lyx.git] / src / mover.C

diff --git a/src/mover.C b/src/mover.C
index 82cdce869b6bcaee4f1ea7c2ffaabe1b1e41a10e..6fb9daf06c5cd988505ce81f0c0493d229c43068 100644 (file)
--- a/src/mover.C
+++ b/src/mover.C
@@ -20,38 +20,49 @@
 #include <fstream>
 #include <sstream>
 
+using std::ios;
+using std::string;
 
 namespace lyx {
 
-using std::ios;
-using std::string;
+using support::quoteName;
 
-Movers movers;
-Movers system_movers;
+bool Mover::copy(support::FileName const & from, support::FileName const & to,
+                 unsigned long int mode) const
+{
+       return do_copy(from, to, to.absFilename(), mode);
+}
 
 
-bool Mover::do_copy(string const & from, string const & to,
+bool Mover::do_copy(support::FileName const & from, support::FileName const & to,
                    string const &, unsigned long int mode) const
 {
        return support::copy(from, to, mode);
 }
 
 
-bool Mover::do_rename(string const & from, string const & to,
+bool Mover::rename(support::FileName const & from,
+                   support::FileName const & to) const
+{
+       return do_rename(from, to, to.absFilename());
+}
+
+
+bool Mover::do_rename(support::FileName const & from, support::FileName const & to,
                      string const &) const
 {
        return support::rename(from, to);
 }
 
 
-bool SpecialisedMover::do_copy(string const & from, string const & to,
+bool SpecialisedMover::do_copy(support::FileName const & from, support::FileName const & to,
                               string const & latex, unsigned long int mode) const
 {
        if (command_.empty())
                return Mover::do_copy(from, to, latex, mode);
 
        if (mode != (unsigned long int)-1) {
-               std::ofstream ofs(to.c_str(), ios::binary | ios::out | ios::trunc);
+               std::ofstream ofs(to.toFilesystemEncoding().c_str(), ios::binary | ios::out | ios::trunc);
                if (!ofs)
                        return false;
                ofs.close();
@@ -60,16 +71,16 @@ bool SpecialisedMover::do_copy(string const & from, string const & to,
        }
 
        string command = support::libScriptSearch(command_);
-       command = support::subst(command, "$$i", from);
-       command = support::subst(command, "$$o", to);
-       command = support::subst(command, "$$l", latex);
+       command = support::subst(command, "$$i", quoteName(from.toFilesystemEncoding()));
+       command = support::subst(command, "$$o", quoteName(to.toFilesystemEncoding()));
+       command = support::subst(command, "$$l", quoteName(latex));
 
        support::Systemcall one;
        return one.startscript(support::Systemcall::Wait, command) == 0;
 }
 
 
-bool SpecialisedMover::do_rename(string const & from, string const & to,
+bool SpecialisedMover::do_rename(support::FileName const & from, support::FileName const & to,
                                 string const & latex) const
 {
        if (command_.empty())
@@ -90,7 +101,9 @@ void Movers::set(string const & fmt, string const & command)
 Mover const & Movers::operator()(string const & fmt) const
 {
        SpecialsMap::const_iterator const it = specials_.find(fmt);
-       return (it == specials_.end()) ? default_ : it->second;
+       if (it == specials_.end())
+               return default_;
+       return  it->second;
 }