From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-patches-return-10632-listarch-gdb-patches=sourceware.cygnus.com@sources.redhat.com>
Received: (qmail 8028 invoked by alias); 19 Nov 2001 21:02:02 -0000
Mailing-List: contact gdb-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:gdb-patches-subscribe@sources.redhat.com>
List-Archive: <http://sources.redhat.com/ml/gdb-patches/>
List-Post: <mailto:gdb-patches@sources.redhat.com>
List-Help: <mailto:gdb-patches-help@sources.redhat.com>, <http://sources.redhat.com/ml/#faqs>
Sender: gdb-patches-owner@sources.redhat.com
Received: (qmail 8001 invoked from network); 19 Nov 2001 21:02:02 -0000
Received: from unknown (HELO cygnus.com) (205.180.230.5)
  by sourceware.cygnus.com with SMTP; 19 Nov 2001 21:02:02 -0000
Received: from makita.cygnus.com (makita.cygnus.com [205.180.230.78])
	by runyon.cygnus.com (8.8.7-cygnus/8.8.7) with ESMTP id NAA01569;
	Mon, 19 Nov 2001 13:02:01 -0800 (PST)
Received: from localhost (keiths@localhost) by makita.cygnus.com (8.8.8+Sun/8.6.4) with ESMTP id NAA16898; Mon, 19 Nov 2001 13:02:00 -0800 (PST)
X-Authentication-Warning: makita.cygnus.com: keiths owned process doing -bs
Date: Wed, 07 Nov 2001 17:25:00 -0000
From: Keith Seitz <keiths@cygnus.com>
To: <gdb-patches@sources.redhat.com>
cc: Elena Zannoni <ezannoni@cygnus.com>
Subject: Re: [RFA] top.c: initialize other UIs before cli
In-Reply-To: <Pine.GSO.4.33.0111191203250.16197-100000@makita.cygnus.com>
Message-ID: <Pine.GSO.4.33.0111191300370.16197-100000@makita.cygnus.com>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
X-SW-Source: 2001-11/txt/msg00128.txt.bz2

Sorry for the self-reply, but I didn't add any comments on this little
hack...

Reposted below.

On Mon, 19 Nov 2001, Keith Seitz wrote:

> Hi,
>
> There is currently a little problem with init_ui_hook: if the UI fails to
> initialize (and we should fall back to "gdb -nw"), then the CLI will NOT
> get initialized properly.
>
> This results because init_ui_hook does not return any status indicating
> the failure.
>
> This simple change will correct this anomaly without altering init_ui_hook
> semantics, i.e., it is absolutely the least intrusive.
>
> ?
> Keith
>
> ChangeLog
> 2001-11-19  Keith Seitz  <keiths@redhat.com>
>
> 	* top.c (gdb_init): Call init_ui_hook before initializing
> 	the default UI.
>
> Patch
Index: top.c
===================================================================
RCS file: /cvs/src/src/gdb/top.c,v
retrieving revision 1.48
diff -u -p -r1.48 top.c
--- top.c	2001/11/10 21:34:56	1.48
+++ top.c	2001/11/19 21:01:02
@@ -182,8 +182,11 @@ static void stop_sig (int);
 /* Hooks for alternate command interfaces.  */

 /* Called after most modules have been initialized, but before taking users
-   command file.  */
+   command file.

+   If the UI fails to initialize and it wants GDB to continue
+   using the default UI, then it should clear this hook before returning. */
+
 void (*init_ui_hook) (char *argv0);

 /* This hook is called from within gdb's many mini-event loops which could
@@ -2034,6 +2037,11 @@ gdb_init (char *argv0)
   set_language (language_c);
   expected_language = current_language;		/* don't warn about the change.  */

+  /* Allow another UI to initialize. If the UI fails to initialize, and
+     it wants GDB to revert to the CLI, it should clear init_ui_hook. */
+  if (init_ui_hook)
+    init_ui_hook (argv0);
+
 #ifdef UI_OUT
   /* Install the default UI */
   if (!init_ui_hook)
@@ -2050,7 +2058,4 @@ gdb_init (char *argv0)
 	}
     }
 #endif
-
-  if (init_ui_hook)
-    init_ui_hook (argv0);
 }