* source.c (find_and_open_source): Try rewriting the source

        path inside filename if dirname is NULL.

1 files changed, 12 insertions, 0 deletions

diff --git a/gdb/source.c b/gdb/source.c
index fa7dd5c..a142b32 100644
--- a/gdb/source.c
+++ b/gdb/source.c
@@ -1001,6 +1001,18 @@ find_and_open_source (struct objfile *objfile,
 	  strcat (path + len, source_path + len + cdir_len);	/* After $cdir */
 	}
     }
+  else
+    {
+      /* If dirname is NULL, chances are the path is embedded in
+         the filename.  Try the source path substitution on it.  */
+      char *rewritten_filename = rewrite_source_path (filename);
+
+      if (rewritten_filename != NULL)
+        {
+          make_cleanup (xfree, rewritten_filename);
+          filename = rewritten_filename;
+        }
+    }
 
   result = openp (path, OPF_SEARCH_IN_PATH, filename, OPEN_MODE, 0, fullname);
   if (result < 0)