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

diff --git a/source/copy.cpp b/source/copy.cpp
index cdbbd48..f8c581b 100644
--- a/source/copy.cpp
+++ b/source/copy.cpp
@@ -1,6 +1,16 @@
+/* $Id$
+
+This file is part of builder
+Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Distributed under the LGPL
+*/
+
 #include <errno.h>
 #include <fstream>
-#include <msp/path/utils.h>
+#include <iostream>
+#include <msp/fs/dir.h>
+#include <msp/fs/stat.h>
+#include <msp/fs/utils.h>
 #include "builder.h"
 #include "copy.h"
 #include "package.h"
@@ -8,38 +18,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 FS::Path &s, const FS::Path &d):
+	InternalAction(b),
 	src(s),
-	dest(d),
-	worker(*this)
+	dest(d)
 {
-	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()
+
+Copy::Worker::Worker(Copy &c):
+	copy(c)
 {
-	if(worker.get_done())
-	{
-		signal_done.emit();
-		worker.join();
-		return worker.get_error()?1:0;
-	}
-	return -1;
+	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)
+	FS::mkpath(FS::dirname(copy.dest), 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());
@@ -58,6 +73,7 @@ void Copy::Worker::main()
 		return;
 	}
 
+	// Actual transfer loop
 	char buf[16384];
 	while(!in.eof())
 	{
@@ -65,8 +81,8 @@ void Copy::Worker::main()
 		out.write(buf, in.gcount());
 	}
 
-	struct stat st;
-	Path::stat(copy.src, st);
+	// Preserve file permissions
+	struct stat st=FS::stat(copy.src);
 	chmod(copy.dest.str().c_str(), st.st_mode&0777);
 
 	done=true;