Wed Sep 14 18:18:58 1994 Steve Chamberlain (sac@jonny.cygnus.com)

	* remote-hms.c (hms_read_inferior_memory):  Cope when
	target sends both \r and \n.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index bdc5fad3aae2cd14ec9bf8ebb08b83d589636c99..c39acaa5b7805f7c74ec0a065a43ec3b28e0ed41 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+Wed Sep 14 18:18:58 1994  Steve Chamberlain  (sac@jonny.cygnus.com)
+
+       * remote-hms.c (hms_read_inferior_memory):  Cope when
+       target sends both \r and \n.
+
 Wed Sep 14 17:14:57 1994  Stan Shebs  (shebs@andros.cygnus.com)
 
        * remote-mips.c (mips_error): Place NORETURN macro correctly.

diff --git a/gdb/remote-hms.c b/gdb/remote-hms.c
index 38e85f257afec7ec9b3d3c5712159488984eebe5..a553418cb7f668b85bc8e47fd87081ae13cdf29c 100644 (file)
--- a/gdb/remote-hms.c
+++ b/gdb/remote-hms.c
@@ -1358,10 +1358,14 @@ hms_read_inferior_memory (memaddr, myaddr, len)
       char byte[16];
 
       buffer[0] = readchar ();
+      while (buffer[0] == '\r' 
+            || buffer[0] == '\n')
+       buffer[0] = readchar ();
+
       if (buffer[0] == 'M')
        break;
 
-      for (i = 1; i < 60; i++) {
+      for (i = 1; i < 50; i++) {
        buffer[i] = readchar ();
       }
       /* sometimes we loose characters in the ascii representation of the 
@@ -1369,7 +1373,7 @@ hms_read_inferior_memory (memaddr, myaddr, len)
       i = readchar();
       while (i != '\n' && i != '\r')
        i = readchar(); 
-
+      
       /* Now parse the line */
 
       addr = gethex (4, buffer, &ok);