From 78a99e911936e6c86fe64f84ba16a6550410aeec Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Tue, 31 Jul 2012 19:16:46 +0000 Subject: [PATCH] 2012-07-31 Pedro Alves * server.c (process_point_options): Only skip tokens if we find one that is unrecognized. Don't treat 'X' specially while skipping unrecognized tokens. --- gdb/gdbserver/ChangeLog | 6 ++++++ gdb/gdbserver/server.c | 8 +++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 08a8d3adaa6..4e40aa92821 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,9 @@ +2012-07-31 Pedro Alves + + * server.c (process_point_options): Only skip tokens if we find + one that is unrecognized. Don't treat 'X' specially while + skipping unrecognized tokens. + 2012-07-30 Ulrich Weigand * linux-arm-low.c (arm_linux_hw_point_initialize): Do not attempt diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c index 4e15b3c9fa9..547552f94dc 100644 --- a/gdb/gdbserver/server.c +++ b/gdb/gdbserver/server.c @@ -2938,14 +2938,12 @@ process_point_options (CORE_ADDR point_addr, char **packet) } else { - /* Unrecognized token, just skip it. */ fprintf (stderr, "Unknown token %c, ignoring.\n", *dataptr); + /* Skip tokens until we find one that we recognize. */ + while (*dataptr && *dataptr != ';') + dataptr++; } - - /* Skip tokens until we find one that we recognize. */ - while (*dataptr && *dataptr != 'X' && *dataptr != ';') - dataptr++; } *packet = dataptr; } -- 2.30.2