/* Top level stuff for GDB, the GNU debugger.
- Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995
- 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.
+ This file is part of GDB.
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
#include "defs.h"
#include "top.h"
#include "target.h"
#include "inferior.h"
-#include "call-cmds.h"
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
+#include "symfile.h"
+#include "gdbcore.h"
#include "getopt.h"
#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. */
int display_space;
/* Whether this is the async version or not. The async version is
-invoked on the command line with the -nw --async options. In this
-version, the usual command_loop is substituted by and event loop which
-processes UI events asynchronously. */
-int async_p = 0;
+ invoked on the command line with the -nw --async options. In this
+ version, the usual command_loop is substituted by and event loop which
+ processes UI events asynchronously. */
+int event_loop_p = 1;
+
+#ifdef UI_OUT
+/* Has an interpreter been specified and if so, which. */
+char *interpreter_p;
+#endif
/* Whether this is the command line version or not */
int tui_version = 0;
/* Whether dbx commands will be handled */
int dbx_commands = 0;
-GDB_FILE *gdb_stdout;
-GDB_FILE *gdb_stderr;
-GDB_FILE *gdb_stdlog;
+struct ui_file *gdb_stdout;
+struct ui_file *gdb_stderr;
+struct ui_file *gdb_stdlog;
+struct ui_file *gdb_stdtarg;
+
+/* Used to initialize error() - defined in utils.c */
+
+extern void error_init (void);
/* Whether to enable writing into executable and core files */
extern int write_files;
-static void print_gdb_help PARAMS ((GDB_FILE *));
+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;
+extern char *external_editor_command;
#ifdef __CYGWIN__
-#include <windows.h> /* for MAX_PATH */
-#include <sys/cygwin.h> /* for cygwin32_conv_to_posix_path */
+#include <windows.h> /* for MAX_PATH */
+#include <sys/cygwin.h> /* for cygwin32_conv_to_posix_path */
#endif
-int
-main (argc, argv)
- int argc;
- char **argv;
+/* Call command_loop. If it happens to return, pass that through as a
+ non-zero return status. */
+
+static int
+captured_command_loop (void *data)
+{
+ if (command_loop_hook == NULL)
+ command_loop ();
+ else
+ command_loop_hook ();
+ /* FIXME: cagney/1999-11-05: A correct command_loop() implementaton
+ would clean things up (restoring the cleanup chain) to the state
+ they were just prior to the call. Technically, this means that
+ the do_cleanups() below is redundant. Unfortunately, many FUNCs
+ are not that well behaved. do_cleanups should either be replaced
+ with a do_cleanups call (to cover the problem) or an assertion
+ check to detect bad FUNCs code. */
+ do_cleanups (ALL_CLEANUPS);
+ /* If the command_loop returned, normally (rather than threw an
+ error) we try to quit. If the quit is aborted, catch_errors()
+ which called this catch the signal and restart the command
+ loop. */
+ quit_command (NULL, instream == stdin);
+ return 1;
+}
+
+struct captured_main_args
+ {
+ int argc;
+ char **argv;
+ };
+
+static int
+captured_main (void *data)
{
+ struct captured_main_args *context = data;
+ int argc = context->argc;
+ char **argv = context->argv;
int count;
static int quiet = 0;
static int batch = 0;
int dirsize;
/* Number of elements used. */
int ndir;
-
+
struct stat homebuf, cwdbuf;
char *homedir, *homeinit;
long time_at_startup = get_run_time ();
- int gdb_file_size;
-
START_PROGRESS (argv[0], 0);
#ifdef MPW
alloca (4 - i);
#endif
- /* If error() is called from initialization code, just exit */
- if (SET_TOP_LEVEL ()) {
- exit(1);
- }
-
cmdsize = 1;
cmdarg = (char **) xmalloc (cmdsize * sizeof (*cmdarg));
ncmd = 0;
getcwd (gdb_dirbuf, sizeof (gdb_dirbuf));
current_directory = gdb_dirbuf;
-#if 0
- /* not yet */
- gdb_stdout = stdio_fileopen (stdout);
- gdb_stderr = stdio_fileopen (stderr);
- gdb_stdlog = gdb_stderr; /* for moment */
-#else
+#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_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 ();
+
/* Parse arguments and options. */
{
int c;
short option (or arbitrary numbers starting at 10 for those
with no equivalent). */
static struct option long_options[] =
- {
- {"async", no_argument, &async_p, 1},
- {"noasync", no_argument, &async_p, 0},
+ {
+ {"async", no_argument, &event_loop_p, 1},
+ {"noasync", no_argument, &event_loop_p, 0},
#if defined(TUI)
- {"tui", no_argument, &tui_version, 1},
+ {"tui", no_argument, &tui_version, 1},
+#endif
+ {"xdb", no_argument, &xdb_commands, 1},
+ {"dbx", no_argument, &dbx_commands, 1},
+ {"readnow", no_argument, &readnow_symbol_files, 1},
+ {"r", no_argument, &readnow_symbol_files, 1},
+ {"mapped", no_argument, &mapped_symbol_files, 1},
+ {"m", no_argument, &mapped_symbol_files, 1},
+ {"quiet", no_argument, &quiet, 1},
+ {"q", no_argument, &quiet, 1},
+ {"silent", no_argument, &quiet, 1},
+ {"nx", no_argument, &inhibit_gdbinit, 1},
+ {"n", no_argument, &inhibit_gdbinit, 1},
+ {"batch", no_argument, &batch, 1},
+ {"epoch", no_argument, &epoch_interface, 1},
+
+ /* This is a synonym for "--annotate=1". --annotate is now preferred,
+ but keep this here for a long time because people will be running
+ emacses which use --fullname. */
+ {"fullname", no_argument, 0, 'f'},
+ {"f", no_argument, 0, 'f'},
+
+ {"annotate", required_argument, 0, 12},
+ {"help", no_argument, &print_help, 1},
+ {"se", required_argument, 0, 10},
+ {"symbols", required_argument, 0, 's'},
+ {"s", required_argument, 0, 's'},
+ {"exec", required_argument, 0, 'e'},
+ {"e", required_argument, 0, 'e'},
+ {"core", required_argument, 0, 'c'},
+ {"c", required_argument, 0, 'c'},
+ {"command", required_argument, 0, 'x'},
+ {"version", no_argument, &print_version, 1},
+ {"x", required_argument, 0, 'x'},
+#ifdef GDBTK
+ {"tclcommand", required_argument, 0, 'z'},
+ {"enable-external-editor", no_argument, 0, 'y'},
+ {"editor-command", required_argument, 0, 'w'},
#endif
- {"xdb", no_argument, &xdb_commands, 1},
- {"dbx", no_argument, &dbx_commands, 1},
- {"readnow", no_argument, &readnow_symbol_files, 1},
- {"r", no_argument, &readnow_symbol_files, 1},
- {"mapped", no_argument, &mapped_symbol_files, 1},
- {"m", no_argument, &mapped_symbol_files, 1},
- {"quiet", no_argument, &quiet, 1},
- {"q", no_argument, &quiet, 1},
- {"silent", no_argument, &quiet, 1},
- {"nx", no_argument, &inhibit_gdbinit, 1},
- {"n", no_argument, &inhibit_gdbinit, 1},
- {"batch", no_argument, &batch, 1},
- {"epoch", no_argument, &epoch_interface, 1},
-
- /* This is a synonym for "--annotate=1". --annotate is now preferred,
- but keep this here for a long time because people will be running
- emacses which use --fullname. */
- {"fullname", no_argument, 0, 'f'},
- {"f", no_argument, 0, 'f'},
-
- {"annotate", required_argument, 0, 12},
- {"help", no_argument, &print_help, 1},
- {"se", required_argument, 0, 10},
- {"symbols", required_argument, 0, 's'},
- {"s", required_argument, 0, 's'},
- {"exec", required_argument, 0, 'e'},
- {"e", required_argument, 0, 'e'},
- {"core", required_argument, 0, 'c'},
- {"c", required_argument, 0, 'c'},
- {"command", required_argument, 0, 'x'},
- {"version", no_argument, &print_version, 1},
- {"x", required_argument, 0, 'x'},
- {"directory", required_argument, 0, 'd'},
- {"cd", required_argument, 0, 11},
- {"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},
- {"statistics", no_argument, 0, 13},
- {"write", no_argument, &write_files, 1},
+#ifdef UI_OUT
+ {"ui", required_argument, 0, 'i'},
+ {"interpreter", required_argument, 0, 'i'},
+ {"i", required_argument, 0, 'i'},
+#endif
+ {"directory", required_argument, 0, 'd'},
+ {"d", required_argument, 0, 'd'},
+ {"cd", required_argument, 0, 11},
+ {"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},
+ {"statistics", no_argument, 0, 13},
+ {"write", no_argument, &write_files, 1},
/* Allow machine descriptions to add more options... */
#ifdef ADDITIONAL_OPTIONS
- ADDITIONAL_OPTIONS
+ ADDITIONAL_OPTIONS
#endif
- {0, no_argument, 0, 0}
- };
+ {0, no_argument, 0, 0}
+ };
while (1)
{
if (ncmd >= cmdsize)
{
cmdsize *= 2;
- cmdarg = (char **) xrealloc ((char *)cmdarg,
+ cmdarg = (char **) xrealloc ((char *) cmdarg,
cmdsize * sizeof (*cmdarg));
}
break;
+#ifdef GDBTK
+ case 'z':
+ {
+extern int gdbtk_test (char *);
+ if (!gdbtk_test (optarg))
+ {
+ fprintf_unfiltered (gdb_stderr, "%s: unable to load tclcommand file \"%s\"",
+ argv[0], optarg);
+ exit (1);
+ }
+ 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;
+ }
+ case 'w':
+ {
+ /*
+ * if editor command is enabled, both flags are set
+ */
+ enable_external_editor = 1;
+ external_editor_command = xstrdup (optarg);
+ break;
+ }
+#endif /* GDBTK */
+#ifdef UI_OUT
+ case 'i':
+ interpreter_p = optarg;
+ break;
+#endif
case 'd':
dirarg[ndir++] = optarg;
if (ndir >= dirsize)
{
dirsize *= 2;
- dirarg = (char **) xrealloc ((char *)dirarg,
+ dirarg = (char **) xrealloc ((char *) dirarg,
dirsize * sizeof (*dirarg));
}
break;
if (i == 0 && p == optarg)
/* Don't use *_filtered or warning() (which relies on
- current_target) until after initialize_all_files(). */
+ current_target) until after initialize_all_files(). */
fprintf_unfiltered
(gdb_stderr,
if (i == 0 && p == optarg)
/* Don't use *_filtered or warning() (which relies on
- current_target) until after initialize_all_files(). */
+ current_target) until after initialize_all_files(). */
fprintf_unfiltered
(gdb_stderr,
- "warning: could not set timeout limit to `%s'.\n", optarg);
+ "warning: could not set timeout limit to `%s'.\n", optarg);
else
remote_timeout = i;
}
break;
#ifdef ADDITIONAL_OPTION_CASES
- ADDITIONAL_OPTION_CASES
+ ADDITIONAL_OPTION_CASES
#endif
case '?':
fprintf_unfiltered (gdb_stderr,
- "Use `%s --help' for a complete list of options.\n",
- argv[0]);
+ "Use `%s --help' for a complete list of options.\n",
+ argv[0]);
exit (1);
}
}
window system. */
if (tui_version)
use_windows = 0;
-#endif
+#endif
/* OK, that's all the options. The other arguments are filenames. */
count = 0;
execarg = argv[optind];
break;
case 2:
+ /* FIXME: The documentation says this can be a "ProcID". as well. */
corearg = argv[optind];
break;
case 3:
fprintf_unfiltered (gdb_stderr,
- "Excess command line arguments ignored. (%s%s)\n",
- argv[optind], (optind == argc - 1) ? "" : " ...");
+ "Excess command line arguments ignored. (%s%s)\n",
+ argv[optind], (optind == argc - 1) ? "" : " ...");
break;
}
if (batch)
quiet = 1;
}
- /* Get ready to invoke the event loop instead of the
- command_loop. See event-loop.h for more details.*/
- if (async_p)
- command_loop_hook = start_event_loop;
#if defined(TUI)
/* Should this be moved to tui-top.c:_initialize_tui()? */
if (tui_version)
if (!quiet)
{
/* Print all the junk at the top, with trailing "..." if we are about
- to read a symbol file (possibly slowly). */
+ to read a symbol file (possibly slowly). */
print_gdb_version (gdb_stdout);
if (symarg)
printf_filtered ("..");
- wrap_here("");
- gdb_flush (gdb_stdout); /* Force to screen during slow operations */
+ wrap_here ("");
+ gdb_flush (gdb_stdout); /* Force to screen during slow operations */
}
error_pre_print = "\n\n";
debugging or what directory you are in. */
#ifdef __CYGWIN32__
{
- char * tmp = getenv ("HOME");
-
+ char *tmp = getenv ("HOME");
+
if (tmp != NULL)
{
- homedir = (char *) alloca (MAX_PATH+1);
- cygwin32_conv_to_posix_path (tmp, homedir);
+ homedir = (char *) alloca (MAX_PATH + 1);
+ cygwin32_conv_to_posix_path (tmp, homedir);
}
else
homedir = NULL;
}
#else
- homedir = getenv ("HOME");
+ homedir = getenv ("HOME");
#endif
if (homedir)
{
if (!inhibit_gdbinit)
{
- if (!SET_TOP_LEVEL ())
- source_command (homeinit, 0);
+ catch_command_errors (source_command, homeinit, 0, RETURN_MASK_ALL);
}
- do_cleanups (ALL_CLEANUPS);
/* Do stats; no need to do them elsewhere since we'll only
- need them if homedir is set. Make sure that they are
- zero in case one of them fails (this guarantees that they
- won't match if either exists). */
-
+ need them if homedir is set. Make sure that they are
+ zero in case one of them fails (this guarantees that they
+ won't match if either exists). */
+
memset (&homebuf, 0, sizeof (struct stat));
memset (&cwdbuf, 0, sizeof (struct stat));
-
+
stat (homeinit, &homebuf);
- stat (gdbinit, &cwdbuf); /* We'll only need this if
- homedir was set. */
+ stat (gdbinit, &cwdbuf); /* We'll only need this if
+ homedir was set. */
}
/* Now perform all the actions indicated by the arguments. */
if (cdarg != NULL)
{
- if (!SET_TOP_LEVEL ())
- {
- cd_command (cdarg, 0);
- }
+ catch_command_errors (cd_command, cdarg, 0, RETURN_MASK_ALL);
}
- do_cleanups (ALL_CLEANUPS);
for (i = 0; i < ndir; i++)
- if (!SET_TOP_LEVEL ())
- directory_command (dirarg[i], 0);
- free ((PTR)dirarg);
- do_cleanups (ALL_CLEANUPS);
+ catch_command_errors (directory_command, dirarg[i], 0, RETURN_MASK_ALL);
+ xfree (dirarg);
if (execarg != NULL
&& symarg != NULL
&& STREQ (execarg, symarg))
{
- /* The exec file and the symbol-file are the same. If we can't open
- it, better only print one error message. */
- if (!SET_TOP_LEVEL ())
- {
- exec_file_command (execarg, !batch);
- symbol_file_command (symarg, 0);
- }
+ /* The exec file and the symbol-file are the same. If we can't
+ open it, better only print one error message.
+ catch_command_errors returns non-zero on success! */
+ if (catch_command_errors (exec_file_attach, execarg, !batch, RETURN_MASK_ALL))
+ catch_command_errors (symbol_file_add_main, symarg, 0, RETURN_MASK_ALL);
}
else
{
if (execarg != NULL)
- if (!SET_TOP_LEVEL ())
- exec_file_command (execarg, !batch);
+ catch_command_errors (exec_file_attach, execarg, !batch, RETURN_MASK_ALL);
if (symarg != NULL)
- if (!SET_TOP_LEVEL ())
- symbol_file_command (symarg, 0);
+ catch_command_errors (symbol_file_add_main, symarg, 0, RETURN_MASK_ALL);
}
- do_cleanups (ALL_CLEANUPS);
/* After the symbol file has been read, print a newline to get us
beyond the copyright line... But errors should still set off
if (corearg != NULL)
{
- if (!SET_TOP_LEVEL ())
- core_file_command (corearg, !batch);
- else if (isdigit (corearg[0]) && !SET_TOP_LEVEL ())
- attach_command (corearg, !batch);
+ if (catch_command_errors (core_file_command, corearg, !batch, RETURN_MASK_ALL) == 0)
+ {
+ /* See if the core file is really a PID. */
+ if (isdigit (corearg[0]))
+ catch_command_errors (attach_command, corearg, !batch, RETURN_MASK_ALL);
+ }
}
- do_cleanups (ALL_CLEANUPS);
if (ttyarg != NULL)
- if (!SET_TOP_LEVEL ())
- tty_command (ttyarg, !batch);
- do_cleanups (ALL_CLEANUPS);
+ catch_command_errors (tty_command, ttyarg, !batch, RETURN_MASK_ALL);
#ifdef ADDITIONAL_OPTION_HANDLER
ADDITIONAL_OPTION_HANDLER;
/* Read the .gdbinit file in the current directory, *if* it isn't
the same as the $HOME/.gdbinit file (it should exist, also). */
-
+
if (!homedir
|| memcmp ((char *) &homebuf, (char *) &cwdbuf, sizeof (struct stat)))
if (!inhibit_gdbinit)
{
- if (!SET_TOP_LEVEL ())
- source_command (gdbinit, 0);
+ catch_command_errors (source_command, gdbinit, 0, RETURN_MASK_ALL);
}
- do_cleanups (ALL_CLEANUPS);
for (i = 0; i < ncmd; i++)
{
- if (!SET_TOP_LEVEL ())
+#if 0
+ /* NOTE: cagney/1999-11-03: SET_TOP_LEVEL() was a macro that
+ expanded into a call to setjmp(). */
+ if (!SET_TOP_LEVEL ()) /* NB: This is #if 0'd out */
{
/* NOTE: I am commenting this out, because it is not clear
where this feature is used. It is very old and
- undocumented. ezannoni: 1999-05-04*/
+ undocumented. ezannoni: 1999-05-04 */
#if 0
if (cmdarg[i][0] == '-' && cmdarg[i][1] == '\0')
read_command_file (stdin);
source_command (cmdarg[i], !batch);
do_cleanups (ALL_CLEANUPS);
}
+#endif
+ catch_command_errors (source_command, cmdarg[i], !batch, RETURN_MASK_ALL);
}
- free ((PTR)cmdarg);
+ xfree (cmdarg);
/* Read in the old history after all the command files have been read. */
- init_history();
+ init_history ();
if (batch)
{
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)
{
if (!SET_TOP_LEVEL ())
{
- do_cleanups (ALL_CLEANUPS); /* Do complete cleanup */
+ do_cleanups (ALL_CLEANUPS); /* Do complete cleanup */
/* 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(). */
command_loop_hook ();
else
command_loop ();
- quit_command ((char *)0, instream == stdin);
+ quit_command ((char *) 0, instream == stdin);
}
}
- /* No exit -- exit is through quit_command. */
+ /* NOTE: If the command_loop() returned normally, the loop would
+ attempt to exit by calling the function quit_command(). That
+ function would either call exit() or throw an error returning
+ control to SET_TOP_LEVEL. */
+ /* NOTE: The function do_cleanups() was called once each time round
+ the loop. The usefulness of the call isn't clear. If an error
+ was thrown, everything would have already been cleaned up. If
+ command_loop() returned normally and quit_command() was called,
+ either exit() or error() (again cleaning up) would be called. */
+#endif
+ /* NOTE: cagney/1999-11-07: There is probably no reason for not
+ moving this loop and the code found in captured_command_loop()
+ into the command_loop() proper. The main thing holding back that
+ change - SET_TOP_LEVEL() - has been eliminated. */
+ while (1)
+ {
+ catch_errors (captured_command_loop, 0, "", RETURN_MASK_ALL);
+ }
#endif
+ /* No exit -- exit is through quit_command. */
+}
+int
+main (int argc, char **argv)
+{
+ struct captured_main_args args;
+ args.argc = argc;
+ args.argv = argv;
+ catch_errors (captured_main, &args, "", RETURN_MASK_ALL);
+ return 0;
}
+
/* Don't use *_filtered for printing help. We don't want to prompt
for continue no matter how small the screen or how much we're going
to print. */
static void
-print_gdb_help (stream)
- GDB_FILE *stream;
+print_gdb_help (struct ui_file *stream)
{
- fputs_unfiltered ("\
+ fputs_unfiltered ("\
This is the GNU debugger. Usage:\n\n\
gdb [options] [executable-file [core-file or process-id]]\n\n\
Options:\n\n\
", stream);
- fputs_unfiltered ("\
+ fputs_unfiltered ("\
--[no]async Enable (disable) asynchronous version of CLI\n\
", stream);
- fputs_unfiltered ("\
+ fputs_unfiltered ("\
-b BAUDRATE Set serial port baud rate used for remote debugging.\n\
--batch Exit after processing options.\n\
--cd=DIR Change current directory to DIR.\n\
--command=FILE Execute GDB commands from FILE.\n\
--core=COREFILE Analyze the core dump COREFILE.\n\
", stream);
- fputs_unfiltered ("\
+ fputs_unfiltered ("\
--dbx DBX compatibility mode.\n\
--directory=DIR Search for source files in DIR.\n\
--epoch Output information used by epoch emacs-GDB interface.\n\
--fullname Output information used by emacs-GDB interface.\n\
--help Print this message.\n\
", stream);
- fputs_unfiltered ("\
+ fputs_unfiltered ("\
+ --interpreter=INTERP\n\
+ Select a specific interpreter / user interface\n\
+", stream);
+ fputs_unfiltered ("\
--mapped Use mapped symbol files if supported on this system.\n\
--nw Do not use a window interface.\n\
- --nx Do not read .gdbinit file.\n\
+ --nx Do not read ", stream);
+ fputs_unfiltered (gdbinit, stream);
+ fputs_unfiltered (" file.\n\
--quiet Do not print version number on startup.\n\
--readnow Fully read symbol files on first access.\n\
", stream);
- fputs_unfiltered ("\
+ fputs_unfiltered ("\
--se=FILE Use FILE as symbol file and executable file.\n\
--symbols=SYMFILE Read symbols from SYMFILE.\n\
--tty=TTY Use TTY for input/output by the program being debugged.\n\
", stream);
#if defined(TUI)
- fputs_unfiltered ("\
+ fputs_unfiltered ("\
--tui Use a terminal user interface.\n\
", stream);
#endif
- fputs_unfiltered ("\
+ fputs_unfiltered ("\
--version Print version information and then exit.\n\
-w Use a window interface.\n\
--write Set writing into executable and core files.\n\
--xdb XDB compatibility mode.\n\
", stream);
#ifdef ADDITIONAL_OPTION_HELP
- fputs_unfiltered (ADDITIONAL_OPTION_HELP, stream);
+ fputs_unfiltered (ADDITIONAL_OPTION_HELP, stream);
#endif
- fputs_unfiltered ("\n\
+ fputs_unfiltered ("\n\
For more information, type \"help\" from within GDB, or consult the\n\
GDB manual (available as on-line info or a printed manual).\n\
-Report bugs to \"bug-gdb@prep.ai.mit.edu\".\
+Report bugs to \"bug-gdb@gnu.org\".\
", stream);
}
-
-\f
-/* All TUI I/O sent to the *_filtered and *_unfiltered functions
- eventually ends up here. The fputs_unfiltered_hook is primarily
- used by GUIs to collect all output and send it to the GUI, instead
- of the controlling terminal. Only output to gdb_stdout and
- gdb_stderr are sent to the hook. Everything else is sent on to
- fputs to allow file I/O to be handled appropriately. */
-
-/* FIXME: Should be broken up and moved to a TUI specific file. */
-
-void
-tui_file_fputs (linebuffer, file)
- const char *linebuffer;
- GDB_FILE *file;
-{
- struct tui_stream *stream = gdb_file_data (file);
-#if defined(TUI)
- extern int tui_owns_terminal;
-#endif
- /* If anything (GUI, TUI) wants to capture GDB output, this is
- * the place... the way to do it is to set up
- * fputs_unfiltered_hook.
- * Our TUI ("gdb -tui") used to hook output, but in the
- * new (XDB style) scheme, we do not do that anymore... - RT
- */
- if (fputs_unfiltered_hook
- && (file == gdb_stdout
- || file == gdb_stderr))
- fputs_unfiltered_hook (linebuffer, file);
- else
- {
-#if defined(TUI)
- if (tui_version && tui_owns_terminal) {
- /* If we get here somehow while updating the TUI (from
- * within a tuiDo(), then we need to temporarily
- * set up the terminal for GDB output. This probably just
- * happens on error output.
- */
-
- if (stream->ts_streamtype == astring) {
- gdb_file_adjust_strbuf(strlen(linebuffer), stream);
- strcat(stream->ts_strbuf, linebuffer);
- } else {
- tuiTermUnsetup(0, (tui_version) ? cmdWin->detail.commandInfo.curch : 0);
- fputs (linebuffer, stream->ts_filestream);
- tuiTermSetup(0);
- if (linebuffer[strlen(linebuffer) - 1] == '\n')
- tuiClearCommandCharCount();
- else
- tuiIncrCommandCharCountBy(strlen(linebuffer));
- }
- } else {
- /* The normal case - just do a fputs() */
- if (stream->ts_streamtype == astring) {
- gdb_file_adjust_strbuf(strlen(linebuffer), stream);
- strcat(stream->ts_strbuf, linebuffer);
- } else fputs (linebuffer, stream->ts_filestream);
- }
-
-
-#else
- if (stream->ts_streamtype == astring) {
- gdb_file_adjust_strbuf(strlen(linebuffer), file);
- strcat(stream->ts_strbuf, linebuffer);
- } else fputs (linebuffer, stream->ts_filestream);
-#endif
- }
-}
projects / deliverable / binutils-gdb.git / blobdiff