Fix an incorrect assumption of target name being the basename of its path

[builder.git] / source / copy.cpp

diff --git a/source/copy.cpp b/source/copy.cpp
index 483b9261d9f87af53be9e085ecc7cb6ef474288d..2c35ef30e1b1f3467421170df7f0f41525ffa318 100644 (file)
--- a/source/copy.cpp
+++ b/source/copy.cpp
@@ -1,16 +1,10 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2009  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <errno.h>
-#include <iostream>
+#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"
@@ -23,12 +17,12 @@ Copy::Copy(Builder &b, const Package &pkg, const FS::Path &s, const FS::Path &d)
        src(s),
        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);
 }
 
 
@@ -42,17 +36,17 @@ void Copy::Worker::main()
 {
        FS::mkpath(FS::dirname(copy.dest), 0755);
 
-       try
+       // Remove old file.  Not doing this would cause Bad Stuff when installing libraries.
+       if(FS::exists(copy.dest))
        {
-               // Remove old file.  Not doing this would cause Bad Stuff when installing libraries.
-               unlink(copy.dest);
-       }
-       catch(const SystemError &e)
-       {
-               if(e.get_error_code()!=ENOENT)
+               try
+               {
+                       unlink(copy.dest);
+               }
+               catch(const exception &e)
                {
-                       cerr<<e.what()<<'\n';
-                       done=error=true;
+                       IO::print(IO::cerr, "%s\n", e.what());
+                       done = error = true;
                        return;
                }
        }
@@ -66,20 +60,21 @@ void Copy::Worker::main()
                char buf[16384];
                while(!in.eof())
                {
-                       unsigned len=in.read(buf, sizeof(buf));
+                       unsigned len = in.read(buf, sizeof(buf));
                        out.write(buf, len);
                }
        }
-       catch(const Exception &e)
+       catch(const exception &e)
        {
-               cerr<<e.what()<<'\n';
-               done=error=true;
+               IO::print(IO::cerr, "%s\n", e.what());
+               done = error = true;
                return;
        }
 
        // Preserve file permissions
-       struct stat st=FS::stat(copy.src);
-       chmod(copy.dest.str().c_str(), st.st_mode&0777);
+       struct stat st;
+       if(stat(copy.src.str().c_str(), &st)==0)
+               chmod(copy.dest.str().c_str(), st.st_mode&0777);
 
-       done=true;
+       done = true;
 }