* main.c (enable_external_editor): Don't declare.

[binutils-gdb.git] / gdb / main.c

diff --git a/gdb/main.c b/gdb/main.c
index 185b46ec9f164a6e4a6fd6ffbcbd2595682e6739..2e69d800a2c31bb53bf1ba5e7b57a4963bc44df5 100644 (file)
--- a/gdb/main.c
+++ b/gdb/main.c
@@ -1,5 +1,6 @@
 /* Top level stuff for GDB, the GNU debugger.
-   Copyright 1986-1995, 1999-2000 Free Software Foundation, Inc.
+   Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995,
+   1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -34,11 +35,6 @@
 #include "gdb_string.h"
 #include "event-loop.h"
 #include "ui-out.h"
-#if defined (TUI) || defined (GDBTK)
-/* FIXME: cagney/2000-01-31: This #include is to allow older code such
-   as that found in the TUI to continue to build. */
-#include "tui/tui-file.h"
-#endif
 
 /* If nonzero, display time usage both at startup and for each command.  */
 
@@ -85,14 +81,8 @@ static void print_gdb_help (struct ui_file *);
 /* These two are used to set the external editor commands when gdb is farming
    out files to be edited by another program. */
 
-extern int enable_external_editor;
 extern char *external_editor_command;
 
-#ifdef __CYGWIN__
-#include <windows.h>           /* for MAX_PATH */
-#include <sys/cygwin.h>                /* for cygwin32_conv_to_posix_path */
-#endif
-
 /* Call command_loop.  If it happens to return, pass that through as a
    non-zero return status. */
 
@@ -198,20 +188,10 @@ captured_main (void *data)
   getcwd (gdb_dirbuf, sizeof (gdb_dirbuf));
   current_directory = gdb_dirbuf;
 
-#if defined (TUI) || defined (GDBTK)
-  /* Older code uses the tui_file and fputs_unfiltered_hook().  It
-     should be using a customized UI_FILE object and re-initializing
-     within its own _initialize function.  */
-  gdb_stdout = tui_fileopen (stdout);
-  gdb_stderr = tui_fileopen (stderr);
-  gdb_stdlog = gdb_stdout;     /* for moment */
-  gdb_stdtarg = gdb_stderr;    /* for moment */
-#else
   gdb_stdout = stdio_fileopen (stdout);
   gdb_stderr = stdio_fileopen (stderr);
   gdb_stdlog = gdb_stderr;     /* for moment */
   gdb_stdtarg = gdb_stderr;    /* for moment */
-#endif
 
   /* initialize error() */
   error_init ();
@@ -360,23 +340,10 @@ extern int gdbtk_test (char *);
              break;
            }
          case 'y':
-           {
-             /*
-              * This enables the edit/button in the main window, even
-              * when IDE_ENABLED is set to false. In this case you must
-              * use --tclcommand to specify a tcl/script to be called,
-              * Tcl/Variable to store the edit/command is:
-              * external_editor
-              */
-             enable_external_editor = 1;
-             break;
-           }
+           /* Backwards compatibility only.  */
+           break;
          case 'w':
            {
-             /*
-              * if editor command is enabled, both flags are set
-              */
-             enable_external_editor = 1;
              external_editor_command = xstrdup (optarg);
              break;
            }
@@ -488,12 +455,6 @@ extern int gdbtk_test (char *);
       quiet = 1;
   }
 
-#if defined(TUI)
-  /* Should this be moved to tui-top.c:_initialize_tui()? */
-  if (tui_version)
-    init_ui_hook = tuiInit;
-#endif
-
   /* Initialize all files.  Give the interpreter a chance to take
      control of the console via the init_ui_hook()) */
   gdb_init (argv[0]);
@@ -536,21 +497,7 @@ extern int gdbtk_test (char *);
      *before* all the command line arguments are processed; it sets
      global parameters, which are independent of what file you are
      debugging or what directory you are in.  */
-#ifdef __CYGWIN32__
-  {
-    char *tmp = getenv ("HOME");
-
-    if (tmp != NULL)
-      {
-       homedir = (char *) alloca (MAX_PATH + 1);
-       cygwin32_conv_to_posix_path (tmp, homedir);
-      }
-    else
-      homedir = NULL;
-  }
-#else
   homedir = getenv ("HOME");
-#endif
   if (homedir)
     {
       homeinit = (char *) alloca (strlen (homedir) +
@@ -708,13 +655,6 @@ extern int gdbtk_test (char *);
 #endif
     }
 
-  /* The default command loop. 
-     The WIN32 Gui calls this main to set up gdb's state, and 
-     has its own command loop. */
-#if !defined _WIN32 || defined __GNUC__
-  /* GUIs generally have their own command loop, mainloop, or
-     whatever.  This is a good place to gain control because many
-     error conditions will end up here via longjmp(). */
 #if 0
   /* FIXME: cagney/1999-11-06: The original main loop was like: */
   while (1)
@@ -750,7 +690,6 @@ extern int gdbtk_test (char *);
     {
       catch_errors (captured_command_loop, 0, "", RETURN_MASK_ALL);
     }
-#endif
   /* No exit -- exit is through quit_command.  */
 }