Handle Windows drives in rbreak paths

Fixes this testsuite fail on Windows:
FAIL: gdb.base/fullpath-expand.exp: rbreak XXX/fullpath-expand-func.c:func

If the found colon is actually part of a Windows drive, look for another.

gdb/ChangeLog:

2020-06-14  Hannes Domani  <ssbssa@yahoo.de>

	* symtab.c (rbreak_command): Ignore Windows drive colon.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3be14fdc30aa7692008d7bdbe24ad7099a21b89a..133f97103a1ecd8dee06bd6e756006537bbce9c9 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2020-06-14  Hannes Domani  <ssbssa@yahoo.de>
+
+       * symtab.c (rbreak_command): Ignore Windows drive colon.
+
 2020-06-12  Simon Marchi  <simon.marchi@efficios.com>
 
        * NEWS: Mention removed GDBserver host support.

diff --git a/gdb/symtab.c b/gdb/symtab.c
index 791ce11a7372c11583eec384b5d44bf13d4366ea..b255cc7232737070b4df14febe9b8cf9b42d58ba 100644 (file)
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -5196,6 +5196,11 @@ rbreak_command (const char *regexp, int from_tty)
     {
       const char *colon = strchr (regexp, ':');
 
+      /* Ignore the colon if it is part of a Windows drive.  */
+      if (HAS_DRIVE_SPEC (regexp)
+         && (regexp[2] == '/' || regexp[2] == '\\'))
+       colon = strchr (STRIP_DRIVE_SPEC (regexp), ':');
+
       if (colon && *(colon + 1) != ':')
        {
          int colon_index;