Merge pull request #6954 from albert-github/feature/bug_ambig_file

Ambiguous file name in file command

1 files changed, 11 insertions, 1 deletions

diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index f4ff579..30c2001 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -766,6 +766,16 @@ static void buildFileList(Entry *root)
   {
     bool ambig;
     FileDef *fd=findFileDef(Doxygen::inputNameDict,root->name,ambig);
+    if (!fd || ambig)
+    {
+      int save_ambig = ambig;
+      // use the directory of the file to see if the described file is in the same
+      // directory as the describing file.
+      QCString fn = root->fileName;
+      int newIndex=fn.findRev('/');
+      fd=findFileDef(Doxygen::inputNameDict,fn.left(newIndex) + "/" + root->name,ambig);
+      if (!fd) ambig = save_ambig;
+    }
     //printf("**************** root->name=%s fd=%p\n",root->name.data(),fd);
     if (fd && !ambig)
     {
@@ -795,7 +805,7 @@ static void buildFileList(Entry *root)
       const char *fn = root->fileName.data();
       QCString text(4096);
       text.sprintf("the name `%s' supplied as "
-          "the second argument in the \\file statement ",
+          "the argument in the \\file statement ",
           qPrint(root->name));
       if (ambig) // name is ambiguous
       {