Migrate from msppath to mspfs

[builder.git] / source / config.cpp

diff --git a/source/config.cpp b/source/config.cpp
index 2e3741e2a2a5120ab1d8e3bddfe573e2fc3ce21a..fbb36ac3d5cc32b1e3bec7fb63b917cc3879ab03 100644 (file)
--- a/source/config.cpp
+++ b/source/config.cpp
@@ -5,9 +5,13 @@ Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
-#include <fstream>
+#include <cstdlib>
 #include <msp/core/except.h>
-#include <msp/path/utils.h>
+#include <msp/fs/stat.h>
+#include <msp/fs/utils.h>
+#include <msp/io/except.h>
+#include <msp/io/file.h>
+#include <msp/io/print.h>
 #include <msp/time/utils.h>
 #include "builder.h"
 #include "config.h"
@@ -60,13 +64,15 @@ default profile is assumed.
 */
 void Config::select_last_profile()
 {
-       ifstream in((package.get_source()/".profile.cache").str().c_str());
-       if(in)
+       try
        {
+               IO::File in((package.get_source()/".profile.cache").str());
                string profile;
-               getline(in, profile);
+               in.getline(profile);
                set_option("profile", profile);
        }
+       catch(const IO::FileNotFound &)
+       { }
 
        freeze_mtime=true;
        package.get_builder().apply_profile_template(*this, get_option("profile").value);
@@ -85,9 +91,8 @@ void Config::select_profile(const string &profile)
 
        if(!package.get_builder().get_dry_run())
        {
-               ofstream out((package.get_source()/".profile.cache").str().c_str());
-               if(out)
-                       out<<profile<<'\n';
+               IO::File out((package.get_source()/".profile.cache").str(), IO::M_WRITE);
+               IO::print(out, "%s\n", profile);
        }
 
        freeze_mtime=true;
@@ -147,15 +152,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);
 
@@ -171,17 +178,16 @@ void Config::finish()
 
 void Config::save() const
 {
-       Path fn=package.get_source()/".options.cache";
+       FS::Path fn=package.get_source()/".options.cache";
 
        OptionMap::const_iterator i=options.find("profile");
        if(i!=options.end())
                fn=package.get_source()/(".options."+i->second.value+".cache");
 
-       ofstream out(fn.str().c_str());
-       if(!out) return;
+       IO::File out(fn.str(), IO::M_WRITE);
 
        for(i=options.begin(); i!=options.end(); ++i)
-               out<<"option \""<<i->second.name<<"\" \""<<i->second.value<<"\";\n";
+               IO::print(out, "option \"%s\" \"%s\";\n", i->second.name, i->second.value);
 }
 
 bool Config::set_option(const string &opt, const string &val)
@@ -201,20 +207,25 @@ bool Config::set_option(const string &opt, const string &val)
 
 void Config::load()
 {
-       Path fn=package.get_source()/".options.cache";
+       FS::Path fn=package.get_source()/".options.cache";
 
        OptionMap::iterator i=options.find("profile");
        if(i!=options.end())
                fn=package.get_source()/(".options."+i->second.value+".cache");
 
-       ifstream in(fn.str().c_str());
-       if(!in) return;
+       try
+       {
+               IO::File inf(fn.str());
+               IO::Buffered in(inf);
 
-       mtime=Time::TimeStamp::from_unixtime(stat(fn).st_mtime);
+               mtime=Time::TimeStamp::from_unixtime(FS::stat(fn).st_mtime);
 
-       DataFile::Parser parser(in, fn.str());
-       Loader loader(*this);
-       loader.load(parser);
+               DataFile::Parser parser(in, fn.str());
+               Loader loader(*this);
+               loader.load(parser);
+       }
+       catch(const IO::FileNotFound &)
+       { }
 }