From db6f5f55f1f0130bba814c494001cbadb138f53f Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 11 Sep 2015 13:30:25 +0200
Subject: Handle file io failures in parser

---
 build/parser.cxx | 106 +++++++++++++++++++++++++++++++------------------------
 1 file changed, 60 insertions(+), 46 deletions(-)

(limited to 'build/parser.cxx')

diff --git a/build/parser.cxx b/build/parser.cxx
index 227e5b3..8a79ae9 100644
--- a/build/parser.cxx
+++ b/build/parser.cxx
@@ -446,37 +446,44 @@ namespace build
 
       p.normalize ();
 
-      ifstream ifs (p.string ());
+      try
+      {
+        ifstream ifs (p.string ());
 
-      if (!ifs.is_open ())
-        fail (l) << "unable to open " << p;
+        if (!ifs.is_open ())
+          fail (l) << "unable to open " << p;
 
-      ifs.exceptions (ifstream::failbit | ifstream::badbit);
+        ifs.exceptions (ifstream::failbit | ifstream::badbit);
 
-      level5 ([&]{trace (t) << "entering " << p;});
+        level5 ([&]{trace (t) << "entering " << p;});
 
-      enter_buildfile (p);
+        enter_buildfile (p);
 
-      string rw (diag_relative (p)); // Relative to work.
-      const string* op (path_);
-      path_ = &rw;
+        string rw (diag_relative (p)); // Relative to work.
+        const string* op (path_);
+        path_ = &rw;
 
-      lexer l (ifs, rw);
-      lexer* ol (lexer_);
-      lexer_ = &l;
+        lexer l (ifs, rw);
+        lexer* ol (lexer_);
+        lexer_ = &l;
 
-      token t (type::eos, false, 0, 0);
-      type tt;
-      next (t, tt);
-      clause (t, tt);
+        token t (type::eos, false, 0, 0);
+        type tt;
+        next (t, tt);
+        clause (t, tt);
 
-      if (tt != type::eos)
-        fail (t) << "unexpected " << t;
+        if (tt != type::eos)
+          fail (t) << "unexpected " << t;
 
-      level5 ([&]{trace (t) << "leaving " << p;});
+        level5 ([&]{trace (t) << "leaving " << p;});
 
-      lexer_ = ol;
-      path_ = op;
+        lexer_ = ol;
+        path_ = op;
+      }
+      catch (const ifstream::failure&)
+      {
+        fail (l) << "unable to read buildfile " << p;
+      }
     }
 
     if (tt == type::newline)
@@ -575,43 +582,50 @@ namespace build
         continue;
       }
 
-      ifstream ifs (p.string ());
+      try
+      {
+        ifstream ifs (p.string ());
 
-      if (!ifs.is_open ())
-        fail (l) << "unable to open " << p;
+        if (!ifs.is_open ())
+          fail (l) << "unable to open " << p;
 
-      ifs.exceptions (ifstream::failbit | ifstream::badbit);
+        ifs.exceptions (ifstream::failbit | ifstream::badbit);
 
-      level5 ([&]{trace (t) << "entering " << p;});
+        level5 ([&]{trace (t) << "entering " << p;});
 
-      enter_buildfile (p);
+        enter_buildfile (p);
 
-      string rw (diag_relative (p)); // Relative to work.
-      const string* op (path_);
-      path_ = &rw;
+        string rw (diag_relative (p)); // Relative to work.
+        const string* op (path_);
+        path_ = &rw;
 
-      lexer l (ifs, rw);
-      lexer* ol (lexer_);
-      lexer_ = &l;
+        lexer l (ifs, rw);
+        lexer* ol (lexer_);
+        lexer_ = &l;
 
-      target* odt (default_target_);
-      default_target_ = nullptr;
+        target* odt (default_target_);
+        default_target_ = nullptr;
 
-      token t (type::eos, false, 0, 0);
-      type tt;
-      next (t, tt);
-      clause (t, tt);
+        token t (type::eos, false, 0, 0);
+        type tt;
+        next (t, tt);
+        clause (t, tt);
 
-      if (tt != type::eos)
-        fail (t) << "unexpected " << t;
+        if (tt != type::eos)
+          fail (t) << "unexpected " << t;
 
-      process_default_target (t);
+        process_default_target (t);
 
-      level5 ([&]{trace (t) << "leaving " << p;});
+        level5 ([&]{trace (t) << "leaving " << p;});
 
-      default_target_ = odt;
-      lexer_ = ol;
-      path_ = op;
+        default_target_ = odt;
+        lexer_ = ol;
+        path_ = op;
+      }
+      catch (const ifstream::failure&)
+      {
+        fail (l) << "unable to read buildfile " << p;
+      }
 
       scope_ = ocs;
       root_ = ors;
-- 
cgit v1.1