From 7e97eb282603d8732bd7a4a8e63e162a38212c14 Mon Sep 17 00:00:00 2001
From: Stu Grossman <grossman@cygnus>
Date: Tue, 14 Jan 1992 20:31:40 +0000
Subject: [PATCH] gdb-pend/620 * inflow.c (child_terminal_info):  #ifdef
 TIOCPGRP around lines that reference pgrp_inferior.

---
 gdb/ChangeLog |  5 +++++
 gdb/inflow.c  | 15 +++++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6f0bb08..d97e98c 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jan 14 12:28:52 1992  Stu Grossman  (grossman at cygnus.com)
+
+	* inflow.c (child_terminal_info):  #ifdef TIOCPGRP around lines
+	that reference pgrp_inferior.
+
 Mon Jan 13 14:57:11 1992  Per Bothner  (bothner at cygnus.com)
 
 	* tm-mips.h:  Removed BLOCK_ADDRESS_ABSOLUTE, now that
diff --git a/gdb/inflow.c b/gdb/inflow.c
index 35aad97..332584c 100644
--- a/gdb/inflow.c
+++ b/gdb/inflow.c
@@ -78,11 +78,11 @@ static int lmode_ours;
 # ifdef SHORT_PGRP
 static short pgrp_inferior;
 static short pgrp_ours;
-# else
+# else /* not def SHORT_PGRP */
 static int pgrp_inferior;
 static int pgrp_ours;
-# endif
-#else
+# endif /* not def SHORT_PGRP */
+#else /* not def TIOCGPGRP */
 static void (*sigint_ours) ();
 static void (*sigquit_ours) ();
 #endif /* TIOCGPGRP */
@@ -165,7 +165,12 @@ terminal_inferior ()
 
 #ifdef TIOCGPGRP
       result = ioctl (0, TIOCSPGRP, &pgrp_inferior);
-      OOPSY ("ioctl TIOCSPGRP");
+      /* If we attached to the process, we might or might not be sharing
+	 a terminal.  Avoid printing error msg if we are unable to set our
+	 terminal's process group to his process group ID.  */
+      if (!attach_flag) {
+	OOPSY ("ioctl TIOCSPGRP");
+      }
 #else
       sigint_ours = (void (*) ()) signal (SIGINT, SIG_IGN);
       sigquit_ours = (void (*) ()) signal (SIGQUIT, SIG_IGN);
@@ -298,10 +303,12 @@ child_terminal_info (args, from_tty)
     return;
   }
 
+#ifdef TIOCGPGRP
   printf_filtered ("Inferior's terminal status (currently saved by GDB):\n");
 
   printf_filtered ("owner pgrp = %d, fcntl flags = 0x%x.\n",
 	  pgrp_inferior, tflags_inferior);
+#endif /* TIOCGPGRP */
 
 #ifdef HAVE_TERMIO
 
-- 
2.7.4