X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcopy.cpp;h=f8c581bd5664ca123f4f657da77883c7dff1003b;hb=a2adbd9c0a8d7a7567848c4c6bdbf0de6ba32bb1;hp=70f05398fbac5ae5dc885d7c91c8c33eb95da4ae;hpb=7aeaa4ba965f596edad438c02e345a8843f7469a;p=builder.git

diff --git a/source/copy.cpp b/source/copy.cpp
index 70f0539..f8c581b 100644
--- a/source/copy.cpp
+++ b/source/copy.cpp
@@ -8,7 +8,9 @@ Distributed under the LGPL
 #include <errno.h>
 #include <fstream>
 #include <iostream>
-#include <msp/path/utils.h>
+#include <msp/fs/dir.h>
+#include <msp/fs/stat.h>
+#include <msp/fs/utils.h>
 #include "builder.h"
 #include "copy.h"
 #include "package.h"
@@ -16,54 +18,43 @@ Distributed under the LGPL
 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(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)  // True for dry run
-	{
-		signal_done.emit();
-		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);
-	
-	// Remove old file.  Not doing this would cause Bad Stuff when installing libraries.
-	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());
@@ -91,8 +82,7 @@ void Copy::Worker::main()
 	}
 
 	// Preserve file permissions
-	struct stat st;
-	Path::stat(copy.src, st);
+	struct stat st=FS::stat(copy.src);
 	chmod(copy.dest.str().c_str(), st.st_mode&0777);
 
 	done=true;