X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fmain.c;h=8f276b44735c8962e372a5fa9a39f986641b9e95;hb=fed040c6a50399617d8265cbddc7fd21b3f134ef;hp=155b6099773b2557ee334d6a5a6874ccd5d620be;hpb=8efd8e789a187d613e4ba8644eac831f54759e60;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/main.c b/gdb/main.c index 155b609977..8f276b4473 100644 --- a/gdb/main.c +++ b/gdb/main.c @@ -1,6 +1,6 @@ /* Top level stuff for GDB, the GNU debugger. - Copyright (C) 1986-2005, 2007-2012 Free Software Foundation, Inc. + Copyright (C) 1986-2015 Free Software Foundation, Inc. This file is part of GDB. @@ -23,15 +23,11 @@ #include "inferior.h" #include "symfile.h" #include "gdbcore.h" - -#include "exceptions.h" #include "getopt.h" #include -#include "gdb_stat.h" +#include #include - -#include "gdb_string.h" #include "event-loop.h" #include "ui-out.h" @@ -39,9 +35,15 @@ #include "main.h" #include "source.h" #include "cli/cli-cmds.h" -#include "python/python.h" #include "objfiles.h" #include "auto-load.h" +#include "maint.h" + +#include "filenames.h" +#include "filestuff.h" +#include +#include "event-top.h" +#include "infrun.h" /* The selected interpreter. This will be used as a set command variable, so it should always be malloc'ed - since @@ -60,6 +62,11 @@ char *gdb_sysroot = 0; /* GDB datadir, used to store data files. */ char *gdb_datadir = 0; +/* Non-zero if GDB_DATADIR was provided on the command line. + This doesn't track whether data-directory is set later from the + command line, but we don't reread system.gdbinit when that happens. */ +static int gdb_datadir_provided = 0; + /* If gdb was configured with --with-python=/path, the possibly relocated path to python's lib directory. */ char *python_libdir = 0; @@ -89,8 +96,50 @@ int return_child_result_value = -1; /* GDB as it has been invoked from the command line (i.e. argv[0]). */ static char *gdb_program_name; +/* Return read only pointer to GDB_PROGRAM_NAME. */ +const char * +get_gdb_program_name (void) +{ + return gdb_program_name; +} + static void print_gdb_help (struct ui_file *); +/* Set the data-directory parameter to NEW_DATADIR. + If NEW_DATADIR is not a directory then a warning is printed. + We don't signal an error for backward compatibility. */ + +void +set_gdb_data_directory (const char *new_datadir) +{ + struct stat st; + + if (stat (new_datadir, &st) < 0) + { + int save_errno = errno; + + fprintf_unfiltered (gdb_stderr, "Warning: "); + print_sys_errmsg (new_datadir, save_errno); + } + else if (!S_ISDIR (st.st_mode)) + warning (_("%s is not a directory."), new_datadir); + + xfree (gdb_datadir); + gdb_datadir = gdb_realpath (new_datadir); + + /* gdb_realpath won't return an absolute path if the path doesn't exist, + but we still want to record an absolute path here. If the user entered + "../foo" and "../foo" doesn't exist then we'll record $(pwd)/../foo which + isn't canonical, but that's ok. */ + if (!IS_ABSOLUTE_PATH (gdb_datadir)) + { + char *abs_datadir = gdb_abspath (gdb_datadir); + + xfree (gdb_datadir); + gdb_datadir = abs_datadir; + } +} + /* Relocate a file or directory. PROGNAME is the name by which gdb was invoked (i.e., argv[0]). INITIAL is the default value for the file or directory. FLAG is true if the value is relocatable, false @@ -121,7 +170,7 @@ relocate_gdb_directory (const char *initial, int flag) { struct stat s; - if (stat (dir, &s) != 0 || !S_ISDIR (s.st_mode)) + if (*dir == '\0' || stat (dir, &s) != 0 || !S_ISDIR (s.st_mode)) { xfree (dir); dir = NULL; @@ -151,25 +200,50 @@ relocate_gdb_directory (const char *initial, int flag) to be loaded, then SYSTEM_GDBINIT (resp. HOME_GDBINIT and LOCAL_GDBINIT) is set to NULL. */ static void -get_init_files (char **system_gdbinit, - char **home_gdbinit, - char **local_gdbinit) +get_init_files (const char **system_gdbinit, + const char **home_gdbinit, + const char **local_gdbinit) { - static char *sysgdbinit = NULL; + static const char *sysgdbinit = NULL; static char *homeinit = NULL; - static char *localinit = NULL; + static const char *localinit = NULL; static int initialized = 0; if (!initialized) { struct stat homebuf, cwdbuf, s; - char *homedir, *relocated_sysgdbinit; + char *homedir; if (SYSTEM_GDBINIT[0]) { - relocated_sysgdbinit = relocate_path (gdb_program_name, - SYSTEM_GDBINIT, - SYSTEM_GDBINIT_RELOCATABLE); + int datadir_len = strlen (GDB_DATADIR); + int sys_gdbinit_len = strlen (SYSTEM_GDBINIT); + char *relocated_sysgdbinit; + + /* If SYSTEM_GDBINIT lives in data-directory, and data-directory + has been provided, search for SYSTEM_GDBINIT there. */ + if (gdb_datadir_provided + && datadir_len < sys_gdbinit_len + && filename_ncmp (SYSTEM_GDBINIT, GDB_DATADIR, datadir_len) == 0 + && IS_DIR_SEPARATOR (SYSTEM_GDBINIT[datadir_len])) + { + /* Append the part of SYSTEM_GDBINIT that follows GDB_DATADIR + to gdb_datadir. */ + char *tmp_sys_gdbinit = xstrdup (SYSTEM_GDBINIT + datadir_len); + char *p; + + for (p = tmp_sys_gdbinit; IS_DIR_SEPARATOR (*p); ++p) + continue; + relocated_sysgdbinit = concat (gdb_datadir, SLASH_STRING, p, + NULL); + xfree (tmp_sys_gdbinit); + } + else + { + relocated_sysgdbinit = relocate_path (gdb_program_name, + SYSTEM_GDBINIT, + SYSTEM_GDBINIT_RELOCATABLE); + } if (relocated_sysgdbinit && stat (relocated_sysgdbinit, &s) == 0) sysgdbinit = relocated_sysgdbinit; else @@ -213,13 +287,34 @@ get_init_files (char **system_gdbinit, *local_gdbinit = localinit; } +/* Try to set up an alternate signal stack for SIGSEGV handlers. + This allows us to handle SIGSEGV signals generated when the + normal process stack is exhausted. If this stack is not set + up (sigaltstack is unavailable or fails) and a SIGSEGV is + generated when the normal stack is exhausted then the program + will behave as though no SIGSEGV handler was installed. */ + +static void +setup_alternate_signal_stack (void) +{ +#ifdef HAVE_SIGALTSTACK + stack_t ss; + + ss.ss_sp = xmalloc (SIGSTKSZ); + ss.ss_size = SIGSTKSZ; + ss.ss_flags = 0; + + sigaltstack(&ss, NULL); +#endif +} + /* Call command_loop. If it happens to return, pass that through as a non-zero return status. */ static int captured_command_loop (void *data) { - /* Top-level execution commands can be run on the background from + /* Top-level execution commands can be run in the background from here on. */ interpreter_async = 1; @@ -240,22 +335,99 @@ captured_command_loop (void *data) return 1; } -/* Arguments of --command option and its counterpart. */ -typedef struct cmdarg { - /* Type of this option. */ - enum { - /* Option type -x. */ - CMDARG_FILE, +/* Handle command errors thrown from within + catch_command_errors/catch_command_errors_const. */ + +static int +handle_command_errors (struct gdb_exception e) +{ + if (e.reason < 0) + { + exception_print (gdb_stderr, e); + + /* If any exception escaped to here, we better enable stdin. + Otherwise, any command that calls async_disable_stdin, and + then throws, will leave stdin inoperable. */ + async_enable_stdin (); + return 0; + } + return 1; +} + +/* Type of the command callback passed to catch_command_errors. */ - /* Option type -ex. */ - CMDARG_COMMAND, +typedef void (catch_command_errors_ftype) (char *, int); - /* Option type -ix. */ - CMDARG_INIT_FILE, +/* Wrap calls to commands run before the event loop is started. */ + +static int +catch_command_errors (catch_command_errors_ftype *command, + char *arg, int from_tty) +{ + TRY + { + int was_sync = sync_execution; + + command (arg, from_tty); + + maybe_wait_sync_command_done (was_sync); + } + CATCH (e, RETURN_MASK_ALL) + { + return handle_command_errors (e); + } + END_CATCH + + return 1; +} + +/* Type of the command callback passed to catch_command_errors_const. */ + +typedef void (catch_command_errors_const_ftype) (const char *, int); + +/* Like catch_command_errors, but works with const command and args. */ + +static int +catch_command_errors_const (catch_command_errors_const_ftype *command, + const char *arg, int from_tty) +{ + TRY + { + int was_sync = sync_execution; + + command (arg, from_tty); + + maybe_wait_sync_command_done (was_sync); + } + CATCH (e, RETURN_MASK_ALL) + { + return handle_command_errors (e); + } + END_CATCH + + return 1; +} + +/* Type of this option. */ +enum cmdarg_kind +{ + /* Option type -x. */ + CMDARG_FILE, + + /* Option type -ex. */ + CMDARG_COMMAND, + + /* Option type -ix. */ + CMDARG_INIT_FILE, - /* Option type -iex. */ - CMDARG_INIT_COMMAND - } type; + /* Option type -iex. */ + CMDARG_INIT_COMMAND +}; + +/* Arguments of --command option and its counterpart. */ +typedef struct cmdarg { + /* Type of this option. */ + enum cmdarg_kind type; /* Value of this option - filename or the GDB command itself. String memory is not owned by this structure despite it is 'const'. */ @@ -273,6 +445,7 @@ captured_main (void *data) char **argv = context->argv; static int quiet = 0; static int set_args = 0; + static int inhibit_home_gdbinit = 0; /* Pointers to various arguments from command line. */ char *symarg = NULL; @@ -287,6 +460,7 @@ captured_main (void *data) initializer. */ static int print_help; static int print_version; + static int print_configuration; /* Pointers to all arguments of --command option. */ VEC (cmdarg_s) *cmdarg_vec = NULL; @@ -300,9 +474,9 @@ captured_main (void *data) int ndir; /* gdb init files. */ - char *system_gdbinit; - char *home_gdbinit; - char *local_gdbinit; + const char *system_gdbinit; + const char *home_gdbinit; + const char *local_gdbinit; int i; int save_auto_load; @@ -326,6 +500,9 @@ captured_main (void *data) bindtextdomain (PACKAGE, LOCALEDIR); textdomain (PACKAGE); + bfd_init (); + notice_open_fds (); + make_cleanup (VEC_cleanup (cmdarg_s), &cmdarg_vec); dirsize = 1; dirarg = (char **) xmalloc (dirsize * sizeof (*dirarg)); @@ -336,30 +513,47 @@ captured_main (void *data) saved_command_line[0] = '\0'; instream = stdin; +#ifdef __MINGW32__ + /* Ensure stderr is unbuffered. A Cygwin pty or pipe is implemented + as a Windows pipe, and Windows buffers on pipes. */ + setvbuf (stderr, NULL, _IONBF, BUFSIZ); +#endif + gdb_stdout = stdio_fileopen (stdout); - gdb_stderr = stdio_fileopen (stderr); + gdb_stderr = stderr_fileopen (); + gdb_stdlog = gdb_stderr; /* for moment */ gdb_stdtarg = gdb_stderr; /* for moment */ gdb_stdin = stdio_fileopen (stdin); gdb_stdtargerr = gdb_stderr; /* for moment */ gdb_stdtargin = gdb_stdin; /* for moment */ +#ifdef __MINGW32__ + /* On Windows, argv[0] is not necessarily set to absolute form when + GDB is found along PATH, without which relocation doesn't work. */ + gdb_program_name = windows_get_absolute_argv0 (argv[0]); +#else gdb_program_name = xstrdup (argv[0]); +#endif + + /* Prefix warning messages with the command name. */ + warning_pre_print = xstrprintf ("%s: warning: ", gdb_program_name); if (! getcwd (gdb_dirbuf, sizeof (gdb_dirbuf))) - /* Don't use *_filtered or warning() (which relies on - current_target) until after initialize_all_files(). */ - fprintf_unfiltered (gdb_stderr, - _("%s: warning: error finding " - "working directory: %s\n"), - argv[0], safe_strerror (errno)); - + perror_warning_with_name (_("error finding working directory")); + current_directory = gdb_dirbuf; /* Set the sysroot path. */ gdb_sysroot = relocate_gdb_directory (TARGET_SYSTEM_ROOT, TARGET_SYSTEM_ROOT_RELOCATABLE); + if (gdb_sysroot == NULL || *gdb_sysroot == '\0') + { + xfree (gdb_sysroot); + gdb_sysroot = xstrdup (TARGET_SYSROOT_PREFIX); + } + debug_file_directory = relocate_gdb_directory (DEBUGDIR, DEBUGDIR_RELOCATABLE); @@ -378,7 +572,7 @@ captured_main (void *data) #ifdef RELOC_SRCDIR add_substitute_path_rule (RELOC_SRCDIR, - make_relative_prefix (argv[0], BINDIR, + make_relative_prefix (gdb_program_name, BINDIR, RELOC_SRCDIR)); #endif @@ -415,11 +609,11 @@ captured_main (void *data) {"quiet", no_argument, &quiet, 1}, {"q", no_argument, &quiet, 1}, {"silent", no_argument, &quiet, 1}, + {"nh", no_argument, &inhibit_home_gdbinit, 1}, {"nx", no_argument, &inhibit_gdbinit, 1}, {"n", no_argument, &inhibit_gdbinit, 1}, {"batch-silent", no_argument, 0, 'B'}, {"batch", no_argument, &batch_flag, 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 @@ -441,6 +635,7 @@ captured_main (void *data) {"command", required_argument, 0, 'x'}, {"eval-command", required_argument, 0, 'X'}, {"version", no_argument, &print_version, 1}, + {"configuration", no_argument, &print_configuration, 1}, {"x", required_argument, 0, 'x'}, {"ex", required_argument, 0, 'X'}, {"init-command", required_argument, 0, OPT_IX}, @@ -458,6 +653,7 @@ captured_main (void *data) {"directory", required_argument, 0, 'd'}, {"d", required_argument, 0, 'd'}, {"data-directory", required_argument, 0, 'D'}, + {"D", required_argument, 0, 'D'}, {"cd", required_argument, 0, OPT_CD}, {"tty", required_argument, 0, 't'}, {"baud", required_argument, 0, 'b'}, @@ -505,8 +701,8 @@ captured_main (void *data) break; case OPT_STATISTICS: /* Enable the display of both time and space usage. */ - set_display_time (1); - set_display_space (1); + set_per_command_time (1); + set_per_command_space (1); break; case OPT_TUI: /* --tui is equivalent to -i=tui. */ @@ -514,10 +710,7 @@ captured_main (void *data) xfree (interpreter_p); interpreter_p = xstrdup (INTERP_TUI); #else - fprintf_unfiltered (gdb_stderr, - _("%s: TUI mode is not supported\n"), - argv[0]); - exit (1); + error (_("%s: TUI mode is not supported"), gdb_program_name); #endif break; case OPT_WINDOWS: @@ -528,19 +721,14 @@ captured_main (void *data) xfree (interpreter_p); interpreter_p = xstrdup (INTERP_INSIGHT); #endif - 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. */ - use_windows = 0; break; case 's': symarg = optarg; @@ -587,8 +775,11 @@ captured_main (void *data) gdb_stdout = ui_file_new(); break; case 'D': - xfree (gdb_datadir); - gdb_datadir = xstrdup (optarg); + if (optarg[0] == '\0') + error (_("%s: empty path for `--data-directory'"), + gdb_program_name); + set_gdb_data_directory (optarg); + gdb_datadir_provided = 1; break; #ifdef GDBTK case 'z': @@ -596,13 +787,8 @@ captured_main (void *data) 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); - } + error (_("%s: unable to load tclcommand file \"%s\""), + gdb_program_name, optarg); break; } case 'y': @@ -644,13 +830,8 @@ captured_main (void *data) i = strtol (optarg, &p, 0); if (i == 0 && p == optarg) - - /* Don't use *_filtered or warning() (which relies on - current_target) until after initialize_all_files(). */ - - fprintf_unfiltered - (gdb_stderr, - _("warning: could not set baud rate to `%s'.\n"), optarg); + warning (_("could not set baud rate to `%s'."), + optarg); else baud_rate = i; } @@ -662,40 +843,29 @@ captured_main (void *data) i = strtol (optarg, &p, 0); if (i == 0 && p == optarg) - - /* Don't use *_filtered or warning() (which relies on - 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'."), + optarg); else remote_timeout = i; } break; case '?': - fprintf_unfiltered (gdb_stderr, - _("Use `%s --help' for a " - "complete list of options.\n"), - argv[0]); - exit (1); + error (_("Use `%s --help' for a complete list of options."), + gdb_program_name); } } - /* If --help or --version, disable window interface. */ - if (print_help || print_version) - { - use_windows = 0; - } - if (batch_flag) quiet = 1; } + /* Try to set up an alternate signal stack for SIGSEGV handlers. */ + setup_alternate_signal_stack (); + /* Initialize all files. Give the interpreter a chance to take control of the console via the deprecated_init_ui_hook (). */ - gdb_init (argv[0]); + gdb_init (gdb_program_name); /* Now that gdb_init has created the initial inferior, we're in position to set args for that inferior. */ @@ -705,13 +875,9 @@ captured_main (void *data) inferior. The first one is the sym/exec file, and the rest are arguments. */ if (optind >= argc) - { - fprintf_unfiltered (gdb_stderr, - _("%s: `--args' specified but " - "no program specified\n"), - argv[0]); - exit (1); - } + error (_("%s: `--args' specified but no program specified"), + gdb_program_name); + symarg = argv[optind]; execarg = argv[optind]; ++optind; @@ -775,6 +941,14 @@ captured_main (void *data) exit (0); } + if (print_configuration) + { + print_gdb_configuration (gdb_stdout); + wrap_here (""); + printf_filtered ("\n"); + exit (0); + } + /* FIXME: cagney/2003-02-03: The big hack (part 1 of 2) that lets GDB retain the old MI1 interpreter startup behavior. Output the copyright message before the interpreter is installed. That way @@ -803,12 +977,7 @@ captured_main (void *data) error (_("Interpreter `%s' unrecognized"), interpreter_p); /* Install it. */ if (!interp_set (interp, 1)) - { - fprintf_unfiltered (gdb_stderr, - "Interpreter `%s' failed to initialize.\n", - interpreter_p); - exit (1); - } + error (_("Interpreter `%s' failed to initialize."), interpreter_p); } /* FIXME: cagney/2003-02-03: The big hack (part 2 of 2) that lets @@ -829,8 +998,7 @@ captured_main (void *data) } /* Set off error and warning messages with a blank line. */ - error_pre_print = "\n"; - quit_pre_print = error_pre_print; + xfree (warning_pre_print); warning_pre_print = _("\nwarning: "); /* Read and execute the system-wide gdbinit file, if it exists. @@ -838,38 +1006,38 @@ captured_main (void *data) processed; it sets global parameters, which are independent of what file you are debugging or what directory you are in. */ if (system_gdbinit && !inhibit_gdbinit) - catch_command_errors (source_script, system_gdbinit, 0, RETURN_MASK_ALL); + catch_command_errors_const (source_script, system_gdbinit, 0); /* Read and execute $HOME/.gdbinit file, if it exists. This is done *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. */ - if (home_gdbinit && !inhibit_gdbinit) - catch_command_errors (source_script, home_gdbinit, 0, RETURN_MASK_ALL); + if (home_gdbinit && !inhibit_gdbinit && !inhibit_home_gdbinit) + catch_command_errors_const (source_script, home_gdbinit, 0); /* Process '-ix' and '-iex' options early. */ for (i = 0; VEC_iterate (cmdarg_s, cmdarg_vec, i, cmdarg_p); i++) switch (cmdarg_p->type) { case CMDARG_INIT_FILE: - catch_command_errors (source_script, cmdarg_p->string, - !batch_flag, RETURN_MASK_ALL); + catch_command_errors_const (source_script, cmdarg_p->string, + !batch_flag); break; case CMDARG_INIT_COMMAND: catch_command_errors (execute_command, cmdarg_p->string, - !batch_flag, RETURN_MASK_ALL); + !batch_flag); break; } /* Now perform all the actions indicated by the arguments. */ if (cdarg != NULL) { - catch_command_errors (cd_command, cdarg, 0, RETURN_MASK_ALL); + catch_command_errors (cd_command, cdarg, 0); } for (i = 0; i < ndir; i++) - catch_command_errors (directory_switch, dirarg[i], 0, RETURN_MASK_ALL); + catch_command_errors (directory_switch, dirarg[i], 0); xfree (dirarg); /* Skip auto-loading section-specified scripts until we've sourced @@ -885,19 +1053,19 @@ captured_main (void *data) /* 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_flag, RETURN_MASK_ALL)) - catch_command_errors (symbol_file_add_main, symarg, - !batch_flag, RETURN_MASK_ALL); + if (catch_command_errors_const (exec_file_attach, execarg, + !batch_flag)) + catch_command_errors_const (symbol_file_add_main, symarg, + !batch_flag); } else { if (execarg != NULL) - catch_command_errors (exec_file_attach, execarg, - !batch_flag, RETURN_MASK_ALL); + catch_command_errors_const (exec_file_attach, execarg, + !batch_flag); if (symarg != NULL) - catch_command_errors (symbol_file_add_main, symarg, - !batch_flag, RETURN_MASK_ALL); + catch_command_errors_const (symbol_file_add_main, symarg, + !batch_flag); } if (corearg && pidarg) @@ -905,11 +1073,9 @@ captured_main (void *data) "a core file at the same time.")); if (corearg != NULL) - catch_command_errors (core_file_command, corearg, - !batch_flag, RETURN_MASK_ALL); + catch_command_errors (core_file_command, corearg, !batch_flag); else if (pidarg != NULL) - catch_command_errors (attach_command, pidarg, - !batch_flag, RETURN_MASK_ALL); + catch_command_errors (attach_command, pidarg, !batch_flag); else if (pid_or_core_arg) { /* The user specified 'gdb program pid' or gdb program core'. @@ -919,21 +1085,19 @@ captured_main (void *data) if (isdigit (pid_or_core_arg[0])) { if (catch_command_errors (attach_command, pid_or_core_arg, - !batch_flag, RETURN_MASK_ALL) == 0) + !batch_flag) == 0) catch_command_errors (core_file_command, pid_or_core_arg, - !batch_flag, RETURN_MASK_ALL); + !batch_flag); } else /* Can't be a pid, better be a corefile. */ catch_command_errors (core_file_command, pid_or_core_arg, - !batch_flag, RETURN_MASK_ALL); + !batch_flag); } if (ttyarg != NULL) set_inferior_io_terminal (ttyarg); /* Error messages should no longer be distinguished with extra output. */ - error_pre_print = NULL; - quit_pre_print = NULL; warning_pre_print = _("warning: "); /* Read the .gdbinit file in the current directory, *if* it isn't @@ -950,8 +1114,7 @@ captured_main (void *data) { auto_load_local_gdbinit_loaded = 1; - catch_command_errors (source_script, local_gdbinit, 0, - RETURN_MASK_ALL); + catch_command_errors_const (source_script, local_gdbinit, 0); } } @@ -968,12 +1131,12 @@ captured_main (void *data) switch (cmdarg_p->type) { case CMDARG_FILE: - catch_command_errors (source_script, cmdarg_p->string, - !batch_flag, RETURN_MASK_ALL); + catch_command_errors_const (source_script, cmdarg_p->string, + !batch_flag); break; case CMDARG_COMMAND: catch_command_errors (execute_command, cmdarg_p->string, - !batch_flag, RETURN_MASK_ALL); + !batch_flag); break; } @@ -1004,7 +1167,6 @@ captured_main (void *data) int gdb_main (struct captured_main_args *args) { - use_windows = args->use_windows; catch_errors (captured_main, args, "", RETURN_MASK_ALL); /* The only way to end up here is by an error (normal exit is handled by quit_force()), hence always return an error status. */ @@ -1019,63 +1181,54 @@ gdb_main (struct captured_main_args *args) static void print_gdb_help (struct ui_file *stream) { - char *system_gdbinit; - char *home_gdbinit; - char *local_gdbinit; + const char *system_gdbinit; + const char *home_gdbinit; + const char *local_gdbinit; get_init_files (&system_gdbinit, &home_gdbinit, &local_gdbinit); + /* Note: The options in the list below are only approximately sorted + in the alphabetical order, so as to group closely related options + together. */ fputs_unfiltered (_("\ This is the GNU debugger. Usage:\n\n\ gdb [options] [executable-file [core-file or process-id]]\n\ gdb [options] --args executable-file [inferior-arguments ...]\n\n\ -Options:\n\n\ "), stream); fputs_unfiltered (_("\ +Selection of debuggee and its files:\n\n\ --args Arguments after executable-file are passed to inferior\n\ + --core=COREFILE Analyze the core dump COREFILE.\n\ + --exec=EXECFILE Use EXECFILE as the executable.\n\ + --pid=PID Attach to running process PID.\n\ + --directory=DIR Search for source files in DIR.\n\ + --se=FILE Use FILE as symbol file and executable file.\n\ + --symbols=SYMFILE Read symbols from SYMFILE.\n\ + --readnow Fully read symbol files on first access.\n\ + --write Set writing into executable and core files.\n\n\ "), stream); fputs_unfiltered (_("\ - -b BAUDRATE Set serial port baud rate used for remote debugging.\n\ - --batch Exit after processing options.\n\ - --batch-silent As for --batch, but suppress all gdb stdout output.\n\ - --return-child-result\n\ - GDB exit code will be the child's exit code.\n\ - --cd=DIR Change current directory to DIR.\n\ +Initial commands and command files:\n\n\ --command=FILE, -x Execute GDB commands from FILE.\n\ + --init-command=FILE, -ix\n\ + Like -x but execute commands before loading inferior.\n\ --eval-command=COMMAND, -ex\n\ Execute a single GDB command.\n\ May be used multiple times and in conjunction\n\ with --command.\n\ - --init-command=FILE, -ix Like -x but execute it before loading inferior.\n\ - --init-eval-command=COMMAND, -iex Like -ex but before loading inferior.\n\ - --core=COREFILE Analyze the core dump COREFILE.\n\ - --pid=PID Attach to running process PID.\n\ + --init-eval-command=COMMAND, -iex\n\ + Like -ex but before loading inferior.\n\ + --nh Do not read ~/.gdbinit.\n\ + --nx Do not read any .gdbinit files in any directory.\n\n\ "), stream); 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\ - --exec=EXECFILE Use EXECFILE as the executable.\n\ +Output and user interface control:\n\n\ --fullname Output information used by emacs-GDB interface.\n\ - --help Print this message.\n\ -"), stream); - fputs_unfiltered (_("\ --interpreter=INTERP\n\ Select a specific interpreter / user interface\n\ -"), stream); - fputs_unfiltered (_("\ - -l TIMEOUT Set timeout in seconds for remote debugging.\n\ - --nw Do not use a window interface.\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 (_("\ - --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\ + -w Use the GUI interface.\n\ + --nw Do not use the GUI interface.\n\ "), stream); #if defined(TUI) fputs_unfiltered (_("\ @@ -1083,10 +1236,27 @@ Options:\n\n\ "), stream); #endif 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\ + --dbx DBX compatibility mode.\n\ --xdb XDB compatibility mode.\n\ + -q, --quiet, --silent\n\ + Do not print version number on startup.\n\n\ +"), stream); + fputs_unfiltered (_("\ +Operating modes:\n\n\ + --batch Exit after processing options.\n\ + --batch-silent Like --batch, but suppress all gdb stdout output.\n\ + --return-child-result\n\ + GDB exit code will be the child's exit code.\n\ + --configuration Print details about GDB configuration and then exit.\n\ + --help Print this message and then exit.\n\ + --version Print version information and then exit.\n\n\ +Remote debugging options:\n\n\ + -b BAUDRATE Set serial port baud rate used for remote debugging.\n\ + -l TIMEOUT Set timeout in seconds for remote debugging.\n\n\ +Other options:\n\n\ + --cd=DIR Change current directory to DIR.\n\ + --data-directory=DIR, -D\n\ + Set GDB's data-directory to DIR.\n\ "), stream); fputs_unfiltered (_("\n\ At startup, GDB reads the following init files and executes their commands:\n\