handle quoted arguments with spaces

Author: ludviggunne

.github/workflows/selfcheck.yml

@@ -121,7 +121,7 @@ jobs:
 
       - name: Self check (unusedFunction / no test / no gui)
         run: |
-          supprs="--suppress=unusedFunction:lib/errorlogger.h:193 --suppress=unusedFunction:lib/importproject.cpp:1518 --suppress=unusedFunction:lib/importproject.cpp:1542"
+          supprs="--suppress=unusedFunction:lib/errorlogger.h:193 --suppress=unusedFunction:lib/importproject.cpp:1516 --suppress=unusedFunction:lib/importproject.cpp:1540"
           ./cppcheck -q --template=selfcheck --error-exitcode=1 --library=cppcheck-lib -D__CPPCHECK__ -D__GNUC__ --enable=unusedFunction,information --exception-handling -rp=. --project=cmake.output.notest_nogui/compile_commands.json --suppressions-list=.selfcheck_unused_suppressions --inline-suppr $supprs
         env:
           DISABLE_VALUEFLOW: 1

lib/importproject.cpp

@@ -210,11 +210,10 @@ ImportProject::Type ImportProject::import(const std::string &filename, Settings
     return ImportProject::Type::FAILURE;
 }
 
-static std::string readUntil(const std::string &command, std::string::size_type *pos, const char until[])
+static std::string readUntil(const std::string &command, std::string::size_type *pos, const char until[], bool str = false)
 {
     std::string ret;
     bool escapedString = false;
-    bool str = false;
     bool escape = false;
     for (; *pos < command.size() && (str || !std::strchr(until, command[*pos])); (*pos)++) {
         if (escape)
@@ -280,13 +279,12 @@ void ImportProject::fsParseCommand(FileSettings& fs, const std::string& command,
             break;
         const char F = command[pos++];
         if (std::strchr("DUI", F)) {
-            while (pos < command.size() && command[pos] == ' ') {
+            while (pos < command.size() && command[pos] == ' ')
                 ++pos;
-                wholeArgQuoted = false;
-            }
         }
-        const char *readUntilChars = wholeArgQuoted ? " =\"" : " =";
-        std::string fval = readUntil(command, &pos, readUntilChars);
+        std::string fval = readUntil(command, &pos, " =", wholeArgQuoted);
+        if (wholeArgQuoted && fval.back() == '\"')
+            fval = fval.substr(0, fval.size() - 1);
         if (F=='D') {
             std::string defval = readUntil(command, &pos, " ");
             defs += fval;