Make Copy generate verbose output and return errors

[builder.git] / source / copy.cpp

diff --git a/source/copy.cpp b/source/copy.cpp
index 23cd6f1af358cebb11e9e526a7ede7ef1af4ef0b..c9cb3112ac25465d81ddf3a098eacbb5e46003ed 100644 (file)
--- a/source/copy.cpp
+++ b/source/copy.cpp
@@ -1,5 +1,7 @@
+#include <errno.h>
 #include <fstream>
 #include <msp/path/utils.h>
+#include "builder.h"
 #include "copy.h"
 #include "package.h"
 
@@ -13,6 +15,8 @@ Copy::Copy(Builder &b, const Package &pkg, const Path::Path &s, const Path::Path
        worker(*this)
 {
        announce(pkg.get_name(), "INST", dest[-1]);
+       if(builder.get_verbose()>=2)
+               cout<<s<<" -> "<<d<<'\n';
 }
 
 int Copy::check()
@@ -21,7 +25,7 @@ int Copy::check()
        {
                signal_done.emit();
                worker.join();
-               return 0;
+               return worker.get_error()?1:0;
        }
        return -1;
 }
@@ -29,9 +33,29 @@ int Copy::check()
 void Copy::Worker::main()
 {
        Path::mkpath(copy.src.subpath(0, copy.src.size()-1), 0755);
-       unlink(copy.dest.str().c_str());
+       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;
+       }
+
        ifstream in(copy.src.str().c_str());
+       if(!in)
+       {
+               cerr<<"Can't open "<<copy.src<<" for reading\n";
+               done=error=true;
+               return;
+       }
+
        ofstream out(copy.dest.str().c_str());
+       if(!out)
+       {
+               cerr<<"Can't open "<<copy.dest<<" for writing\n";
+               done=error=true;
+               return;
+       }
 
        char buf[16384];
        while(!in.eof())