X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcopy.cpp;h=6ad2a5e791d1705509f9bff208b27e3819764044;hb=4f78d9f016482ce1ac7d726852e33e07c090df1b;hp=23cd6f1af358cebb11e9e526a7ede7ef1af4ef0b;hpb=0d80cabf649b931b26e7055385156c75a7385d35;p=builder.git

diff --git a/source/copy.cpp b/source/copy.cpp
index 23cd6f1..6ad2a5e 100644
--- a/source/copy.cpp
+++ b/source/copy.cpp
@@ -1,5 +1,8 @@
+#include <errno.h>
 #include <fstream>
+#include <iostream>
 #include <msp/path/utils.h>
+#include "builder.h"
 #include "copy.h"
 #include "package.h"
 
@@ -10,29 +13,69 @@ Copy::Copy(Builder &b, const Package &pkg, const Path::Path &s, const Path::Path
 	Action(b),
 	src(s),
 	dest(d),
-	worker(*this)
+	worker(0)
 {
-	announce(pkg.get_name(), "INST", dest[-1]);
+	announce(pkg.get_name(), "COPY", dest[-1]);
+	if(builder.get_verbose()>=2)
+		cout<<s<<" -> "<<d<<'\n';
+	
+	if(!builder.get_dry_run())
+		worker=new Worker(*this);
 }
 
 int Copy::check()
 {
-	if(worker.get_done())
+	if(!worker)  // True for dry run
 	{
 		signal_done.emit();
-		worker.join();
 		return 0;
 	}
+	
+	if(worker->get_done())
+	{
+		signal_done.emit();
+		worker->join();
+		return worker->get_error()?1:0;
+	}
+	
 	return -1;
 }
 
+Copy::~Copy()
+{
+	delete worker;
+}
+
 void Copy::Worker::main()
 {
-	Path::mkpath(copy.src.subpath(0, copy.src.size()-1), 0755);
-	unlink(copy.dest.str().c_str());
+	Path::mkpath(copy.dest.subpath(0, copy.dest.size()-1), 0755);
+	
+	// Remove old file.  Not doing this would cause Bad Stuff when installing libraries.
+	if(unlink(copy.dest.str().c_str())<0 && errno!=ENOENT)
+	{
+		int err=errno;
+		cerr<<"Can't unlink "<<copy.dest<<": "<<strerror(err)<<'\n';
+		done=error=true;
+		return;
+	}
+
 	ifstream in(copy.src.str().c_str());
+	if(!in)
+	{
+		cerr<<"Can't open "<<copy.src<<" for reading\n";
+		done=error=true;
+		return;
+	}
+
 	ofstream out(copy.dest.str().c_str());
+	if(!out)
+	{
+		cerr<<"Can't open "<<copy.dest<<" for writing\n";
+		done=error=true;
+		return;
+	}
 
+	// Actual transfer loop
 	char buf[16384];
 	while(!in.eof())
 	{
@@ -40,6 +83,7 @@ void Copy::Worker::main()
 		out.write(buf, in.gcount());
 	}
 
+	// Preserve file permissions
 	struct stat st;
 	Path::stat(copy.src, st);
 	chmod(copy.dest.str().c_str(), st.st_mode&0777);