Add class InternalAction for actions that use a thread to do their work

[builder.git] / source / copy.cpp

diff --git a/source/copy.cpp b/source/copy.cpp
index c9cb3112ac25465d81ddf3a098eacbb5e46003ed..eea40fcdae6eda6f63dc30f09988736fa88a7fbc 100644 (file)
--- 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"
@@ -9,30 +17,30 @@ using namespace std;
 using namespace Msp;
 
 Copy::Copy(Builder &b, const Package &pkg, const Path::Path &s, const Path::Path &d):
-       Action(b),
+       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.src.subpath(0, copy.src.size()-1), 0755);
+       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)
        {
                int err=errno;
@@ -57,6 +65,7 @@ void Copy::Worker::main()
                return;
        }
 
+       // Actual transfer loop
        char buf[16384];
        while(!in.eof())
        {
@@ -64,6 +73,7 @@ void Copy::Worker::main()
                out.write(buf, in.gcount());
        }
 
+       // Preserve file permissions
        struct stat st;
        Path::stat(copy.src, st);
        chmod(copy.dest.str().c_str(), st.st_mode&0777);