X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmover.C;h=82cdce869b6bcaee4f1ea7c2ffaabe1b1e41a10e;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=a646f49478ce8d28923a131fceec26d398d4fcb9;hpb=e5706b107da902bc6a28cba0de3ccd6f75d9fee7;p=lyx.git

diff --git a/src/mover.C b/src/mover.C
index a646f49478..82cdce869b 100644
--- a/src/mover.C
+++ b/src/mover.C
@@ -8,6 +8,8 @@
  * Full author contact details are available in file CREDITS.
  */
 
+#include <config.h>
+
 #include "mover.h"
 
 #include "support/filetools.h"
@@ -15,49 +17,65 @@
 #include "support/lyxlib.h"
 #include "support/systemcall.h"
 
+#include <fstream>
 #include <sstream>
 
-using std::ostringstream;
-using std::string;
 
-namespace support = lyx::support;
+namespace lyx {
+
+using std::ios;
+using std::string;
 
 Movers movers;
 Movers system_movers;
 
 
-bool Mover::do_copy(string const & from, string const & to) const
+bool Mover::do_copy(string const & from, string const & to,
+		    string const &, unsigned long int mode) const
 {
-	return support::copy(from, to);
+	return support::copy(from, to, mode);
 }
 
 
-bool Mover::do_rename(string const & from, string const & to) const
+bool Mover::do_rename(string const & from, string const & to,
+		      string const &) const
 {
 	return support::rename(from, to);
 }
 
 
-bool SpecialisedMover::do_copy(string const & from, string const & to) const
+bool SpecialisedMover::do_copy(string const & from, string const & to,
+			       string const & latex, unsigned long int mode) const
 {
 	if (command_.empty())
-		return Mover::do_copy(from, to);
-
-	string command = support::LibScriptSearch(command_);
+		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);
+		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);
 
 	support::Systemcall one;
 	return one.startscript(support::Systemcall::Wait, command) == 0;
 }
 
 
-bool SpecialisedMover::do_rename(string const & from, string const & to) const
+bool SpecialisedMover::do_rename(string const & from, string const & to,
+				 string const & latex) const
 {
 	if (command_.empty())
-		return Mover::do_rename(from, to);
+		return Mover::do_rename(from, to, latex);
 
-	if (!do_copy(from, to))
+	if (!do_copy(from, to, latex, (unsigned long int)-1))
 		return false;
 	return support::unlink(from) == 0;
 }
@@ -81,3 +99,6 @@ string const Movers::command(string  const & fmt) const
 	SpecialsMap::const_iterator const it = specials_.find(fmt);
 	return (it == specials_.end()) ? string() : it->second.command();
 }
+
+
+} // namespace lyx