Re: [RFA] Make interpreter_p an argument for gdb_main

[Keith Seitz <keiths@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 745 bytes --]

On Wed, 2003-02-12 at 08:45, Andrew Cagney wrote:
> ``interpreter_p'' is -><- close to being made local to captured_main.

Ahh. Ok, that gives me a new criteria for considering where to put such
changes.

> Otherwize ok,

New patch attachd. Note that I've corrected the top.o/gdb.o mishap in
the makefile.

Keith

PS. Anyone want to talk about deprecating "-nw" and "-w" (or aliasing
them to doing the same as "-i=console" and ???)?

ChangeLog
2003-02-12  Keith R Seitz  <keiths@redhat.com>

        * main.h (struct captured_main_args): Add interpreter_p.
        * main.c (captured_main): Initialize interpreter_p from context.
        * gdb.c (main): Set interpreter_p argument.
        * Makefile.in (gdb.o): Add dependency for interps.h.



[-- Attachment #2: p --]
[-- Type: text/x-patch, Size: 2693 bytes --]

Index: Makefile.in
===================================================================
RCS file: /cvs/src/src/gdb/Makefile.in,v
retrieving revision 1.329
diff -u -p -r1.329 Makefile.in
--- Makefile.in	11 Feb 2003 16:11:16 -0000	1.329
+++ Makefile.in	12 Feb 2003 17:13:17 -0000
@@ -1682,7 +1682,7 @@ frv-tdep.o: frv-tdep.c $(defs_h) $(infer
 	$(arch_utils_h) $(regcache_h)
 gcore.o: gcore.c $(defs_h) $(cli_decode_h) $(inferior_h) $(gdbcore_h) \
 	$(elf_bfd_h) $(symfile_h) $(objfiles_h)
-gdb.o: gdb.c $(defs_h) $(main_h) $(gdb_string_h)
+gdb.o: gdb.c $(defs_h) $(main_h) $(gdb_string_h) $(interps_h)
 gdb-events.o: gdb-events.c $(defs_h) $(gdb_events_h) $(gdbcmd_h)
 gdbarch.o: gdbarch.c $(defs_h) $(arch_utils_h) $(gdbcmd_h) $(inferior_h) \
 	$(gdb_string_h) $(symtab_h) $(frame_h) $(inferior_h) $(breakpoint_h) \
Index: main.c
===================================================================
RCS file: /cvs/src/src/gdb/main.c,v
retrieving revision 1.27
diff -u -p -r1.27 main.c
--- main.c	7 Feb 2003 00:27:30 -0000	1.27
+++ main.c	12 Feb 2003 17:13:17 -0000
@@ -229,10 +229,10 @@ captured_main (void *data)
 #endif
 
   /* There will always be an interpreter.  Either the one passed into
-     this captured main (not yet implemented), or one specified by the
-     user at start up, or the console.  Make life easier by always
-     initializing the interpreter to something.  */
-  interpreter_p = xstrdup (INTERP_CONSOLE);
+     this captured main, or one specified by the user at start up, or
+     the console.  Initialize the interpreter to the one requested by 
+     the application.  */
+  interpreter_p = xstrdup (context->interpreter_p);
 
   /* Parse arguments and options.  */
   {
Index: main.h
===================================================================
RCS file: /cvs/src/src/gdb/main.h,v
retrieving revision 1.1
diff -u -p -r1.1 main.h
--- main.h	26 Sep 2002 17:46:04 -0000	1.1
+++ main.h	12 Feb 2003 17:13:17 -0000
@@ -27,6 +27,7 @@ struct captured_main_args
   int argc;
   char **argv;
   int use_windows;
+  const char *interpreter_p;
 };
 
 extern int gdb_main (struct captured_main_args *);
Index: gdb.c
===================================================================
RCS file: /cvs/src/src/gdb/gdb.c,v
retrieving revision 1.1
diff -u -p -r1.1 gdb.c
--- gdb.c	26 Sep 2002 17:46:04 -0000	1.1
+++ gdb.c	12 Feb 2003 17:13:17 -0000
@@ -21,6 +21,7 @@
 #include "defs.h"
 #include "main.h"
 #include "gdb_string.h"
+#include "interps.h"
 
 int
 main (int argc, char **argv)
@@ -30,5 +31,6 @@ main (int argc, char **argv)
   args.argc = argc;
   args.argv = argv;
   args.use_windows = 0;
+  args.interpreter_p = INTERP_CONSOLE;
   return gdb_main (&args);
 }