fixed #12811 - added CLI option --filesdir to show the built-in FILESDIR / added TODOs (danmar#7200)

Author: firewave

cli/cmdlineparser.cpp

@@ -422,11 +422,18 @@ CmdLineParser::Result CmdLineParser::parseFromArgs(int argc, const char* const a
             return Result::Exit;
         }
 
+        if (std::strcmp(argv[i], "--filesdir") == 0) {
+#ifdef FILESDIR
+            mLogger.printRaw(FILESDIR); // TODO: should not include newline
+#endif
+            return Result::Exit;
+        }
+
         if (std::strcmp(argv[i], "--version") == 0) {
             if (!loadCppcheckCfg())
                 return Result::Fail;
             const std::string version = getVersion();
-            mLogger.printRaw(version);
+            mLogger.printRaw(version); // TODO: should not include newline
             return Result::Exit;
         }
     }

cli/cppcheckexecutor.cpp

@@ -241,7 +241,7 @@ namespace {
 
         void printRaw(const std::string &message) override
         {
-            std::cout << message << std::endl;
+            std::cout << message << std::endl; // TODO: should not append newline
         }
     };
 

man/cppcheck.1.xml

@@ -123,6 +123,9 @@ man(1), man(7), http://www.tldp.org/HOWTO/Man-Page/
       <arg choice="opt">
         <option>--file-list=&lt;file&gt;</option>
       </arg>
+      <arg choice="opt">
+        <option>--filesdir</option>
+      </arg>
       <arg choice="opt">
         <option>--force</option>
       </arg>
@@ -356,6 +359,14 @@ Example: '-UDEBUG'</para>
           <para>Specify the files to check in a text file. One filename per line. When file is -, the file list will be read from standard input.</para>
         </listitem>
       </varlistentry>
+      <varlistentry>
+        <term>
+          <option>--filesdir</option>
+        </term>
+        <listitem>
+          <para>Print the built-in FILESDIR.</para>
+        </listitem>
+      </varlistentry>
       <varlistentry>
         <term>
           <option>-f</option>

test/testcmdlineparser.cpp

@@ -65,7 +65,7 @@ class TestCmdlineParser : public TestFixture {
 
         void printRaw(const std::string &message) override
         {
-            printInternal(message + '\n');
+            printInternal(message + '\n'); // TODO: should not append newline
         }
 
         std::string str()
@@ -444,6 +444,7 @@ class TestCmdlineParser : public TestFixture {
         TEST_CASE(checkHeaders);
         TEST_CASE(noCheckHeaders);
         TEST_CASE(noCheckHeaders2);
+        TEST_CASE(filesdir);
 
         TEST_CASE(ignorepaths1);
         TEST_CASE(ignorepaths2);
@@ -3012,6 +3013,17 @@ class TestCmdlineParser : public TestFixture {
         ASSERT_EQUALS(false, settings->checkHeaders);
     }
 
+    void filesdir() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--filesdir"};
+        ASSERT_EQUALS_ENUM(CmdLineParser::Result::Exit, parseFromArgs(argv));
+#ifdef FILESDIR
+        ASSERT_EQUALS(std::string(FILESDIR) + '\n', logger->str());
+#else
+        ASSERT_EQUALS("", logger->str());
+#endif
+    }
+
     void ignorepaths1() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "-isrc", "file.cpp"};