This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
Re: PATCH: Fix -w option
- From: Andrew STUBBS <andrew dot stubbs at st dot com>
- To: Jim Blandy <jimb at redhat dot com>
- Cc: gdb-patches at sources dot redhat dot com
- Date: Mon, 07 Nov 2005 12:46:06 +0000
- Subject: Re: PATCH: Fix -w option
- References: <435E2756.8060103@st.com> <436B4BE3.7060201@st.com> <vt2ll04ca73.fsf@theseus.home.>
Jim Blandy wrote:
Andrew STUBBS <andrew.stubbs@st.com> writes:
Andrew Stubbs wrote:
Hi,
The -w option does not do anything anymore.
The attached patch fixes the problem and allows it to open Insight
once more. It also tidies up the use of interpreter_p a little wrt
the tui.
No word on this one yet. Is it OK?
Yes, it looks fine. Could you correct the use of "tui" instead of
INTERP_TUI in tui/tui-interp.c, too?
Certainly, I have commited the attached.
Thanks
Andrew
2005-11-07 Andrew Stubbs <andrew.stubbs@st.com>
* main.c (main): Use INTERP_TUI instead of "tui".
Set interpreter to INTERP_INSIGHT when '-w' given.
* interps.h (INTERP_INSIGHT): New define.
* tui/tui-interp.c (_initialize_tui_interp): Use INTERP_TUI instead
of "tui".
Index: src/gdb/main.c
===================================================================
--- src.orig/gdb/main.c 2005-11-07 11:50:25.000000000 +0000
+++ src/gdb/main.c 2005-11-07 12:24:25.000000000 +0000
@@ -350,11 +350,16 @@ captured_main (void *data)
case OPT_TUI:
/* --tui is equivalent to -i=tui. */
xfree (interpreter_p);
- interpreter_p = xstrdup ("tui");
+ interpreter_p = xstrdup (INTERP_TUI);
break;
case OPT_WINDOWS:
/* FIXME: cagney/2003-03-01: Not sure if this option is
actually useful, and if it is, what it should do. */
+#ifdef GDBTK
+ /* --windows is equivalent to -i=insight. */
+ xfree (interpreter_p);
+ interpreter_p = xstrdup (INTERP_INSIGHT);
+#endif
use_windows = 1;
break;
case OPT_NOWINDOWS:
Index: src/gdb/interps.h
===================================================================
--- src.orig/gdb/interps.h 2005-11-07 11:50:25.000000000 +0000
+++ src/gdb/interps.h 2005-11-07 12:24:25.000000000 +0000
@@ -76,5 +76,6 @@ extern void clear_interpreter_hooks (voi
#define INTERP_MI3 "mi3"
#define INTERP_MI "mi"
#define INTERP_TUI "tui"
+#define INTERP_INSIGHT "insight"
#endif
Index: src/gdb/tui/tui-interp.c
===================================================================
--- src.orig/gdb/tui/tui-interp.c 2005-04-26 06:03:41.000000000 +0100
+++ src/gdb/tui/tui-interp.c 2005-11-07 12:25:44.000000000 +0000
@@ -199,13 +199,13 @@ _initialize_tui_interp (void)
/* Create a default uiout builder for the TUI. */
tui_out = tui_out_new (gdb_stdout);
- interp_add (interp_new ("tui", NULL, tui_out, &procs));
- if (interpreter_p && strcmp (interpreter_p, "tui") == 0)
+ interp_add (interp_new (INTERP_TUI, NULL, tui_out, &procs));
+ if (interpreter_p && strcmp (interpreter_p, INTERP_TUI) == 0)
tui_start_enabled = 1;
if (interpreter_p && strcmp (interpreter_p, INTERP_CONSOLE) == 0)
{
xfree (interpreter_p);
- interpreter_p = xstrdup ("tui");
+ interpreter_p = xstrdup (INTERP_TUI);
}
}