split list of libraries early in CLI

Author: firewave

cli/cmdlineparser.cpp

@@ -870,7 +870,11 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
 
             // --library
             else if (std::strncmp(argv[i], "--library=", 10) == 0) {
-                mSettings.libraries.emplace_back(argv[i] + 10);
+                // TODO: bail out on empty library
+                std::list<std::string> libs = splitString(argv[i] + 10, ',');
+                for (auto& l : libs) {
+                    mSettings.libraries.emplace_back(std::move(l));
+                }
             }
 
             // Set maximum number of #ifdef configurations to check

lib/library.cpp

@@ -66,24 +66,8 @@ static void gettokenlistfromvalid(const std::string& valid, bool cpp, TokenList&
 
 Library::Error Library::load(const char exename[], const char path[], bool debug)
 {
-    // TODO: extract split into helper function
-    // TODO: remove handling of multiple libraries at once?
     if (std::strchr(path,',') != nullptr) {
-        if (debug)
-            std::cout << "handling multiple libraries '" + std::string(path) + "'" << std::endl;
-        std::string p(path);
-        for (;;) {
-            const std::string::size_type pos = p.find(',');
-            if (pos == std::string::npos)
-                break;
-            const Error &e = load(exename, p.substr(0,pos).c_str(), debug);
-            if (e.errorcode != ErrorCode::OK)
-                return e;
-            p = p.substr(pos+1);
-        }
-        if (!p.empty())
-            return load(exename, p.c_str(), debug);
-        return Error();
+        throw std::runtime_error("handling of multiple libraries not supported");
     }
 
     const bool is_abs_path = Path::isAbsolute(path);

test/cli/other_test.py

@@ -1742,7 +1742,6 @@ def test_lib_lookup_multi(tmpdir):
     assert exitcode == 0, stdout
     lines = __remove_std_lookup_log(stdout.splitlines(), exepath)
     assert lines == [
-        "handling multiple libraries 'posix,gnu'",
         "looking for library 'posix'",
         "looking for library 'posix.cfg'",
         "looking for library '{}/posix.cfg'".format(exepath),

test/testcmdlineparser.cpp

@@ -2454,28 +2454,24 @@ class TestCmdlineParser : public TestFixture {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--library=posix,gnu", "file.cpp"};
         ASSERT_EQUALS_ENUM(CmdLineParser::Result::Success, parser->parseFromArgs(3, argv));
-        TODO_ASSERT_EQUALS(2, 1, settings->libraries.size());
-        ASSERT_EQUALS("posix,gnu", *settings->libraries.cbegin());
-        /*
         ASSERT_EQUALS(2, settings->libraries.size());
         auto it = settings->libraries.cbegin();
         ASSERT_EQUALS("posix", *it++);
         ASSERT_EQUALS("gnu", *it);
-        */
     }
 
     void libraryMultipleEmpty() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--library=posix,,gnu", "file.cpp"};
         ASSERT_EQUALS(false, parser->fillSettingsFromArgs(3, argv));
-        ASSERT_EQUALS("cppcheck: Failed to load library configuration file 'posix,,gnu'. File not found\n", logger->str());
+        ASSERT_EQUALS("cppcheck: Failed to load library configuration file ''. File not found\n", logger->str());
     }
 
     void libraryMultipleEmpty2() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--library=posix,gnu,", "file.cpp"};
         ASSERT_EQUALS(false, parser->fillSettingsFromArgs(3, argv));
-        TODO_ASSERT_EQUALS("cppcheck: Failed to load library configuration file 'posix,gnu,'. File not found\n", "cppcheck: error: could not find or open any of the paths given.\n", logger->str());
+        ASSERT_EQUALS("cppcheck: Failed to load library configuration file ''. File not found\n", logger->str());
     }
 
     void suppressXml() {