oops - omitted from previous delta

[deliverable/binutils-gdb.git] / gdb / inflow.c

diff --git a/gdb/inflow.c b/gdb/inflow.c
index f24704d7917b9f1c33e1d76334d64a5b8e20a347..2a41f57982ff71e6c15a9b0df868b63b4cef2a5d 100644 (file)
--- a/gdb/inflow.c
+++ b/gdb/inflow.c
@@ -35,22 +35,7 @@
 #include <sys/select.h>
 #endif
 
-#ifdef HAVE_TERMIOS
-#define PROCESS_GROUP_TYPE pid_t
-#endif
-
-#ifdef HAVE_TERMIO
-#define PROCESS_GROUP_TYPE int
-#endif
-
-#ifdef HAVE_SGTTY
-#ifdef SHORT_PGRP
-/* This is only used for the ultra.  Does it have pid_t?  */
-#define PROCESS_GROUP_TYPE short
-#else
-#define PROCESS_GROUP_TYPE int
-#endif
-#endif /* sgtty */
+#include "inflow.h"
 
 #ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
@@ -129,19 +114,20 @@ gdb_has_a_terminal (void)
     case no:
       return 0;
     case have_not_checked:
-      /* Get all the current tty settings (including whether we have a tty at
-         all!).  Can't do this in _initialize_inflow because SERIAL_FDOPEN
-         won't work until the serial_ops_list is initialized.  */
+      /* Get all the current tty settings (including whether we have a
+         tty at all!).  Can't do this in _initialize_inflow because
+         serial_fdopen() won't work until the serial_ops_list is
+         initialized.  */
 
 #ifdef F_GETFL
       tflags_ours = fcntl (0, F_GETFL, 0);
 #endif
 
       gdb_has_a_terminal_flag = no;
-      stdin_serial = SERIAL_FDOPEN (0);
+      stdin_serial = serial_fdopen (0);
       if (stdin_serial != NULL)
        {
-         our_ttystate = SERIAL_GET_TTY_STATE (stdin_serial);
+         our_ttystate = serial_get_tty_state (stdin_serial);
 
          if (our_ttystate != NULL)
            {
@@ -170,7 +156,7 @@ gdb_has_a_terminal (void)
 #define        OOPSY(what)     \
   if (result == -1)    \
     fprintf_unfiltered(gdb_stderr, "[%s failed in terminal_inferior: %s]\n", \
-           what, strerror (errno))
+           what, safe_strerror (errno))
 
 static void terminal_ours_1 (int);
 
@@ -182,11 +168,11 @@ terminal_init_inferior_with_pgrp (int pgrp)
 {
   if (gdb_has_a_terminal ())
     {
-      /* We could just as well copy our_ttystate (if we felt like adding
-         a new function SERIAL_COPY_TTY_STATE).  */
+      /* We could just as well copy our_ttystate (if we felt like
+         adding a new function serial_copy_tty_state()).  */
       if (inferior_ttystate)
        xfree (inferior_ttystate);
-      inferior_ttystate = SERIAL_GET_TTY_STATE (stdin_serial);
+      inferior_ttystate = serial_get_tty_state (stdin_serial);
 
 #ifdef PROCESS_GROUP_TYPE
       inferior_process_group = pgrp;
@@ -199,6 +185,23 @@ terminal_init_inferior_with_pgrp (int pgrp)
     }
 }
 
+/* Save the terminal settings again.  This is necessary for the TUI
+   when it switches to TUI or non-TUI mode;  curses changes the terminal
+   and gdb must be able to restore it correctly.  */
+
+void
+terminal_save_ours (void)
+{
+  if (gdb_has_a_terminal ())
+    {
+      /* We could just as well copy our_ttystate (if we felt like adding
+         a new function serial_copy_tty_state).  */
+      if (our_ttystate)
+        xfree (our_ttystate);
+      our_ttystate = serial_get_tty_state (stdin_serial);
+    }
+}
+
 void
 terminal_init_inferior (void)
 {
@@ -236,7 +239,7 @@ terminal_inferior (void)
       /* Because we were careful to not change in or out of raw mode in
          terminal_ours, we will not change in our out of raw mode with
          this call, so we don't flush any input.  */
-      result = SERIAL_SET_TTY_STATE (stdin_serial, inferior_ttystate);
+      result = serial_set_tty_state (stdin_serial, inferior_ttystate);
       OOPSY ("setting tty state");
 
       if (!job_control)
@@ -334,7 +337,7 @@ terminal_ours_1 (int output_only)
 
       if (inferior_ttystate)
        xfree (inferior_ttystate);
-      inferior_ttystate = SERIAL_GET_TTY_STATE (stdin_serial);
+      inferior_ttystate = serial_get_tty_state (stdin_serial);
 #ifdef HAVE_TERMIOS
       inferior_process_group = tcgetpgrp (0);
 #endif
@@ -359,7 +362,7 @@ terminal_ours_1 (int output_only)
          though, since readline will deal with raw mode when/if it needs to.
        */
 
-      SERIAL_NOFLUSH_SET_TTY_STATE (stdin_serial, our_ttystate,
+      serial_noflush_set_tty_state (stdin_serial, our_ttystate,
                                    inferior_ttystate);
 
       if (job_control)
@@ -373,7 +376,7 @@ terminal_ours_1 (int output_only)
             such situations as well.  */
          if (result == -1)
            fprintf_unfiltered (gdb_stderr, "[tcsetpgrp failed in terminal_ours: %s]\n",
-                               strerror (errno));
+                               safe_strerror (errno));
 #endif
 #endif /* termios */
 
@@ -489,7 +492,7 @@ child_terminal_info (char *args, int from_tty)
                   (int) inferior_process_group);
 #endif
 
-  SERIAL_PRINT_TTY_STATE (stdin_serial, inferior_ttystate, gdb_stdout);
+  serial_print_tty_state (stdin_serial, inferior_ttystate, gdb_stdout);
 }
 \f
 /* NEW_TTY_PREFORK is called before forking a new child process,
@@ -590,10 +593,11 @@ kill_command (char *arg, int from_tty)
   if (target_has_stack)
     {
       printf_filtered ("In %s,\n", target_longname);
-      if (selected_frame == NULL)
+      if (deprecated_selected_frame == NULL)
        fputs_filtered ("No selected stack frame.\n", gdb_stdout);
       else
-       print_stack_frame (selected_frame, selected_frame_level, 1);
+       print_stack_frame (deprecated_selected_frame,
+                          frame_relative_level (deprecated_selected_frame), 1);
     }
 }
 \f
@@ -708,21 +712,24 @@ gdb_setpgid (void)
 
   if (job_control)
     {
-#if defined (NEED_POSIX_SETPGID) || (defined (HAVE_TERMIOS) && defined (HAVE_SETPGID))
-      /* setpgid (0, 0) is supposed to work and mean the same thing as
-         this, but on Ultrix 4.2A it fails with EPERM (and
+#if defined (HAVE_TERMIOS) || defined (TIOCGPGRP)
+#ifdef HAVE_SETPGID
+      /* The call setpgid (0, 0) is supposed to work and mean the same
+         thing as this, but on Ultrix 4.2A it fails with EPERM (and
          setpgid (getpid (), getpid ()) succeeds).  */
       retval = setpgid (getpid (), getpid ());
 #else
-#if defined (TIOCGPGRP)
-#if defined(USG) && !defined(SETPGRP_ARGS)
+#ifdef HAVE_SETPGRP
+#ifdef SETPGRP_VOID 
       retval = setpgrp ();
 #else
       retval = setpgrp (getpid (), getpid ());
-#endif /* USG */
-#endif /* TIOCGPGRP.  */
-#endif /* NEED_POSIX_SETPGID */
+#endif
+#endif /* HAVE_SETPGRP */
+#endif /* HAVE_SETPGID */
+#endif /* defined (HAVE_TERMIOS) || defined (TIOCGPGRP) */
     }
+
   return retval;
 }