cshtml --cwe-names: default to /usr/share/csdiff/cwe-names.csv

... only if the file is actually installed on the system

Author: kdudka

src/CMakeLists.txt

@@ -42,18 +42,23 @@ add_library(cs STATIC
 )
 
 # link cslib.a and boost libraries
-find_library(BOOST_REGEX                boost_regex                 REQUIRED)
+find_library(BOOST_FILESYSTEM           boost_filesystem            REQUIRED)
 find_library(BOOST_PROGRAM_OPTIONS      boost_program_options       REQUIRED)
+find_library(BOOST_REGEX                boost_regex                 REQUIRED)
+find_library(BOOST_SYSTEM               boost_system                REQUIRED)
 link_libraries(cs
-    boost_regex
-    boost_program_options)
+    boost_program_options
+    boost_regex)
 
 # the list of executables
 add_executable(csdiff       csdiff.cc)
 add_executable(csgrep       csgrep.cc)
 add_executable(cshtml       cshtml.cc)
 add_executable(cslinker     cslinker.cc)
 add_executable(cssort       cssort.cc)
+target_link_libraries(cshtml
+    boost_filesystem
+    boost_system)
 
 # experimental
 add_executable(cstrans-df-run cstrans-df-run.cc)

src/cshtml.cc

@@ -25,12 +25,12 @@
 #include "regex.hh"
 #include "version.hh"
 
+#include <boost/filesystem.hpp>
 #include <boost/program_options.hpp>
 
 #ifndef DEFAULT_CWE_NAMES_FILE
 #   define DEFAULT_CWE_NAMES_FILE "/usr/share/csdiff/cwe-names.csv"
 #endif
-static const char fnCweNamesDefault[] = DEFAULT_CWE_NAMES_FILE;
 
 std::string titleFromFileName(const std::string &fileName)
 {
@@ -56,6 +56,11 @@ int main(int argc, char *argv[])
     using std::string;
     const char *name = argv[0];
 
+    std::string fnCweNamesDefault = DEFAULT_CWE_NAMES_FILE;
+    if (!boost::filesystem::exists(fnCweNamesDefault))
+        // if the default file is not installed, do not use it as default
+        fnCweNamesDefault.clear();
+
     namespace po = boost::program_options;
     po::variables_map vm;
     po::options_description desc(string("Usage: ") + name