Converted from iostreams to mspio

diff --git a/source/builder.cpp b/source/builder.cpp
index caf7fe54eb10bf4a618c750f0235fc61936ed425..21e7dcdf629c4a97780059c5d1615cb12dca60b2 100644 (file)
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -5,12 +5,13 @@ Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
-#include <fstream>
 #include <iostream>
 #include <set>
 #include <msp/core/except.h>
 #include <msp/core/getopt.h>
 #include <msp/datafile/parser.h>
+#include <msp/io/buffered.h>
+#include <msp/io/file.h>
 #include <msp/path/utils.h>
 #include <msp/strings/formatter.h>
 #include <msp/strings/regex.h>
@@ -472,9 +473,8 @@ Loads the given build file.
 */
 int Builder::load_build_file(const Path &fn)
 {
-       ifstream in(fn.str().c_str());
-       if(!in)
-               return -1;
+       IO::File inf(fn.str());
+       IO::Buffered in(inf);
 
        if(verbose>=3)
                cout<<"Reading "<<fn<<'\n';

diff --git a/source/config.cpp b/source/config.cpp
index 2e3741e2a2a5120ab1d8e3bddfe573e2fc3ce21a..c8e9aaa7e57623a9506c3e248c8e11a21d73b810 100644 (file)
--- a/source/config.cpp
+++ b/source/config.cpp
@@ -5,8 +5,9 @@ Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
-#include <fstream>
 #include <msp/core/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"
@@ -60,13 +61,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 SystemError &)
+       { }
 
        freeze_mtime=true;
        package.get_builder().apply_profile_template(*this, get_option("profile").value);
@@ -85,9 +88,13 @@ 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';
+               try
+               {
+                       IO::File out((package.get_source()/".profile.cache").str().c_str());
+                       IO::print(out, "%s\n", profile);
+               }
+               catch(const SystemError &)
+               { }
        }
 
        freeze_mtime=true;
@@ -177,11 +184,15 @@ void Config::save() const
        if(i!=options.end())
                fn=package.get_source()/(".options."+i->second.value+".cache");
 
-       ofstream out(fn.str().c_str());
-       if(!out) return;
+       try
+       {
+               IO::File out(fn.str());
 
-       for(i=options.begin(); i!=options.end(); ++i)
-               out<<"option \""<<i->second.name<<"\" \""<<i->second.value<<"\";\n";
+               for(i=options.begin(); i!=options.end(); ++i)
+                       IO::print(out, "option \"%s\" \"%s\";\n", i->second.name, i->second.value);
+       }
+       catch(const SystemError &)
+       { }
 }
 
 bool Config::set_option(const string &opt, const string &val)
@@ -207,14 +218,18 @@ void Config::load()
        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 in(fn.str());
 
-       mtime=Time::TimeStamp::from_unixtime(stat(fn).st_mtime);
+               mtime=Time::TimeStamp::from_unixtime(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 SystemError &)
+       { }
 }
 
 

diff --git a/source/tar.cpp b/source/tar.cpp
index da579250a15654b978cda94eef621af1afbe319e..0b61b39b85cd4567b8eaf139ee29fb89958d2a53 100644 (file)
--- a/source/tar.cpp
+++ b/source/tar.cpp
@@ -6,6 +6,7 @@ Distributed under the LGPL
 */
 
 #include <iostream>
+#include <msp/io/file.h>
 #include <msp/path/utils.h>
 #include "builder.h"
 #include "sourcepackage.h"
@@ -40,7 +41,7 @@ void Tar::Worker::main()
        const Path &pkg_src=tar.tarball.get_package()->get_source();
        Path basedir=splitext(basename(tar.tarball.get_name())).base;
 
-       ofstream out(tar.tarball.get_name().c_str());
+       IO::File out(tar.tarball.get_name(), IO::M_WRITE);
        const TargetList &deps=tar.tarball.get_depends();
        for(TargetList::const_iterator i=deps.begin(); i!=deps.end(); ++i)
        {
@@ -73,11 +74,10 @@ void Tar::Worker::main()
                buf[155]=0;
 
                out.write(buf, 512);
-               ifstream in((*i)->get_name().c_str());
+               IO::File in((*i)->get_name());
                for(int j=0; j<st.st_size; j+=4096)
                {
-                       in.read(buf, 4096);
-                       unsigned len=in.gcount();
+                       unsigned len=in.read(buf, 4096);
                        len+=((~len)+1)&0777;
                        out.write(buf, len);
                }