* top.c (gdb_readline): Always accept "rn" as a line-ending.

* event-top.c (gdb_readline2): Likewise.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 525f6bf1ebecc7fe75c53487163e3b753bbe68f5..6da59cda12c6bdaf78a11837e97370246816db17 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-14  Mark Kettenis  <kettenis@gnu.org>
+
+       * top.c (gdb_readline): Always accept "\r\n" as a line-ending.
+       * event-top.c (gdb_readline2): Likewise.
+
 2004-10-14  Orjan Friberg  <orjanf@axis.com>
 
        * 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  <sakamoto.kei@renesas.com>
 
        * m32r-tdep.c (decode_prologue): Support functions written

diff --git a/gdb/event-top.c b/gdb/event-top.c
index 01f1f51c265997bbb352726b708e00eefa0b7dc6..39d52fe5f58cbda3ff210142f25c7fb2c8328f97 100644 (file)
--- 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 e586efd948132bba2d8fcf2d10fafb9d82a7958b..618dc86ecb27438bbe3eb4ebcbb7d58585e24f90 100644 (file)
--- 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)