Reorder class members

[builder.git] / source / dependencycache.cpp

diff --git a/source/dependencycache.cpp b/source/dependencycache.cpp
index 978a0e37b8ccb3bb96d7a56d43f0b9248fb3dbd2..08d8af7538630f69cf1873672eed289b3a9d8d8e 100644 (file)
--- a/source/dependencycache.cpp
+++ b/source/dependencycache.cpp
@@ -1,12 +1,14 @@
 /* $Id$
 
 This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Copyright © 2007-2009  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
-#include <fstream>
 #include <msp/fs/stat.h>
+#include <msp/io/except.h>
+#include <msp/io/file.h>
+#include <msp/io/print.h>
 #include <msp/strings/utils.h>
 #include "builder.h"
 #include "dependencycache.h"
@@ -20,6 +22,12 @@ DependencyCache::DependencyCache(SourcePackage &p):
        changed(false)
 { }
 
+void DependencyCache::set_deps(const string &tgt, const StringList &d)
+{
+       deps[tgt]=d;
+       changed=true;
+}
+
 const StringList &DependencyCache::get_deps(const string &tgt) const
 {
        DepsMap::const_iterator i=deps.find(tgt);
@@ -29,47 +37,39 @@ const StringList &DependencyCache::get_deps(const string &tgt) const
        return i->second;
 }
 
-void DependencyCache::set_deps(const string &tgt, const StringList &d)
-{
-       deps[tgt]=d;
-       changed=true;
-}
-
-/**
-Saves the depencency cache.  If there are no cached dependencies or they
-haven't been changed, does nothing.
-*/
 void DependencyCache::save() const
 {
        if(deps.empty() || !changed || package.get_builder().get_dry_run())
                return;
 
-       ofstream out((package.get_source()/".deps").str().c_str());
-       if(!out)
-               return;
+       IO::BufferedFile out((package.get_source()/".deps").str(), IO::M_WRITE);
 
        for(DepsMap::const_iterator i=deps.begin(); i!=deps.end(); ++i)
        {
-               out<<i->first;
+               IO::print(out, i->first);
                for(StringList::const_iterator j=i->second.begin(); j!=i->second.end(); ++j)
-                       out<<'|'<<*j;
-               out<<'\n';
+                       IO::print(out, "|%s", *j);
+               IO::print(out, "\n");
        }
 }
 
 void DependencyCache::load()
 {
        string fn=(package.get_source()/".deps").str();
-       ifstream in(fn.c_str());
-       if(!in)
-               return;
 
-       string line;
-       while(getline(in, line))
+       try
        {
-               vector<string> parts=split(line, '|');
-               deps[parts[0]]=StringList(parts.begin()+1, parts.end());
-       }
+               IO::BufferedFile in(fn);
 
-       mtime=Time::TimeStamp::from_unixtime(FS::stat(fn).st_mtime);
+               string line;
+               while(in.getline(line))
+               {
+                       vector<string> parts=split(line, '|');
+                       deps[parts[0]]=StringList(parts.begin()+1, parts.end());
+               }
+
+               mtime=Time::TimeStamp::from_unixtime(FS::stat(fn).st_mtime);
+       }
+       catch(const IO::FileNotFound &)
+       { }
 }