* ser-unix.c (hardwire_noflush_set_tty_state): Don't muck with ICANON.

	* inflow.c (terminal_ours_1): When discussing how to deal with the
	tty state, make note of query() as well as readline.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ab4270b8ac773849ea1f193a8c030598a2872b0a..137fa16515b2da5a861c0aca31e6aab54d7025d0 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,9 @@
 Mon Jan 17 22:00:15 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
+       * ser-unix.c (hardwire_noflush_set_tty_state): Don't muck with ICANON.
+       * inflow.c (terminal_ours_1): When discussing how to deal with the
+       tty state, make note of query() as well as readline.
+
        * infrun.c (_initialize_infrun): Add TARGET_SIGNAL_POLL to list of
        signals for which stop and print are cleared by default.
 

diff --git a/gdb/ser-unix.c b/gdb/ser-unix.c
index 63207ddf143ec25fd1ba26b3437cf16a9a73b423..d14a996ed5554522c6952ab0065613b068eb3719 100644 (file)
--- a/gdb/ser-unix.c
+++ b/gdb/ser-unix.c
@@ -198,23 +198,9 @@ hardwire_noflush_set_tty_state (scb, new_ttystate, old_ttystate)
 
   new_state = *(struct hardwire_ttystate *)new_ttystate;
 
-#ifdef HAVE_TERMIOS
-  /* I'm not sure whether this is necessary; the manpage makes no mention
-     of discarding input when switching to/from ICANON.  */
-  if (state->termios.c_lflag & ICANON)
-    new_state.termios.c_lflag |= ICANON;
-  else
-    new_state.termios.c_lflag &= ~ICANON;
-#endif
-
-#ifdef HAVE_TERMIO
-  /* I'm not sure whether this is necessary; the manpage makes no mention
-     of discarding input when switching to/from ICANON.  */
-  if (state->termio.c_lflag & ICANON)
-    new_state.termio.c_lflag |= ICANON;
-  else
-    new_state.termio.c_lflag &= ~ICANON;
-#endif
+  /* Don't change in or out of raw mode; we don't want to flush input.
+     termio and termios have no such restriction; for them flushing input
+     is separate from setting the attributes.  */
 
 #ifdef HAVE_SGTTY
   if (state->sgttyb.sg_flags & RAW)