* source.c (open): Strip DOS drive letter if present before

	concatenating string to search path.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7749adfd4aad6c571f5f72308b62b0091981e12d..a3f6f109ec50a808472657080be879fbaa48cbf2 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-14  Doug Evans  <dje@google.com>
+
+       * source.c (open): Strip DOS drive letter if present before
+       concatenating string to search path.
+
 2010-04-14  Pedro Alves  <pedro@codesourcery.com>
 
        * objfiles.h (gdb_bfd_close_or_warn): Declare.

diff --git a/gdb/source.c b/gdb/source.c
index e9893ba566baa13b2271f6a7c3c8da3e99f6845b..47caa1487e4a08b3dd9dc571047d88589aef6e9d 100644 (file)
--- a/gdb/source.c
+++ b/gdb/source.c
@@ -724,6 +724,10 @@ openp (const char *path, int opts, const char *string,
            goto done;
     }
 
+  /* For dos paths, d:/foo -> /foo, and d:foo -> foo.  */
+  if (HAS_DRIVE_SPEC (string))
+    string = STRIP_DRIVE_SPEC (string);
+
   /* /foo => foo, to avoid multiple slashes that Emacs doesn't like. */
   while (IS_DIR_SEPARATOR(string[0]))
     string++;