issue #10473 doxygen hangs forever after "Building directory list..."

src/dirdef.cpp

@@ -32,7 +32,6 @@
 #include "filedef.h"
 #include "trace.h"
 
-
 //----------------------------------------------------------------------
 
 class DirDefImpl : public DefinitionMixin<DirDef>
@@ -865,13 +864,7 @@ DirDef *DirDefImpl::mergeDirectoryInTree(const QCString &path)
     QCString part=path.left(i+1);
     if (!matchPath(part,Config_getList(STRIP_FROM_PATH)) && (part!="/" && part!="//" && part!="//?/"))
     {
-#if defined(_WIN32)
-      if (part.startsWith("//?/")) // strip leading "\\?\" part from path
-      {
-        part=part.mid(4);
-      }
-#endif
-      dir=createNewDir(part);
+      dir=createNewDir(removeLongPathMarker(part));
     }
     p=i+1;
   }
@@ -993,7 +986,7 @@ static void computeCommonDirPrefix()
   if (!Doxygen::dirLinkedMap->empty()) // we have at least one dir
   {
     // start will full path of first dir
-    path=(*it)->name();
+    path=removeLongPathMarker((*it)->name());
     int i=path.findRev('/',path.length()-2);
     path=path.left(i+1);
     bool done=FALSE;
@@ -1009,7 +1002,7 @@ static void computeCommonDirPrefix()
         size_t count=0;
         for (const auto &dir : *Doxygen::dirLinkedMap)
         {
-          QCString dirName = dir->name();
+          QCString dirName = removeLongPathMarker(dir->name());
           //printf("dirName='%s' (l=%d) path='%s' (l=%d)\n",qPrint(dirName),dirName.length(),qPrint(path),path.length());
           if (dirName.length()>path.length())
           {

src/doxygen.cpp

@@ -2312,7 +2312,6 @@ static MemberDef *addVariableToClass(
   cd->insertMember(md.get());
   mmd->setRefItems(root->sli);
 
-  //TODO: insert FileDef instead of filename strings.
   cd->insertUsedFile(root->fileDef());
   root->markAsProcessed();
 

src/filedef.cpp

@@ -276,9 +276,10 @@ FileDefImpl::FileDefImpl(const QCString &p,const QCString &nm,
                  const QCString &lref,const QCString &dn)
    : DefinitionMixin(QCString(p)+nm,1,1,nm,0,0,!p.isEmpty())
 {
-  m_path=p;
-  m_filePath=m_path+nm;
+  m_path=removeLongPathMarker(p);
+  m_filePath=p+nm;
   m_fileName=nm;
+
   setReference(lref);
   setDiskNameLocal(!dn.isEmpty() ? dn : nm);
   m_isSource          = guessSection(nm).isSource();

src/util.cpp

@@ -292,10 +292,22 @@ QCString generateMarker(int id)
   return result;
 }
 
-static QCString stripFromPath(const QCString &path,const StringVector &l)
+QCString removeLongPathMarker(QCString path)
+{
+#if defined(_WIN32)
+  if (path.startsWith("//?/")) // strip leading "\\?\" part from path
+  {
+    path=path.mid(4);
+  }
+#endif
+  return path;
+}
+
+static QCString stripFromPath(const QCString &p,const StringVector &l)
 {
   // look at all the strings in the list and strip the longest match
   QCString potential;
+  QCString path=removeLongPathMarker(p);
   unsigned int length = 0;
   for (const auto &s : l)
   {
@@ -3222,7 +3234,7 @@ FileDef *findFileDef(const FileNameLinkedMap *fnMap,const QCString &n,bool &ambi
   slashPos=std::max(name.findRev('/'),name.findRev('\\'));
   if (slashPos!=-1)
   {
-    path=name.left(slashPos+1);
+    path=removeLongPathMarker(name.left(slashPos+1));
     name=name.right(name.length()-slashPos-1);
   }
   if (name.isEmpty()) return 0;

src/util.h

@@ -362,6 +362,7 @@ QCString determineAbsoluteIncludeName(const QCString &curFile,const QCString &in
 void createSubDirs(const Dir &d);
 void clearSubDirs(const Dir &d);
 
+QCString removeLongPathMarker(QCString path);
 QCString stripPath(const QCString &s);
 
 bool containsWord(const QCString &s,const char *word);