#include "support/lyxlib.h"
#include "support/systemcall.h"
+#include <fstream>
#include <sstream>
-using std::ostringstream;
+using std::ios;
using std::string;
-namespace support = lyx::support;
+namespace lyx {
-Movers movers;
-Movers system_movers;
+using support::quoteName;
+
+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(support::FileName const & from, support::FileName const & to,
+ string const &, unsigned long int mode) const
+{
+ return support::copy(from, to, mode);
+}
-bool Mover::do_copy(string const & from, string const & to,
- string const &) const
+bool Mover::rename(support::FileName const & from,
+ support::FileName const & to) const
{
- return support::copy(from, to);
+ return do_rename(from, to, to.absFilename());
}
-bool Mover::do_rename(string const & from, string const & to,
+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,
- string const & latex) const
+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);
+ return Mover::do_copy(from, to, latex, mode);
+
+ if (mode != (unsigned long int)-1) {
+ std::ofstream ofs(to.toFilesystemEncoding().c_str(), ios::binary | ios::out | ios::trunc);
+ if (!ofs)
+ return false;
+ ofs.close();
+ if (!support::chmod(to, mode))
+ return false;
+ }
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())
return Mover::do_rename(from, to, latex);
- if (!do_copy(from, to, latex))
+ if (!do_copy(from, to, latex, (unsigned long int)-1))
return false;
return support::unlink(from) == 0;
}
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;
}
SpecialsMap::const_iterator const it = specials_.find(fmt);
return (it == specials_.end()) ? string() : it->second.command();
}
+
+
+} // namespace lyx