From: Fred Fish <fnf@specifix.com>
Date: Fri, 23 Aug 1996 07:57:10 +0000 (+0000)
Subject: 	* gdbtk.c (gdbtk_init): Check for a DISPLAY env variable and
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fe58c81f5caf86ffa0b1df668fd0ec49bcc33bbe;p=binutils-gdb.git

	* gdbtk.c (gdbtk_init): Check for a DISPLAY env variable and
	gracefully degrade to using command line interface if none is
	found.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 888fead5af3..3c3c92ab676 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+Fri Aug 23 00:44:57 1996  Fred Fish  <fnf@ninemoons.com>
+
+	* gdbtk.c (gdbtk_init): Check for a DISPLAY env variable and
+	gracefully degrade to using command line interface if none is
+	found.
+
 Wed Aug 21 16:31:27 1996  Fred Fish  <fnf@rtl.cygnus.com>
 
 	* valprint.c (print_longest): Test for CC_HAS_LONG_LONG as well as
diff --git a/gdb/gdbtk.c b/gdb/gdbtk.c
index 1237ef56d6e..a51f6d986fa 100644
--- a/gdb/gdbtk.c
+++ b/gdb/gdbtk.c
@@ -1240,6 +1240,13 @@ gdbtk_init ()
   struct sigaction action;
   static sigset_t nullsigmask = {0};
 
+  /* If there is no DISPLAY environment variable, Tk_Init below will fail,
+     causing gdb to abort.  If instead we simply return here, gdb will
+     gracefully degrade to using the command line interface. */
+
+  if (getenv ("DISPLAY") == NULL)
+    return;
+
   old_chain = make_cleanup (cleanup_init, 0);
 
   /* First init tcl and tk. */