X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcopy.cpp;h=581221a516e04246a7c1e048ccfe4896cc16d584;hb=20994a6f4802f2dbcf01888d0e1996edf554ade5;hp=4cb42b707be686f59bd2725f089272f63b4e07d4;hpb=5622fc20f0be8bff0938d24f6f45d3ab384288ca;p=builder.git

diff --git a/source/copy.cpp b/source/copy.cpp
index 4cb42b7..581221a 100644
--- a/source/copy.cpp
+++ b/source/copy.cpp
@@ -23,12 +23,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)
 		IO::print("%s -> %s\n", s, d);
 
 	if(!builder.get_dry_run())
-		worker=new Worker(*this);
+		worker = new Worker(*this);
 }
 
 
@@ -42,17 +42,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.
-		unlink(copy.dest);
-	}
-	catch(const SystemError &e)
+	// Remove old file.  Not doing this would cause Bad Stuff when installing libraries.
+	if(FS::exists(copy.dest))
 	{
-		if(e.get_error_code()!=ENOENT)
+		try
+		{
+			unlink(copy.dest);
+		}
+		catch(const Exception &e)
 		{
 			IO::print(IO::cerr, "%s\n", e.what());
-			done=error=true;
+			done = error = true;
 			return;
 		}
 	}
@@ -66,20 +66,20 @@ 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)
 	{
 		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);
+	struct stat st = FS::stat(copy.src);
 	chmod(copy.dest.str().c_str(), st.st_mode&0777);
 
-	done=true;
+	done = true;
 }