Distributed under the LGPL
*/
+#include <cstdlib>
#include <msp/core/except.h>
#include <msp/io/except.h>
#include <msp/io/file.h>
}
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);
try
{
- IO::File in(fn.str());
+ IO::File inf(fn.str());
+ IO::Buffered in(inf);
mtime=Time::TimeStamp::from_unixtime(stat(fn).st_mtime);
Loader loader(*this);
loader.load(parser);
}
- catch(const SystemError &)
+ catch(const IO::FileNotFound &)
{ }
}