X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcopy.cpp;h=8ea7f3537ab32d8e84aa2a3dd2731cf32ed1df1f;hb=0c83b922e56976a30506d9f8d43c9dcd38d573b5;hp=010d54113d74a859e9eb6e8416ca0e11e501790b;hpb=5006279d7b92e578ecfa8a04186f675c6b9f1eea;p=builder.git

diff --git a/source/copy.cpp b/source/copy.cpp
index 010d541..8ea7f35 100644
--- 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>
@@ -18,17 +12,18 @@ Distributed under the LGPL
 using namespace std;
 using namespace Msp;
 
-Copy::Copy(Builder &b, const Package &pkg, const FS::Path &s, const FS::Path &d):
+Copy::Copy(Builder &b, const Package &pkg, const FS::Path &s, const FS::Path &d, const FS::Path &l):
 	InternalAction(b),
 	src(s),
-	dest(d)
+	dest(d),
+	link(l)
 {
-	announce(pkg.get_name(), "COPY", dest[-1]);
+	announce(pkg.get_name(), "COPY", dest.str());
 	if(builder.get_verbose()>=2)
 		IO::print("%s -> %s\n", s, d);
 
 	if(!builder.get_dry_run())
-		worker=new Worker(*this);
+		worker = new Worker(*this);
 }
 
 
@@ -49,10 +44,10 @@ 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;
+			done = error = true;
 			return;
 		}
 	}
@@ -66,20 +61,27 @@ 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)
 	{
 		IO::print(IO::cerr, "%s\n", e.what());
-		done=error=true;
+		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);
+
+	if(!copy.link.empty())
+	{
+		FS::Path relpath = FS::relative(copy.dest, FS::dirname(copy.link));
+		symlink(relpath.str().c_str(), copy.link.str().c_str());
+	}
 
-	done=true;
+	done = true;
 }