gdb/main.c - Issue 124383005: GDB 7.6.50

Unified Diff: gdb/main.c

Issue 124383005: GDB 7.6.50 (Closed) Base URL: http://git.chromium.org/native_client/nacl-gdb.git@upstream

Patch Set: Created 6 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Index: gdb/main.c

diff --git a/gdb/main.c b/gdb/main.c

index 976f8ae08b37f7b3bf9d1539dc3f105fb7697113..08f46f00168e2403ae12cc83acf0a0038f208fe9 100644

--- a/gdb/main.c

+++ b/gdb/main.c

@@ -1,6 +1,6 @@

/* Top level stuff for GDB, the GNU debugger.

This file is part of GDB.

@@ -28,10 +28,10 @@

#include "getopt.h"

#include <sys/types.h>

-#include "gdb_stat.h"

+#include <sys/stat.h>

#include <ctype.h>

-#include "gdb_string.h"

+#include <string.h>

#include "event-loop.h"

#include "ui-out.h"

@@ -42,6 +42,10 @@

#include "python/python.h"

#include "objfiles.h"

#include "auto-load.h"

+#include "maint.h"

+#include "filenames.h"

+#include "filestuff.h"

/* The selected interpreter. This will be used as a set command

variable, so it should always be malloc'ed - since

@@ -60,6 +64,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,6 +98,13 @@ 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 *);

/* Relocate a file or directory. PROGNAME is the name by which gdb

@@ -121,7 +137,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 +167,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

@@ -219,7 +260,7 @@ get_init_files (char **system_gdbinit,

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;

@@ -273,6 +314,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 +329,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 +343,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,25 +369,41 @@ 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));

ndir = 0;

- quit_flag = 0;

+ clear_quit_flag ();

saved_command_line = (char *) xmalloc (saved_command_line_size);

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

if (! getcwd (gdb_dirbuf, sizeof (gdb_dirbuf)))

/* Don't use *_filtered or warning() (which relies on

@@ -378,7 +437,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 +474,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 +500,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},

@@ -505,8 +565,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. */

@@ -589,6 +649,7 @@ captured_main (void *data)

case 'D':

xfree (gdb_datadir);

gdb_datadir = xstrdup (optarg);

+ gdb_datadir_provided = 1;

break;

#ifdef GDBTK

case 'z':

@@ -683,8 +744,9 @@ captured_main (void *data)

}

- /* If --help or --version, disable window interface. */

- if (print_help || print_version)

+ /* If --help or --version or --configuration, disable window

+ interface. */

+ if (print_help || print_version || print_configuration)

{

use_windows = 0;

}

@@ -695,7 +757,7 @@ captured_main (void *data)

/* 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. */

@@ -775,6 +837,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

@@ -829,8 +899,6 @@ captured_main (void *data)

}

/* Set off error and warning messages with a blank line. */

- error_pre_print = "\n";

- quit_pre_print = error_pre_print;

warning_pre_print = _("\nwarning: ");

/* Read and execute the system-wide gdbinit file, if it exists.

@@ -838,23 +906,25 @@ 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, RETURN_MASK_ALL);

/* 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, RETURN_MASK_ALL);

/* 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, RETURN_MASK_ALL);

break;

case CMDARG_INIT_COMMAND:

catch_command_errors (execute_command, cmdarg_p->string,

@@ -887,8 +957,8 @@ captured_main (void *data)

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);

+ catch_command_errors_const (symbol_file_add_main, symarg,

+ !batch_flag, RETURN_MASK_ALL);

}

else

{

@@ -896,8 +966,8 @@ captured_main (void *data)

catch_command_errors (exec_file_attach, execarg,

!batch_flag, RETURN_MASK_ALL);

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, RETURN_MASK_ALL);

}

if (corearg && pidarg)

@@ -932,8 +1002,6 @@ captured_main (void *data)

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 +1018,8 @@ 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,

+ RETURN_MASK_ALL);

}

@@ -968,8 +1036,8 @@ 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, RETURN_MASK_ALL);

break;

case CMDARG_COMMAND:

catch_command_errors (execute_command, cmdarg_p->string,

@@ -1019,63 +1087,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 +1142,24 @@ 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\

+ --quiet 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\

"), stream);

fputs_unfiltered (_("\n\

At startup, GDB reads the following init files and executes their commands:\n\

« no previous file with comments | « gdb/main.h ('k') | gdb/maint.h » ('j') | no next file with comments »