Change the default value of the cpu option to "none" since there's no actual autodete...

[builder.git] / source / copy.cpp

diff --git a/source/copy.cpp b/source/copy.cpp
index 0607b5de5b0d59c0bb3c285f9e0e48fee48eb80c..010d54113d74a859e9eb6e8416ca0e11e501790b 100644 (file)
--- a/source/copy.cpp
+++ b/source/copy.cpp
@@ -1,7 +1,16 @@
+/* $Id$
+
+This file is part of builder
+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"
@@ -9,80 +18,67 @@
 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';
-       
+               IO::print("%s -> %s\n", s, d);
+
        if(!builder.get_dry_run())
                worker=new Worker(*this);
 }
 
-int Copy::check()
-{
-       if(!worker)
-       {
-               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);
-       
-       if(unlink(copy.dest.str().c_str())<0 && errno!=ENOENT)
+       FS::mkpath(FS::dirname(copy.dest), 0755);
+
+       // Remove old file.  Not doing this would cause Bad Stuff when installing libraries.
+       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)
+               // Actual transfer loop
+               char buf[16384];
+               while(!in.eof())
+               {
+                       unsigned len=in.read(buf, sizeof(buf));
+                       out.write(buf, len);
+               }
+       }
+       catch(const Exception &e)
        {
-               cerr<<"Can't open "<<copy.dest<<" for writing\n";
+               IO::print(IO::cerr, "%s\n", e.what());
                done=error=true;
                return;
        }
 
-       char buf[16384];
-       while(!in.eof())
-       {
-               in.read(buf, sizeof(buf));
-               out.write(buf, in.gcount());
-       }
-
-       struct stat st;
-       Path::stat(copy.src, st);
+       // Preserve file permissions
+       struct stat st=FS::stat(copy.src);
        chmod(copy.dest.str().c_str(), st.st_mode&0777);
 
        done=true;