Miscellaneous minor code cleanups

[builder.git] / source / config.cpp

diff --git a/source/config.cpp b/source/config.cpp
index 753a4ef65b0577dca6bf0301290898461cd188de..4c06c836d40936b19fc2b3e81b9e66c228573c4b 100644 (file)
--- a/source/config.cpp
+++ b/source/config.cpp
@@ -1,15 +1,17 @@
 /* $Id$
 
 This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Copyright © 2006-2009  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
+#include <cstdlib>
 #include <msp/core/except.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/path/utils.h>
 #include <msp/time/utils.h>
 #include "builder.h"
 #include "config.h"
@@ -23,48 +25,30 @@ Config::Config(SourcePackage &p):
        freeze_mtime(false)
 { }
 
-/**
-Adds a configuration option.
-
-@param   n  Option name
-@param   v  Default value
-@param   d  Description
-*/
 void Config::add_option(const string &n, const string &v, const string &d)
 {
        options.insert(OptionMap::value_type(n, Option(n, v, d)));
 }
 
-/**
-Gets the given option from the configuration.  If the option doesn't exist,
-an Exception is thrown.
-*/
 const Config::Option &Config::get_option(const string &name) const
 {
        OptionMap::const_iterator i=options.find(name);
        if(i==options.end())
-               throw Exception("Tried to access nonexistent option "+name);
+               throw KeyError("Unknown option", name);
 
        return i->second;
 }
 
-/**
-Checks whether an option with the given name exists.
-*/
 bool Config::is_option(const string &name) const
 {
        return options.count(name);
 }
 
-/**
-Selects the last profile used.  If the profile cache file is not present, the
-default profile is assumed.
-*/
 void Config::select_last_profile()
 {
        try
        {
-               IO::File in((package.get_source()/".profile.cache").str());
+               IO::BufferedFile in((package.get_source()/".profile").str());
                string profile;
                in.getline(profile);
                set_option("profile", profile);
@@ -79,17 +63,13 @@ void Config::select_last_profile()
        load();
 }
 
-/**
-Selects the given profile.  The profile cache file is updated as well, unless
---dry-run was given.
-*/
 void Config::select_profile(const string &profile)
 {
        set_option("profile", profile);
 
        if(!package.get_builder().get_dry_run())
        {
-               IO::File out((package.get_source()/".profile.cache").str(), IO::M_WRITE);
+               IO::BufferedFile out((package.get_source()/".profile").str(), IO::M_WRITE);
                IO::print(out, "%s\n", profile);
        }
 
@@ -100,15 +80,6 @@ void Config::select_profile(const string &profile)
        load();
 }
 
-/**
-Processes options from the given raw option map.  Nonexistent options are
-ignored.  If any options were changed, the mtime of the configuration is updated
-to the current time.
-
-@param   opts  A map to process options from
-
-@return  Whether any option values were changed
-*/
 bool Config::update(const StringMap &opts)
 {
        bool changed=false;
@@ -124,9 +95,6 @@ bool Config::update(const StringMap &opts)
        return changed;
 }
 
-/**
-Expands any variable references in options.
-*/
 void Config::finish()
 {
        for(unsigned n=0; n<20; ++n)
@@ -150,7 +118,7 @@ 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);
                                }
 
@@ -176,13 +144,13 @@ void Config::finish()
 
 void Config::save() const
 {
-       Path fn=package.get_source()/".options.cache";
+       FS::Path fn=package.get_source()/".options";
 
        OptionMap::const_iterator i=options.find("profile");
        if(i!=options.end())
-               fn=package.get_source()/(".options."+i->second.value+".cache");
+               fn=package.get_source()/(".options."+i->second.value);
 
-       IO::File out(fn.str(), IO::M_WRITE);
+       IO::BufferedFile out(fn.str(), IO::M_WRITE);
 
        for(i=options.begin(); i!=options.end(); ++i)
                IO::print(out, "option \"%s\" \"%s\";\n", i->second.name, i->second.value);
@@ -205,18 +173,13 @@ bool Config::set_option(const string &opt, const string &val)
 
 void Config::load()
 {
-       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");
+       FS::Path fn=package.get_source()/(".options."+get_option("profile").value);
 
        try
        {
-               IO::File inf(fn.str());
-               IO::Buffered in(inf);
+               IO::BufferedFile in(fn.str());
 
-               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);