[lmi-commits] [5573] Improve diagnostics

[Greg Chicares]

Revision: 5573
          http://svn.sv.gnu.org/viewvc/?view=rev&root=lmi&revision=5573
Author:   chicares
Date:     2012-10-04 11:30:21 +0000 (Thu, 04 Oct 2012)
Log Message:
-----------
Improve diagnostics

Modified Paths:
--------------
    lmi/trunk/ChangeLog
    lmi/trunk/xml_lmi.cpp

Modified: lmi/trunk/ChangeLog
===================================================================
--- lmi/trunk/ChangeLog 2012-10-04 10:49:31 UTC (rev 5572)
+++ lmi/trunk/ChangeLog 2012-10-04 11:30:21 UTC (rev 5573)
@@ -30764,3 +30764,16 @@
   version.hpp
 Designate release candidate.
 
+20121004T1049Z <address@hidden> [567]
+
+  xml_lmi.cpp
+  xml_lmi.hpp
+Move comments, rephrasing some.
+
+20121004T1130Z <address@hidden> [567]
+
+  xml_lmi.cpp
+Improve diagnostics. A missing file should not be diagnosed as an
+"unknown XML parsing error". Testcase:
+  lmi_cli_shared.exe --accept --file=nonexistent.cns
+

Modified: lmi/trunk/xml_lmi.cpp
===================================================================
--- lmi/trunk/xml_lmi.cpp       2012-10-04 10:49:31 UTC (rev 5572)
+++ lmi/trunk/xml_lmi.cpp       2012-10-04 11:30:21 UTC (rev 5573)
@@ -30,6 +30,7 @@
 
 #include "alert.hpp"
 #include "istream_to_string.hpp"
+#include "platform_dependent.hpp"       // access()
 #include "value_cast.hpp"
 
 #include <xmlwrapp/attributes.h>
@@ -63,6 +64,10 @@
             {
             throw std::runtime_error("File name is empty.");
             }
+        if(0 != access(filename.c_str(), F_OK))
+            {
+            throw std::runtime_error("File does not exist.");
+            }
         parser_.reset(new DomParser(filename.c_str()));
         if(0 == parser_.get())
             {