aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@gnu.org>2004-10-14 12:44:24 +0000
committerMark Kettenis <kettenis@gnu.org>2004-10-14 12:44:24 +0000
commitad4c72d28343c31f9d4036beb90d18e2efa390ea (patch)
tree203f93c385f7ab2b30553ec0122c18e28a967a8f /gdb
parent52bd14014eb55823e423588cc27f832901023199 (diff)
downloadgdb-ad4c72d28343c31f9d4036beb90d18e2efa390ea.zip
gdb-ad4c72d28343c31f9d4036beb90d18e2efa390ea.tar.gz
gdb-ad4c72d28343c31f9d4036beb90d18e2efa390ea.tar.bz2
* top.c (gdb_readline): Always accept "rn" as a line-ending.
* event-top.c (gdb_readline2): Likewise.
Diffstat (limited to 'gdb')
-rw-r--r--gdb/ChangeLog6
-rw-r--r--gdb/event-top.c4
-rw-r--r--gdb/top.c4
3 files changed, 5 insertions, 9 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 525f6bf..6da59cd 100644
--- 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 01f1f51..39d52fe 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 e586efd..618dc86 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)