* inflow.c (gdb_getpgrp): New.

	(gdb_has_a_terminal): Use get_getpgrp.
	(terminal_ours_1): If attach_flag is set, don't refetch
	inferior_process_group.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 15098bcd3e00cea7ffd17b5160786cdc552d870d..828462e2dbcd5da1ddde2a7b04dee4f99348c872 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2008-03-14  Pedro Alves  <pedro@codesourcery.com>
+
+       * inflow.c (gdb_getpgrp): New.
+       (gdb_has_a_terminal): Use get_getpgrp.
+       (terminal_ours_1): If attach_flag is set, don't refetch
+       inferior_process_group.
+
 2008-03-14  Pedro Alves  <pedro@codesourcery.com>
 
        * features/library-list.dtd: Allow "section" elements as children

diff --git a/gdb/inflow.c b/gdb/inflow.c
index d003a98dcd198abfd100cdd18835a78c72c9663e..cc4b5dea4356afb5f8f7484d5f4aa4e6dad07dd7 100644 (file)
--- a/gdb/inflow.c
+++ b/gdb/inflow.c
@@ -98,6 +98,24 @@ static const char *inferior_thisrun_terminal;
 
 int terminal_is_ours;
 
+#ifdef PROCESS_GROUP_TYPE
+static PROCESS_GROUP_TYPE
+gdb_getpgrp (void)
+{
+  int process_group = -1;
+#ifdef HAVE_TERMIOS
+  process_group = tcgetpgrp (0);
+#endif
+#ifdef HAVE_TERMIO
+  process_group = getpgrp ();
+#endif
+#ifdef HAVE_SGTTY
+  ioctl (0, TIOCGPGRP, &process_group);
+#endif
+  return process_group;
+}
+#endif
+
 enum
   {
     yes, no, have_not_checked
@@ -132,15 +150,7 @@ gdb_has_a_terminal (void)
          if (our_ttystate != NULL)
            {
              gdb_has_a_terminal_flag = yes;
-#ifdef HAVE_TERMIOS
-             our_process_group = tcgetpgrp (0);
-#endif
-#ifdef HAVE_TERMIO
-             our_process_group = getpgrp ();
-#endif
-#ifdef HAVE_SGTTY
-             ioctl (0, TIOCGPGRP, &our_process_group);
-#endif
+             our_process_group = gdb_getpgrp ();
            }
        }
 
@@ -339,15 +349,12 @@ terminal_ours_1 (int output_only)
       if (inferior_ttystate)
        xfree (inferior_ttystate);
       inferior_ttystate = serial_get_tty_state (stdin_serial);
-#ifdef HAVE_TERMIOS
-      inferior_process_group = tcgetpgrp (0);
-#endif
-#ifdef HAVE_TERMIO
-      inferior_process_group = getpgrp ();
-#endif
-#ifdef HAVE_SGTTY
-      ioctl (0, TIOCGPGRP, &inferior_process_group);
-#endif
+
+      if (!attach_flag)
+       /* If setpgrp failed in terminal_inferior, this would give us
+          our process group instead of the inferior's.  See
+          terminal_inferior for details.  */
+       inferior_process_group = gdb_getpgrp ();
 
       /* Here we used to set ICANON in our ttystate, but I believe this
          was an artifact from before when we used readline.  Readline sets