From 291455f435a4319ce3460e2e47d8f036222a3f92 Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Sun, 3 Sep 2006 19:26:53 +0000
Subject: [PATCH] Make Copy generate verbose output and return errors Make
 bootstrap.sh search for libs in ..

---
 Readme.txt      |  8 ++++----
 bootstrap.sh    |  2 +-
 source/copy.cpp | 28 ++++++++++++++++++++++++++--
 source/copy.h   |  2 ++
 4 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/Readme.txt b/Readme.txt
index c0004ad..9579372 100644
--- a/Readme.txt
+++ b/Readme.txt
@@ -21,7 +21,7 @@ MSP libraries: misc core parser path regex++ getopt++
 Others: sigc++-2.0
 
 Since the MSP libraries are also normally built with Builder, the script will
-need to have their sources available.  By default, it will look at ../libs.
-You can change this by setting the LIBPATH evironment variable for the script.
-If everything goes well, you should have a builder-stage1 binary that you can
-use to build a normal version of Builder.
+need to have their sources available.  By default, it will look at the parent
+directory of builder.  You can change this by setting the LIBPATH evironment
+variable for the script.  If everything goes well, you should have a
+builder-stage1 binary that you can use to build a normal version of Builder.
diff --git a/bootstrap.sh b/bootstrap.sh
index 4edf039..93ee706 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -4,7 +4,7 @@ REQUIRED="misc core parser path regex++ getopt++"
 CFLAGS="-Iinclude `pkg-config --cflags sigc++-2.0`"
 LIBS="`pkg-config --libs sigc++-2.0` -lpthread"
 if [ -z "$LIBPATH" ]; then
-	LIBPATH=`pwd`/../libs
+	LIBPATH=`pwd`/..
 fi
 
 mkdir -p include/msp
diff --git a/source/copy.cpp b/source/copy.cpp
index 23cd6f1..c9cb311 100644
--- a/source/copy.cpp
+++ b/source/copy.cpp
@@ -1,5 +1,7 @@
+#include <errno.h>
 #include <fstream>
 #include <msp/path/utils.h>
+#include "builder.h"
 #include "copy.h"
 #include "package.h"
 
@@ -13,6 +15,8 @@ Copy::Copy(Builder &b, const Package &pkg, const Path::Path &s, const Path::Path
 	worker(*this)
 {
 	announce(pkg.get_name(), "INST", dest[-1]);
+	if(builder.get_verbose()>=2)
+		cout<<s<<" -> "<<d<<'\n';
 }
 
 int Copy::check()
@@ -21,7 +25,7 @@ int Copy::check()
 	{
 		signal_done.emit();
 		worker.join();
-		return 0;
+		return worker.get_error()?1:0;
 	}
 	return -1;
 }
@@ -29,9 +33,29 @@ int Copy::check()
 void Copy::Worker::main()
 {
 	Path::mkpath(copy.src.subpath(0, copy.src.size()-1), 0755);
-	unlink(copy.dest.str().c_str());
+	if(unlink(copy.dest.str().c_str())<0 && errno!=ENOENT)
+	{
+		int err=errno;
+		cerr<<"Can't unlink "<<copy.dest<<": "<<strerror(err)<<'\n';
+		done=error=true;
+		return;
+	}
+
 	ifstream in(copy.src.str().c_str());
+	if(!in)
+	{
+		cerr<<"Can't open "<<copy.src<<" for reading\n";
+		done=error=true;
+		return;
+	}
+
 	ofstream out(copy.dest.str().c_str());
+	if(!out)
+	{
+		cerr<<"Can't open "<<copy.dest<<" for writing\n";
+		done=error=true;
+		return;
+	}
 
 	char buf[16384];
 	while(!in.eof())
diff --git a/source/copy.h b/source/copy.h
index a6d5c51..283ef48 100644
--- a/source/copy.h
+++ b/source/copy.h
@@ -18,9 +18,11 @@ private:
 	public:
 		Worker(Copy &i): copy(i), done(false) { launch(); }
 		bool get_done() const { return done; }
+		bool get_error() const { return error; }
 	private:
 		Copy &copy;
 		bool done;
+		bool error;
 
 		void main();
 	};
-- 
2.45.2