cmdlineparser: terminate with error message if --append=<filename> fails

stweil · stweil · commit d11f18b5df0d · 2011-11-15T19:27:36.000+01:00
Signed-off-by: Stefan Weil &lt;sw@weilnetz.de&gt;
diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
@@ -267,8 +267,13 @@ bool CmdLineParser::ParseFromArgs(int argc, const char* const argv[])
             _settings->_errorsOnly = true;
 
         // Append userdefined code to checked source code
-        else if (strncmp(argv[i], "--append=", 9) == 0)
-            _settings->append(9 + argv[i]);
+        else if (strncmp(argv[i], "--append=", 9) == 0) {
+            const std::string filename = 9 + argv[i];
+            if (!_settings->append(filename)) {
+                PrintMessage("cppcheck: Couldn't open the file: \"" + filename + "\".");
+                return false;
+            }
+        }
 
         else if (strncmp(argv[i], "--enable=", 9) == 0) {
             const std::string errmsg = _settings->addEnabled(argv[i] + 9);
diff --git a/lib/settings.cpp b/lib/settings.cpp
@@ -118,14 +118,18 @@ bool Settings::isEnabled(const std::string &str) const
 }
 
 
-void Settings::append(const std::string &filename)
+bool Settings::append(const std::string &filename)
 {
     _append = "\n";
     std::ifstream fin(filename.c_str());
+    if (!fin.is_open()) {
+        return false;
+    }
     std::string line;
     while (std::getline(fin, line)) {
         _append += line + "\n";
     }
+    return true;
 }
 
 std::string Settings::append() const
diff --git a/lib/settings.h b/lib/settings.h
@@ -116,7 +116,7 @@ class Settings {
     std::list<std::string> _includePaths;
 
     /** @brief assign append code (--append) */
-    void append(const std::string &filename);
+    bool append(const std::string &filename);
 
     /** @brief get append code (--append) */
     std::string append() const;

Original file line number	Diff line number	Diff line change
`@@ -118,14 +118,18 @@ bool Settings::isEnabled(const std::string &str) const`
`118`	`118`	`}`
`119`	`119`
`120`	`120`
`121`		`-void Settings::append(const std::string &filename)`
	`121`	`+bool Settings::append(const std::string &filename)`
`122`	`122`	`{`
`123`	`123`	`_append = "\n";`
`124`	`124`	`std::ifstream fin(filename.c_str());`
	`125`	`+ if (!fin.is_open()) {`
	`126`	`+ return false;`
	`127`	`+ }`
`125`	`128`	`std::string line;`
`126`	`129`	`while (std::getline(fin, line)) {`
`127`	`130`	`_append += line + "\n";`
`128`	`131`	`}`
	`132`	`+ return true;`
`129`	`133`	`}`
`130`	`134`
`131`	`135`	`std::string Settings::append() const`