Merge branch 'master' of github.com:doxygen/doxygen

Author: doxygen

.github/dependabot.yml

@@ -3,4 +3,6 @@ updates:
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
-      interval: "weekly"
+      interval: "daily"
+      time: "03:00"
+    open-pull-requests-limit: 3

addon/doxyparse/doxyparse.cpp

@@ -18,7 +18,6 @@
  *
  */
 
-#include <stdlib.h>
 #if !defined(_WIN32) || defined(__CYGWIN__)
   #include <unistd.h>
 #else
@@ -41,6 +40,8 @@
 #include <cstdlib>
 #include <sstream>
 #include <map>
+#include <algorithm>
+#include <filesystem>
 #include "qcstring.h"
 #include "namespacedef.h"
 #include "portable.h"
@@ -114,21 +115,11 @@ static void findXRefSymbols(FileDef *fd)
 }
 
 static bool ignoreStaticExternalCall(const MemberDef *context, const MemberDef *md) {
-  if (md->isStatic()) {
-    if(md->getFileDef() && context->getFileDef()) {
-      if(md->getFileDef()->getOutputFileBase() == context->getFileDef()->getOutputFileBase())
-        // TODO ignore prefix of file
-        return false;
-      else
-        return true;
-    }
-    else {
-      return false;
-    }
-  }
-  else {
-    return false;
-  }
+  if (!md->isStatic()) return false;
+  if (!md->getFileDef() || !context->getFileDef()) return false;
+
+  // TODO ignore prefix of file
+  return md->getFileDef()->getOutputFileBase() != context->getFileDef()->getOutputFileBase();
 }
 
 static void startYamlDocument() {
@@ -185,11 +176,13 @@ static int isPartOfCStruct(const MemberDef * md) {
   return is_c_code && md->getClassDef() != nullptr;
 }
 
-std::string sanitizeString(std::string data) {
-  QCString new_data = QCString(data.c_str());
-  new_data = substitute(new_data,"\"", "");
-  new_data = substitute(new_data,"\'", ""); // https://github.com/analizo/analizo/issues/138
-  return !new_data.isEmpty() ? new_data.data() : "";
+[[nodiscard]] std::string sanitizeString(std::string data)
+{
+  data.erase(std::remove_if(data.begin(), data.end(), [](unsigned char c) {
+               return c == '"' || c == '\'';
+             }),
+             data.end());
+  return data;
 }
 
 std::string argumentData(const Argument &argument) {
@@ -536,9 +529,7 @@ int main(int argc,char **argv) {
   startYamlDocument();
   listSymbols();
 
-  std::string cleanup_command = "rm -rf ";
-  cleanup_command += tmpdir.str();
-  (void)system(cleanup_command.c_str());
-
-  exit(0);
+  std::error_code ec;
+  std::filesystem::remove_all(tmpdir.str(), ec);
+  return 0;
 }

addon/doxysearch/doxyindexer.cpp

@@ -22,8 +22,9 @@
 #include <fstream>
 #include <iterator>
 #include <regex>
+#include <filesystem>
+#include <unordered_map>
 
-#include <sys/stat.h>
 
 // Xapian include
 #include <xapian.h>
@@ -104,7 +105,7 @@ static void addWords(const std::string &s,Xapian::Document &doc,int wfd)
 /** Adds all identifiers in \a s to document \a doc with weight \a wfd */
 static void addIdentifiers(const std::string &s,Xapian::Document &doc,int wfd)
 {
-  std::regex id_re("[A-Z_a-z][A-Z_a-z0-9]*");
+  static const std::regex id_re("[A-Z_a-z][A-Z_a-z0-9]*");
   auto id_begin = std::sregex_iterator(s.begin(), s.end(), id_re);
   auto id_end   = std::sregex_iterator();
 
@@ -176,18 +177,21 @@ class XMLContentHandler
     void startElement(const std::string &name, const XMLHandlers::Attributes &attrib)
     {
       m_data="";
-      if (name=="field")
-      {
-        std::string fieldName = XMLHandlers::value(attrib,"name");
-        if      (fieldName=="type")     m_curFieldName=TypeField;
-        else if (fieldName=="name")     m_curFieldName=NameField;
-        else if (fieldName=="args")     m_curFieldName=ArgsField;
-        else if (fieldName=="tag")      m_curFieldName=TagField;
-        else if (fieldName=="url")      m_curFieldName=UrlField;
-        else if (fieldName=="keywords") m_curFieldName=KeywordField;
-        else if (fieldName=="text")     m_curFieldName=TextField;
-        else m_curFieldName=UnknownField;
-      }
+
+      if (name != "field") return;
+
+      static const std::unordered_map<std::string, FieldNames> fieldMap{
+        { "type", TypeField },
+        { "name", NameField },
+        { "args", ArgsField },
+        { "tag", TagField },
+        { "url", UrlField },
+        { "keywords", KeywordField },
+        { "text", TextField }
+      };
+      std::string fieldName = XMLHandlers::value(attrib, "name");
+      auto        it        = fieldMap.find(fieldName);
+      m_curFieldName        = (it != fieldMap.end()) ? it->second : UnknownField;
     }
 
     /** Handler for an end tag. Called for `</doc>` and `</field>` tags */
@@ -292,7 +296,9 @@ inline std::string fileToString(const std::string &fileName)
   std::ifstream t(fileName);
   std::string result;
   t.seekg(0, std::ios::end);
-  result.reserve(t.tellg());
+  auto size = t.tellg();
+  if (size < 0) size = 0;
+  result.reserve(static_cast<std::size_t>(size));
   t.seekg(0, std::ios::beg);
   result.assign(std::istreambuf_iterator<char>(t),
                 std::istreambuf_iterator<char>());
@@ -301,8 +307,8 @@ inline std::string fileToString(const std::string &fileName)
 
 bool dirExists(const char *path)
 {
-  struct stat info = {};
-  return stat(path,&info)==0 && (info.st_mode&S_IFDIR);
+  std::error_code ec;
+  return std::filesystem::is_directory(path, ec);
 }
 
 /** main function to index data */
@@ -315,7 +321,8 @@ int main(int argc,const char **argv)
   std::string outputDir;
   for (int i=1;i<argc;i++)
   {
-    if (std::string(argv[i])=="-o")
+    const std::string arg{ argv[i] };
+    if (arg == "-o")
     {
       if (i>=argc-1)
       {
@@ -333,11 +340,11 @@ int main(int argc,const char **argv)
         }
       }
     }
-    else if (std::string(argv[i])=="-h" || std::string(argv[i])=="--help")
+    else if (arg == "-h" || arg == "--help")
     {
       usage(argv[0],0);
     }
-    else if (std::string(argv[i])=="-v" || std::string(argv[i])=="--version")
+    else if (arg == "-v" || arg == "--version")
     {
       std::cerr << argv[0] << " version: " << getFullVersion() << std::endl;
       exit(0);

addon/doxysearch/doxysearch.cpp

@@ -20,53 +20,37 @@
 #include <vector>
 #include <sstream>
 #include <iostream>
-#include <fstream>
 #include <string>
 #include <algorithm>
+#include <filesystem>
 
 // Xapian includes
 #include <xapian.h>
 
 #include "version.h"
 
-#ifdef _WIN32
-#include <windows.h>
-#else
-#include <sys/stat.h>
-#endif
-
-#define FIELD_TYPE 1
-#define FIELD_NAME 2
-#define FIELD_ARGS 3
-#define FIELD_TAG  4
-#define FIELD_URL  5
-#define FIELD_KEYW 6
-#define FIELD_DOC  7
 
-#define HEX2DEC(x) (((x)>='0' && (x)<='9')?((x)-'0'):\
-                    ((x)>='a' && (x)<='f')?((x)-'a'+10):\
-                    ((x)>='A' && (x)<='F')?((x)-'A'+10):-1)
+constexpr Xapian::valueno FIELD_TYPE{ 1 };
+constexpr Xapian::valueno FIELD_NAME{ 2 };
+constexpr Xapian::valueno FIELD_ARGS{ 3 };
+constexpr Xapian::valueno FIELD_TAG{ 4 };
+constexpr Xapian::valueno FIELD_URL{ 5 };
+constexpr Xapian::valueno FIELD_KEYW{ 6 };
+constexpr Xapian::valueno FIELD_DOC{ 7 };
 
-
-bool dirExists(const std::string& dirName)
+constexpr int             hex2dec(unsigned char c)
 {
-#ifdef _WIN32
-  DWORD ftyp = GetFileAttributesA(dirName.c_str());
-  if (ftyp == INVALID_FILE_ATTRIBUTES)
-    return false;  //something is wrong with your path!
-
-  if (ftyp & FILE_ATTRIBUTE_DIRECTORY)
-    return true;   // this is a directory!
-#else
-  struct stat sb;
+  if (c >= '0' && c <= '9') return c - '0';
+  if (c >= 'a' && c <= 'f') return c - 'a' + 10;
+  if (c >= 'A' && c <= 'F') return c - 'A' + 10;
+  return -1;
+}
 
-  if (stat(dirName.c_str(), &sb)==0 && S_ISDIR(sb.st_mode))
-  {
-    return true;
-  }
-#endif
 
-  return false;
+bool dirExists(const std::string &dirname)
+{
+  std::error_code ec;
+  return std::filesystem::is_directory(dirname, ec);
 }
 
 
@@ -90,11 +74,10 @@ static std::string uriDecode(const std::string & sSrc)
   {
     if (*pSrc == '%') // replace %2A with corresponding ASCII character
     {
-      char dec1, dec2;
+      int           dec1, dec2;
       unsigned char c1=*(pSrc+1);
       unsigned char c2=*(pSrc+2);
-      if (-1 != (dec1 = HEX2DEC(c1))
-       && -1 != (dec2 = HEX2DEC(c2)))
+      if (-1 != (dec1 = hex2dec(c1)) && -1 != (dec2 = hex2dec(c2)))
       {
         *pEnd++ = (dec1 << 4) + dec2;
         pSrc += 3;
@@ -359,7 +342,7 @@ int main(int argc,char **argv)
     std::cout << "Content-Type:application/javascript;charset=utf-8\r\n\n";
     // parse query string
     std::vector<std::string> parts = split(queryString,'&');
-    std::string searchFor,callback;
+    std::string              searchFor;
     int num=1,page=0;
     for (std::vector<std::string>::const_iterator it=parts.begin();it!=parts.end();++it)
     {