X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcopy.cpp;h=2c35ef30e1b1f3467421170df7f0f41525ffa318;hb=43bd25ffcb0b4f7882773f4676b209a99cb73c04;hp=c9cb3112ac25465d81ddf3a098eacbb5e46003ed;hpb=291455f435a4319ce3460e2e47d8f036222a3f92;p=builder.git

diff --git a/source/copy.cpp b/source/copy.cpp
index c9cb311..2c35ef3 100644
--- a/source/copy.cpp
+++ b/source/copy.cpp
@@ -1,6 +1,10 @@
 #include <errno.h>
-#include <fstream>
-#include <msp/path/utils.h>
+#include <sys/stat.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"
@@ -8,65 +12,69 @@
 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.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);
 }
 
-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.src.subpath(0, copy.src.size()-1), 0755);
-	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;
-	}
+	FS::mkpath(FS::dirname(copy.dest), 0755);
 
-	ifstream in(copy.src.str().c_str());
-	if(!in)
+	// Remove old file.  Not doing this would cause Bad Stuff when installing libraries.
+	if(FS::exists(copy.dest))
 	{
-		cerr<<"Can't open "<<copy.src<<" for reading\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;
+		}
 	}
 
-	ofstream out(copy.dest.str().c_str());
-	if(!out)
+	try
 	{
-		cerr<<"Can't open "<<copy.dest<<" for writing\n";
-		done=error=true;
-		return;
-	}
+		IO::File in(copy.src.str());
+		IO::File out(copy.dest.str(), IO::M_WRITE);
 
-	char buf[16384];
-	while(!in.eof())
+		// Actual transfer loop
+		char buf[16384];
+		while(!in.eof())
+		{
+			unsigned len = in.read(buf, sizeof(buf));
+			out.write(buf, len);
+		}
+	}
+	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);
-	chmod(copy.dest.str().c_str(), st.st_mode&0777);
+	if(stat(copy.src.str().c_str(), &st)==0)
+		chmod(copy.dest.str().c_str(), st.st_mode&0777);
 
-	done=true;
+	done = true;
 }