diff options
-rw-r--r-- | gdb/ChangeLog | 6 | ||||
-rw-r--r-- | gdb/serial.c | 7 |
2 files changed, 11 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 4cffd0b..fcb5959 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2006-04-11 Jim Blandy <jimb@codesourcery.com> + + * serial.c (serial_open): Check for special cases at the front of + the "device" name before scanning for the ':' that would indicate + an IP-based connection. + 2006-04-10 Christopher Faylor <cgf@timesys.com> * win32-nat.c (open_symbol_file_object): New function. diff --git a/gdb/serial.c b/gdb/serial.c index 9ee2fa0..fb74e1c 100644 --- a/gdb/serial.c +++ b/gdb/serial.c @@ -184,8 +184,6 @@ serial_open (const char *name) if (strcmp (name, "pc") == 0) ops = serial_interface_lookup ("pc"); - else if (strchr (name, ':')) - ops = serial_interface_lookup ("tcp"); else if (strncmp (name, "lpt", 3) == 0) ops = serial_interface_lookup ("parallel"); else if (strncmp (name, "|", 1) == 0) @@ -193,6 +191,11 @@ serial_open (const char *name) ops = serial_interface_lookup ("pipe"); open_name = name + 1; /* discard ``|'' */ } + /* Check for a colon, suggesting an IP address/port pair. + Do this *after* checking for all the interesting prefixes. We + don't want to constrain the syntax of what can follow them. */ + else if (strchr (name, ':')) + ops = serial_interface_lookup ("tcp"); else ops = serial_interface_lookup ("hardwire"); |