From ad4c72d28343c31f9d4036beb90d18e2efa390ea Mon Sep 17 00:00:00 2001 From: Mark Kettenis Date: Thu, 14 Oct 2004 12:44:24 +0000 Subject: [PATCH] * top.c (gdb_readline): Always accept "rn" as a line-ending. * event-top.c (gdb_readline2): Likewise. --- gdb/ChangeLog | 6 +++++- gdb/event-top.c | 4 ---- gdb/top.c | 4 ---- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 525f6bf1ebe..6da59cda12c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2004-10-14 Mark Kettenis + + * top.c (gdb_readline): Always accept "\r\n" as a line-ending. + * event-top.c (gdb_readline2): Likewise. + 2004-10-14 Orjan Friberg * cris-tdep.c (_initialize_cris_tdep): Re-add call to @@ -298,7 +303,6 @@ * mips-tdep.c (mips32_next_pc): Check the register's contents, not its number for BLEZ/BLEZL and BGTZ/BGTZL. ->>>>>>> 1.6475 2004-10-07 Kei Sakamoto * m32r-tdep.c (decode_prologue): Support functions written diff --git a/gdb/event-top.c b/gdb/event-top.c index 01f1f51c265..39d52fe5f58 100644 --- a/gdb/event-top.c +++ b/gdb/event-top.c @@ -855,15 +855,11 @@ gdb_readline2 (gdb_client_data client_data) } if (c == '\n') -#ifndef CRLF_SOURCE_FILES - break; -#else { if (input_index > 0 && result[input_index - 1] == '\r') input_index--; break; } -#endif result[input_index++] = c; while (input_index >= result_size) diff --git a/gdb/top.c b/gdb/top.c index e586efd9481..618dc86ecb2 100644 --- a/gdb/top.c +++ b/gdb/top.c @@ -932,15 +932,11 @@ gdb_readline (char *prompt_arg) } if (c == '\n') -#ifndef CRLF_SOURCE_FILES - break; -#else { if (input_index > 0 && result[input_index - 1] == '\r') input_index--; break; } -#endif result[input_index++] = c; while (input_index >= result_size) -- 2.30.2