X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcopy.cpp;h=bdcd0a94a8006ec108c31ecfbea5e3ce7d4d97bc;hb=54aab19ee471810a956e1fee4d3b962aaf9ae9b3;hp=1f764dc038045575bb526c44939fcad4ac72add5;hpb=f1c967215e6b08095bdf07518472beca3067ec37;p=builder.git

diff --git a/source/copy.cpp b/source/copy.cpp
index 1f764dc..bdcd0a9 100644
--- a/source/copy.cpp
+++ b/source/copy.cpp
@@ -1,5 +1,13 @@
+/* $Id$
+
+This file is part of builder
+Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Distributed under the LGPL
+*/
+
 #include <errno.h>
 #include <fstream>
+#include <iostream>
 #include <msp/path/utils.h>
 #include "builder.h"
 #include "copy.h"
@@ -8,50 +16,43 @@
 using namespace std;
 using namespace Msp;
 
-Copy::Copy(Builder &b, const Package &pkg, const Path::Path &s, const Path::Path &d):
-	Action(b),
+Copy::Copy(Builder &b, const Package &pkg, const Path &s, const Path &d):
+	InternalAction(b),
 	src(s),
-	dest(d),
-	worker(0)
+	dest(d)
 {
 	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)
-		return 0;
-	
-	if(worker->get_done())
-	{
-		signal_done.emit();
-		worker->join();
-		return worker->get_error()?1:0;
-	}
-	
-	return -1;
-}
 
-Copy::~Copy()
+Copy::Worker::Worker(Copy &c):
+	copy(c)
 {
-	delete worker;
+	launch();
 }
 
 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)
+	mkpath(copy.dest.subpath(0, copy.dest.size()-1), 0755);
+
+	try
 	{
-		int err=errno;
-		cerr<<"Can't unlink "<<copy.dest<<": "<<strerror(err)<<'\n';
-		done=error=true;
-		return;
+		// Remove old file.  Not doing this would cause Bad Stuff when installing libraries.
+		unlink(copy.dest);
+	}
+	catch(const SystemError &e)
+	{
+		if(e.get_error_code()!=ENOENT)
+		{
+			cerr<<e.what()<<'\n';
+			done=error=true;
+			return;
+		}
 	}
 
 	ifstream in(copy.src.str().c_str());
@@ -70,6 +71,7 @@ void Copy::Worker::main()
 		return;
 	}
 
+	// Actual transfer loop
 	char buf[16384];
 	while(!in.eof())
 	{
@@ -77,8 +79,8 @@ void Copy::Worker::main()
 		out.write(buf, in.gcount());
 	}
 
-	struct stat st;
-	Path::stat(copy.src, st);
+	// Preserve file permissions
+	struct stat st=stat(copy.src);
 	chmod(copy.dest.str().c_str(), st.st_mode&0777);
 
 	done=true;