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

diff --git a/source/copy.cpp b/source/copy.cpp
index 70f0539..581221a 100644
--- a/source/copy.cpp
+++ b/source/copy.cpp
@@ -1,14 +1,16 @@
 /* $Id$
 
 This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Copyright © 2006-2009  Mikko Rasa, Mikkosoft Productions
 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 <msp/io/file.h>
+#include <msp/io/print.h>
 #include "builder.h"
 #include "copy.h"
 #include "package.h"
@@ -16,84 +18,68 @@ 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]);
+	announce(pkg.get_name(), "COPY", dest.str());
 	if(builder.get_verbose()>=2)
-		cout<<s<<" -> "<<d<<'\n';
-	
+		IO::print("%s -> %s\n", s, d);
+
 	if(!builder.get_dry_run())
-		worker=new Worker(*this);
+		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);
-	
+	FS::mkpath(FS::dirname(copy.dest), 0755);
+
 	// Remove old file.  Not doing this would cause Bad Stuff when installing libraries.
-	if(unlink(copy.dest.str().c_str())<0 && errno!=ENOENT)
+	if(FS::exists(copy.dest))
 	{
-		int err=errno;
-		cerr<<"Can't unlink "<<copy.dest<<": "<<strerror(err)<<'\n';
-		done=error=true;
-		return;
+		try
+		{
+			unlink(copy.dest);
+		}
+		catch(const Exception &e)
+		{
+			IO::print(IO::cerr, "%s\n", e.what());
+			done = error = true;
+			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(copy.src.str());
+		IO::File out(copy.dest.str(), IO::M_WRITE);
 
-	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())
+		{
+			unsigned len = in.read(buf, sizeof(buf));
+			out.write(buf, len);
+		}
 	}
-
-	// Actual transfer loop
-	char buf[16384];
-	while(!in.eof())
+	catch(const Exception &e)
 	{
-		in.read(buf, sizeof(buf));
-		out.write(buf, in.gcount());
+		IO::print(IO::cerr, "%s\n", e.what());
+		done = error = true;
+		return;
 	}
 
 	// 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;
+	done = true;
 }