X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fconfig.cpp;h=4cc9149efe6deb4f672e29e0cfc5ed9e01f4a525;hb=bdc8b6638b486aa668b4a9c6c5cce5f6b5f18222;hp=816ee1abb0ea26140625d9ec13dacc518dc4987a;hpb=54aab19ee471810a956e1fee4d3b962aaf9ae9b3;p=builder.git

diff --git a/source/config.cpp b/source/config.cpp
index 816ee1a..4cc9149 100644
--- a/source/config.cpp
+++ b/source/config.cpp
@@ -5,6 +5,7 @@ Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
+#include <cstdlib>
 #include <msp/core/except.h>
 #include <msp/io/except.h>
 #include <msp/io/file.h>
@@ -150,15 +151,17 @@ void Config::finish()
 				}
 				else
 				{
-					for(end=dollar+1; (isalnum(opt.value[end]) && opt.value[end]!='_'); ++end);
+					for(end=dollar+1; (isalnum(opt.value[end]) && opt.value[end]!='_'); ++end) ;
 					var=opt.value.substr(dollar+1, end-dollar-1);
 				}
 
 				string value;
 				if(is_option(var))
 					value=get_option(var).value;
-				else
-					value=getenv(var.c_str());
+				else if(var=="arch")
+					value=package.get_builder().get_current_arch().get_name();
+				else if(const char *ptr=getenv(var.c_str()))
+					value=ptr;
 
 				opt.value.replace(dollar, end-dollar, value);
 
@@ -211,7 +214,8 @@ void Config::load()
 
 	try
 	{
-		IO::File in(fn.str());
+		IO::File inf(fn.str());
+		IO::Buffered in(inf);
 
 		mtime=Time::TimeStamp::from_unixtime(stat(fn).st_mtime);
 
@@ -219,7 +223,7 @@ void Config::load()
 		Loader loader(*this);
 		loader.load(parser);
 	}
-	catch(const SystemError &)
+	catch(const IO::FileNotFound &)
 	{ }
 }