2003-03-01 Andrew Cagney <cagney@redhat.com>

	* main.c (captured_main): Add OPT_WINDOWS and OPT_NOWINDOWS to
	option enum and switch.  When no windows, set the interpreter to
	INTERP_CONSOLE.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e717c2685b94c72a583999d596603a4badaad6b1..ec67fe3b89c683e95397284fd7616c9cc3fad612 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2003-03-01  Andrew Cagney  <cagney@redhat.com>
+
+       * main.c (captured_main): Add OPT_WINDOWS and OPT_NOWINDOWS to
+       option enum and switch.  When no windows, set the interpreter to
+       INTERP_CONSOLE.
+       
 2003-03-01  Andrew Cagney  <cagney@redhat.com>
 
        * main.c (captured_main): Replace magic option characters with an

diff --git a/gdb/main.c b/gdb/main.c
index fa976ea14a5805fc4678a9510207d4c2a68c5688..559c521c947cceec2f2977037b51e395e9d8667e 100644 (file)
--- a/gdb/main.c
+++ b/gdb/main.c
@@ -242,7 +242,9 @@ captured_main (void *data)
       OPT_CD,
       OPT_ANNOTATE,
       OPT_STATISTICS,
-      OPT_TUI
+      OPT_TUI,
+      OPT_NOWINDOWS,
+      OPT_WINDOWS
     };
     static struct option long_options[] =
     {
@@ -299,10 +301,10 @@ captured_main (void *data)
       {"tty", required_argument, 0, 't'},
       {"baud", required_argument, 0, 'b'},
       {"b", required_argument, 0, 'b'},
-      {"nw", no_argument, &use_windows, 0},
-      {"nowindows", no_argument, &use_windows, 0},
-      {"w", no_argument, &use_windows, 1},
-      {"windows", no_argument, &use_windows, 1},
+      {"nw", no_argument, NULL, OPT_NOWINDOWS},
+      {"nowindows", no_argument, NULL, OPT_NOWINDOWS},
+      {"w", no_argument, NULL, OPT_WINDOWS},
+      {"windows", no_argument, NULL, OPT_WINDOWS},
       {"statistics", no_argument, 0, OPT_STATISTICS},
       {"write", no_argument, &write_files, 1},
       {"args", no_argument, &set_args, 1},
@@ -348,6 +350,17 @@ captured_main (void *data)
            xfree (interpreter_p);
            interpreter_p = xstrdup ("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.  */
+           use_windows = 1;
+           break;
+         case OPT_NOWINDOWS:
+           /* -nw is equivalent to -i=console.  */
+           xfree (interpreter_p);
+           interpreter_p = xstrdup (INTERP_CONSOLE);
+           use_windows = 0;
+           break;
          case 'f':
            annotation_level = 1;
 /* We have probably been invoked from emacs.  Disable window interface.  */