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 581221a516e04246a7c1e048ccfe4896cc16d584..2c35ef30e1b1f3467421170df7f0f41525ffa318 100644 (file)
--- a/source/copy.cpp
+++ b/source/copy.cpp
@@ -1,11 +1,5 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2009  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <errno.h>
+#include <sys/stat.h>
 #include <msp/fs/dir.h>
 #include <msp/fs/stat.h>
 #include <msp/fs/utils.h>
@@ -49,7 +43,7 @@ void Copy::Worker::main()
                {
                        unlink(copy.dest);
                }
-               catch(const Exception &e)
+               catch(const exception &e)
                {
                        IO::print(IO::cerr, "%s\n", e.what());
                        done = error = true;
@@ -70,7 +64,7 @@ void Copy::Worker::main()
                        out.write(buf, len);
                }
        }
-       catch(const Exception &e)
+       catch(const exception &e)
        {
                IO::print(IO::cerr, "%s\n", e.what());
                done = error = true;
@@ -78,8 +72,9 @@ void Copy::Worker::main()
        }
 
        // 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;
 }