X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcopy.cpp;h=24be942532b83ab52a0dcfdeb8446ad29d708edf;hb=c75c89d2425ab0c69e94d45a5d956286838bbc67;hp=cdbbd48f1eead0b7c399a4b7ec7ad534252be2c4;hpb=5504b35e6c6cfb1cfa098b94e31cda173cc0482a;p=builder.git

diff --git a/source/copy.cpp b/source/copy.cpp
index cdbbd48..24be942 100644
--- a/source/copy.cpp
+++ b/source/copy.cpp
@@ -1,73 +1,96 @@
-#include <errno.h>
-#include <fstream>
-#include <msp/path/utils.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <msp/fs/dir.h>
+#include <msp/fs/stat.h>
+#include <msp/fs/utils.h>
+#include <msp/io/file.h>
+#include <msp/io/print.h>
 #include "builder.h"
 #include "copy.h"
-#include "package.h"
+#include "installedfile.h"
 
 using namespace std;
 using namespace Msp;
 
-Copy::Copy(Builder &b, const Package &pkg, const Path::Path &s, const Path::Path &d):
-	Action(b),
-	src(s),
-	dest(d),
-	worker(*this)
+Copy::Copy(Builder &b):
+	Tool(b, "CP")
+{ }
+
+Target *Copy::create_target(const list<Target *> &sources, const string &arg)
 {
-	announce(pkg.get_name(), "INST", dest[-1]);
-	if(builder.get_verbose()>=2)
-		cout<<s<<" -> "<<d<<'\n';
+	FileTarget &file_tgt = dynamic_cast<FileTarget &>(*sources.front());
+	InstalledFile *inst = new InstalledFile(builder, *file_tgt.get_package(), file_tgt, arg);
+	inst->set_tool(*this);
+	return inst;
 }
 
-int Copy::check()
+Task *Copy::run(const Target &target) const
 {
-	if(worker.get_done())
-	{
-		signal_done.emit();
-		worker.join();
-		return worker.get_error()?1:0;
-	}
-	return -1;
+	const InstalledFile &install = dynamic_cast<const InstalledFile &>(target);
+	Worker *worker = new Worker(install);
+	return new InternalTask(worker);
 }
 
+
+Copy::Worker::Worker(const InstalledFile &t):
+	target(t)
+{ }
+
 void Copy::Worker::main()
 {
-	Path::mkpath(copy.dest.subpath(0, copy.dest.size()-1), 0755);
-	
-	if(unlink(copy.dest.str().c_str())<0 && errno!=ENOENT)
+	const FileTarget &source = target.get_source();
+	const FS::Path &src_path = source.get_path();
+	const FS::Path &dst_path = target.get_path();
+	FS::mkpath(FS::dirname(dst_path), 0755);
+
+	// Remove old file.  Not doing this would cause Bad Stuff when installing libraries.
+	if(FS::exists(dst_path))
 	{
-		int err=errno;
-		cerr<<"Can't unlink "<<copy.dest<<": "<<strerror(err)<<'\n';
-		done=error=true;
-		return;
+		try
+		{
+			unlink(dst_path);
+		}
+		catch(const exception &e)
+		{
+			IO::print(IO::cerr, "%s\n", e.what());
+			status = Task::ERROR;
+			return;
+		}
 	}
 
-	ifstream in(copy.src.str().c_str());
-	if(!in)
+	try
 	{
-		cerr<<"Can't open "<<copy.src<<" for reading\n";
-		done=error=true;
-		return;
-	}
+		IO::File in(src_path.str());
+		IO::File out(dst_path.str(), IO::M_WRITE);
 
-	ofstream out(copy.dest.str().c_str());
-	if(!out)
+		// Actual transfer loop
+		char buf[16384];
+		while(!in.eof())
+		{
+			unsigned len = in.read(buf, sizeof(buf));
+			out.write(buf, len);
+		}
+	}
+	catch(const exception &e)
 	{
-		cerr<<"Can't open "<<copy.dest<<" for writing\n";
-		done=error=true;
+		IO::print(IO::cerr, "%s\n", e.what());
+		status = Task::ERROR;
 		return;
 	}
 
-	char buf[16384];
-	while(!in.eof())
+	// Preserve file permissions
+	struct stat st;
+	if(stat(src_path.str().c_str(), &st)==0)
+		chmod(dst_path.str().c_str(), st.st_mode&0777);
+
+	const FS::Path &link = target.get_symlink();
+	if(!link.empty())
 	{
-		in.read(buf, sizeof(buf));
-		out.write(buf, in.gcount());
+		FS::Path relpath = FS::relative(dst_path, FS::dirname(link));
+		if(FS::exists(link))
+			FS::unlink(link);
+		symlink(relpath.str().c_str(), link.str().c_str());
 	}
 
-	struct stat st;
-	Path::stat(copy.src, st);
-	chmod(copy.dest.str().c_str(), st.st_mode&0777);
-
-	done=true;
+	status = Task::SUCCESS;
 }