#include <vector>
#include "gdbsupport/pathstuff.h"
#include "cli/cli-style.h"
+#ifdef GDBTK
+#include "gdbtk/generic/gdbtk.h"
+#endif
/* The selected interpreter. This will be used as a set command
variable, so it should always be malloc'ed - since
size_t start = datadir_len;
for (; IS_DIR_SEPARATOR (file[start]); ++start)
;
- relocated_path = (std::string (gdb_datadir) + SLASH_STRING
- + file.substr (start));
+ relocated_path = gdb_datadir + SLASH_STRING + file.substr (start);
}
else
{
= xstrdup (relocate_gdb_directory (DEBUGDIR,
DEBUGDIR_RELOCATABLE).c_str ());
- gdb_datadir
- = xstrdup (relocate_gdb_directory (GDB_DATADIR,
- GDB_DATADIR_RELOCATABLE).c_str ());
+ gdb_datadir = relocate_gdb_directory (GDB_DATADIR,
+ GDB_DATADIR_RELOCATABLE);
#ifdef WITH_PYTHON_PATH
{
OPT_READNOW,
OPT_READNEVER
};
+ /* This struct requires int* in the struct, but write_files is a bool.
+ So use this temporary int that we write back after argument parsing. */
+ int write_files_1 = 0;
static struct option long_options[] =
{
{"tui", no_argument, 0, OPT_TUI},
{"w", no_argument, NULL, OPT_WINDOWS},
{"windows", no_argument, NULL, OPT_WINDOWS},
{"statistics", no_argument, 0, OPT_STATISTICS},
- {"write", no_argument, &write_files, 1},
+ {"write", no_argument, &write_files_1, 1},
{"args", no_argument, &set_args, 1},
{"l", required_argument, 0, 'l'},
{"return-child-result", no_argument, &return_child_result, 1},
#ifdef GDBTK
case 'z':
{
- extern int gdbtk_test (char *);
-
if (!gdbtk_test (optarg))
error (_("%s: unable to load tclcommand file \"%s\""),
gdb_program_name, optarg);
{
/* Set the external editor commands when gdb is farming out files
to be edited by another program. */
- extern char *external_editor_command;
-
external_editor_command = xstrdup (optarg);
break;
}
gdb_program_name);
}
}
+ write_files = (write_files_1 != 0);
if (batch_flag)
{
}
/* Lookup gdbinit files. Note that the gdbinit file name may be
- overriden during file initialization, so get_init_files should be
+ overridden during file initialization, so get_init_files should be
called after gdb_init. */
std::string system_gdbinit;
std::string home_gdbinit;