mirror of
https://github.com/bminor/binutils-gdb.git
synced 2025-12-26 17:18:55 +00:00
2005-11-07 Andrew Stubbs <andrew.stubbs@st.com>
* main.c (captured_main): Define struct cmdarg. Change type of cmdarg. Add new options --eval-command and alias -ex. Adjust --command to use the new struct cmdarg. Execute commands given with --eval-command. (print_gdb_help): Add new options --eval-command, -ex and mention -x. docs/ * gdb.texinfo (Choosing files): Add --eval-command.
This commit is contained in:
42
gdb/main.c
42
gdb/main.c
@@ -138,7 +138,13 @@ captured_main (void *data)
|
||||
static int print_version;
|
||||
|
||||
/* Pointers to all arguments of --command option. */
|
||||
char **cmdarg;
|
||||
struct cmdarg {
|
||||
enum {
|
||||
CMDARG_FILE,
|
||||
CMDARG_COMMAND
|
||||
} type;
|
||||
char *string;
|
||||
} *cmdarg;
|
||||
/* Allocated size of cmdarg. */
|
||||
int cmdsize;
|
||||
/* Number of elements of cmdarg used. */
|
||||
@@ -178,7 +184,7 @@ captured_main (void *data)
|
||||
#endif
|
||||
|
||||
cmdsize = 1;
|
||||
cmdarg = (char **) xmalloc (cmdsize * sizeof (*cmdarg));
|
||||
cmdarg = (struct cmdarg *) xmalloc (cmdsize * sizeof (*cmdarg));
|
||||
ncmd = 0;
|
||||
dirsize = 1;
|
||||
dirarg = (char **) xmalloc (dirsize * sizeof (*dirarg));
|
||||
@@ -285,8 +291,10 @@ captured_main (void *data)
|
||||
{"pid", required_argument, 0, 'p'},
|
||||
{"p", required_argument, 0, 'p'},
|
||||
{"command", required_argument, 0, 'x'},
|
||||
{"eval-command", required_argument, 0, 'X'},
|
||||
{"version", no_argument, &print_version, 1},
|
||||
{"x", required_argument, 0, 'x'},
|
||||
{"ex", required_argument, 0, 'X'},
|
||||
#ifdef GDBTK
|
||||
{"tclcommand", required_argument, 0, 'z'},
|
||||
{"enable-external-editor", no_argument, 0, 'y'},
|
||||
@@ -387,12 +395,23 @@ captured_main (void *data)
|
||||
corearg = optarg;
|
||||
break;
|
||||
case 'x':
|
||||
cmdarg[ncmd++] = optarg;
|
||||
cmdarg[ncmd].type = CMDARG_FILE;
|
||||
cmdarg[ncmd++].string = optarg;
|
||||
if (ncmd >= cmdsize)
|
||||
{
|
||||
cmdsize *= 2;
|
||||
cmdarg = (char **) xrealloc ((char *) cmdarg,
|
||||
cmdsize * sizeof (*cmdarg));
|
||||
cmdarg = xrealloc ((char *) cmdarg,
|
||||
cmdsize * sizeof (*cmdarg));
|
||||
}
|
||||
break;
|
||||
case 'X':
|
||||
cmdarg[ncmd].type = CMDARG_COMMAND;
|
||||
cmdarg[ncmd++].string = optarg;
|
||||
if (ncmd >= cmdsize)
|
||||
{
|
||||
cmdsize *= 2;
|
||||
cmdarg = xrealloc ((char *) cmdarg,
|
||||
cmdsize * sizeof (*cmdarg));
|
||||
}
|
||||
break;
|
||||
case 'B':
|
||||
@@ -733,7 +752,12 @@ extern int gdbtk_test (char *);
|
||||
do_cleanups (ALL_CLEANUPS);
|
||||
}
|
||||
#endif
|
||||
catch_command_errors (source_command, cmdarg[i], !batch, RETURN_MASK_ALL);
|
||||
if (cmdarg[i].type == CMDARG_FILE)
|
||||
catch_command_errors (source_command, cmdarg[i].string,
|
||||
!batch, RETURN_MASK_ALL);
|
||||
else /* cmdarg[i].type == CMDARG_COMMAND */
|
||||
catch_command_errors (execute_command, cmdarg[i].string,
|
||||
!batch, RETURN_MASK_ALL);
|
||||
}
|
||||
xfree (cmdarg);
|
||||
|
||||
@@ -846,7 +870,11 @@ Options:\n\n\
|
||||
--return-child-result\n\
|
||||
GDB exit code will be the child's exit code.\n\
|
||||
--cd=DIR Change current directory to DIR.\n\
|
||||
--command=FILE Execute GDB commands from FILE.\n\
|
||||
--command=FILE, -x Execute GDB commands from FILE.\n\
|
||||
--eval-command=COMMAND, -ex\n\
|
||||
Execute a single GDB command.\n\
|
||||
May be used multiple times and in conjunction\n\
|
||||
with --command.\n\
|
||||
--core=COREFILE Analyze the core dump COREFILE.\n\
|
||||
--pid=PID Attach to running process PID.\n\
|
||||
"), stream);
|
||||
|
||||
Reference in New Issue
Block a user