/* Top level stuff for GDB, the GNU debugger.
- Copyright (C) 1986-2021 Free Software Foundation, Inc.
+ Copyright (C) 1986-2022 Free Software Foundation, Inc.
This file is part of GDB.
#include "gdbarch.h"
#include "gdbsupport/pathstuff.h"
#include "cli/cli-style.h"
+#include "pager.h"
/* readline include files. */
#include "readline/readline.h"
extern void initialize_all_files (void);
-static bool history_filename_empty (void);
-
#define PROMPT(X) the_prompts.prompt_stack[the_prompts.top + X].prompt
#define PREFIX(X) the_prompts.prompt_stack[the_prompts.top + X].prefix
#define SUFFIX(X) the_prompts.prompt_stack[the_prompts.top + X].suffix
show_confirm (struct ui_file *file, int from_tty,
struct cmd_list_element *c, const char *value)
{
- fprintf_filtered (file, _("Whether to confirm potentially "
- "dangerous operations is %s.\n"),
- value);
+ gdb_printf (file, _("Whether to confirm potentially "
+ "dangerous operations is %s.\n"),
+ value);
}
-/* Current working directory. */
-
-char *current_directory;
-
/* The last command line executed on the console. Used for command
repetitions when the user enters an empty line. */
void (*deprecated_attach_hook) (void);
void (*deprecated_detach_hook) (void);
-/* Called when going to wait for the target. Usually allows the GUI
- to run while waiting for target events. */
-
-ptid_t (*deprecated_target_wait_hook) (ptid_t ptid,
- struct target_waitstatus *status,
- int options);
-
/* Used by UI as a wrapper around command execution. May do various
things like enabling/disabling buttons, etc... */
/* The highest UI number ever assigned. */
static int highest_ui_num;
+/* Unbuffer STREAM. This is a wrapper around setbuf(STREAM, nullptr)
+ which applies some special rules for MS-Windows hosts. */
+
+static void
+unbuffer_stream (FILE *stream)
+{
+ /* Unbuffer the input stream so that in gdb_readline_no_editing_callback,
+ the calls to fgetc fetch only one char at the time from STREAM.
+
+ This is important because gdb_readline_no_editing_callback will read
+ from STREAM up to the first '\n' character, after this GDB returns to
+ the event loop and relies on a select on STREAM indicating that more
+ input is pending.
+
+ If STREAM is buffered then the fgetc calls may have moved all the
+ pending input from the kernel into a local buffer, after which the
+ select will not indicate that more input is pending, and input after
+ the first '\n' will not be processed immediately.
+
+ Please ensure that any changes in this area run the MI tests with the
+ FORCE_SEPARATE_MI_TTY=1 flag being passed. */
+
+#ifdef __MINGW32__
+ /* With MS-Windows runtime, making stdin unbuffered when it's
+ connected to the terminal causes it to misbehave. */
+ if (!ISATTY (stream))
+ setbuf (stream, nullptr);
+#else
+ /* On GNU/Linux the issues described above can impact GDB even when
+ dealing with input from a terminal. For now we unbuffer the input
+ stream for everyone except MS-Windows. */
+ setbuf (stream, nullptr);
+#endif
+}
+
/* See top.h. */
ui::ui (FILE *instream_, FILE *outstream_, FILE *errstream_)
outstream (outstream_),
errstream (errstream_),
input_fd (fileno (instream)),
- input_interactive_p (ISATTY (instream)),
+ m_input_interactive_p (ISATTY (instream)),
prompt_state (PROMPT_NEEDED),
- m_gdb_stdout (new stdio_file (outstream)),
+ m_gdb_stdout (new pager_file (new stdio_file (outstream))),
m_gdb_stdin (new stdio_file (instream)),
m_gdb_stderr (new stderr_file (errstream)),
m_gdb_stdlog (m_gdb_stderr),
{
buffer_init (&line_buffer);
+ unbuffer_stream (instream_);
+
if (ui_list == NULL)
ui_list = this;
else
static gdb_file_up
open_terminal_stream (const char *name)
{
- int fd;
-
- fd = gdb_open_cloexec (name, O_RDWR | O_NOCTTY, 0);
- if (fd < 0)
+ scoped_fd fd = gdb_open_cloexec (name, O_RDWR | O_NOCTTY, 0);
+ if (fd.get () < 0)
perror_with_name (_("opening terminal failed"));
- return gdb_file_up (fdopen (fd, "w+"));
+ return fd.to_file ("w+");
}
/* Implementation of the "new-ui" command. */
ui.release ();
}
- printf_unfiltered ("New UI allocated\n");
+ gdb_printf ("New UI allocated\n");
}
/* Handler for SIGHUP. */
{
struct ui *ui = current_ui;
+ unbuffer_stream (stream);
+
scoped_restore save_instream
= make_scoped_restore (&ui->instream, stream);
&& flang != language_unknown
&& flang != current_language->la_language)
{
- printf_filtered ("%s\n", _(lang_frame_mismatch_warn));
+ gdb_printf ("%s\n", _(lang_frame_mismatch_warn));
warned = 1;
}
}
if (c->theclass == class_user && c->user_commands)
execute_user_command (c, arg);
else if (c->theclass == class_user
- && c->prefixlist && !c->allow_unknown)
+ && c->is_prefix () && !c->allow_unknown)
/* If this is a user defined prefix that does not allow unknown
(in other words, C is a prefix command and not a command
that can be followed by its args), report the list of
subcommands. */
{
- printf_unfiltered
- ("\"%.*s\" must be followed by the name of a subcommand.\n",
- (int) strlen (c->prefixname) - 1, c->prefixname);
- help_list (*c->prefixlist, c->prefixname, all_commands, gdb_stdout);
+ std::string prefixname = c->prefixname ();
+ std::string prefixname_no_space
+ = prefixname.substr (0, prefixname.length () - 1);
+ gdb_printf
+ ("\"%s\" must be followed by the name of a subcommand.\n",
+ prefixname_no_space.c_str ());
+ help_list (*c->subcommands, prefixname.c_str (), all_commands,
+ gdb_stdout);
}
else if (c->type == set_cmd)
do_set_command (arg, from_tty, c);
else if (c->type == show_cmd)
do_show_command (arg, from_tty, c);
- else if (!cmd_func_p (c))
+ else if (c->is_command_class_help ())
error (_("That is not a command, just a help topic."));
else if (deprecated_call_command_hook)
deprecated_call_command_hook (c, arg, from_tty);
cleanup_if_error.release ();
}
-/* Run execute_command for P and FROM_TTY. Sends its output to FILE,
- do not display it to the screen. BATCH_FLAG will be
- temporarily set to true. */
+/* See gdbcmd.h. */
void
-execute_command_to_ui_file (struct ui_file *file, const char *p, int from_tty)
+execute_fn_to_ui_file (struct ui_file *file, std::function<void(void)> fn)
{
/* GDB_STDOUT should be better already restored during these
restoration callbacks. */
scoped_restore save_stdtargerr
= make_scoped_restore (&gdb_stdtargerr, file);
- execute_command (p, from_tty);
+ fn ();
}
}
/* See gdbcmd.h. */
-std::string
-execute_command_to_string (const char *p, int from_tty,
- bool term_out)
+void
+execute_fn_to_string (std::string &res, std::function<void(void)> fn,
+ bool term_out)
{
string_file str_file (term_out);
- execute_command_to_ui_file (&str_file, p, from_tty);
- return std::move (str_file.string ());
+ try
+ {
+ execute_fn_to_ui_file (&str_file, fn);
+ }
+ catch (...)
+ {
+ /* Finally. */
+ res = std::move (str_file.string ());
+ throw;
+ }
+
+ /* And finally. */
+ res = std::move (str_file.string ());
}
+/* See gdbcmd.h. */
+
+void
+execute_command_to_ui_file (struct ui_file *file,
+ const char *p, int from_tty)
+{
+ execute_fn_to_ui_file (file, [=]() { execute_command (p, from_tty); });
+}
+
+/* See gdbcmd.h. */
+
+void
+execute_command_to_string (std::string &res, const char *p, int from_tty,
+ bool term_out)
+{
+ execute_fn_to_string (res, [=]() { execute_command (p, from_tty); },
+ term_out);
+}
+
+/* See gdbcmd.h. */
+
+void
+execute_command_to_string (const char *p, int from_tty,
+ bool term_out)
+{
+ std::string dummy;
+ execute_fn_to_string (dummy, [=]() { execute_command (p, from_tty); },
+ term_out);
+}
\f
/* When nonzero, cause dont_repeat to do nothing. This should only be
set via prevent_dont_repeat. */
/* Don't use a _filtered function here. It causes the assumed
character position to be off, since the newline we read from
the user is not accounted for. */
- fputs_unfiltered (prompt, gdb_stdout);
+ printf_unfiltered ("%s", prompt);
gdb_flush (gdb_stdout);
}
variable must be set to something sensible. */
static bool write_history_p;
+/* The name of the file in which GDB history will be written. If this is
+ set to NULL, of the empty string then history will not be written. */
+static std::string history_filename;
+
/* Implement 'show history save'. */
static void
show_write_history_p (struct ui_file *file, int from_tty,
struct cmd_list_element *c, const char *value)
{
- if (!write_history_p || !history_filename_empty ())
- fprintf_filtered (file, _("Saving of the history record on exit is %s.\n"),
- value);
+ if (!write_history_p || !history_filename.empty ())
+ gdb_printf (file, _("Saving of the history record on exit is %s.\n"),
+ value);
else
- fprintf_filtered (file, _("Saving of the history is disabled due to "
- "the value of 'history filename'.\n"));
+ gdb_printf (file, _("Saving of the history is disabled due to "
+ "the value of 'history filename'.\n"));
}
/* The variable associated with the "set/show history size"
show_history_size (struct ui_file *file, int from_tty,
struct cmd_list_element *c, const char *value)
{
- fprintf_filtered (file, _("The size of the command history is %s.\n"),
- value);
+ gdb_printf (file, _("The size of the command history is %s.\n"),
+ value);
}
/* Variable associated with the "history remove-duplicates" option.
show_history_remove_duplicates (struct ui_file *file, int from_tty,
struct cmd_list_element *c, const char *value)
{
- fprintf_filtered (file,
- _("The number of history entries to look back at for "
- "duplicates is %s.\n"),
- value);
-}
-
-/* The name of the file in which GDB history will be written. If this is
- set to NULL, of the empty string then history will not be written. */
-static char *history_filename;
-
-/* Return true if the history_filename is either NULL or the empty string,
- indicating that we should not try to read, nor write out the history. */
-static bool
-history_filename_empty (void)
-{
- return (history_filename == nullptr || *history_filename == '\0');
+ gdb_printf (file,
+ _("The number of history entries to look back at for "
+ "duplicates is %s.\n"),
+ value);
}
/* Implement 'show history filename'. */
show_history_filename (struct ui_file *file, int from_tty,
struct cmd_list_element *c, const char *value)
{
- if (!history_filename_empty ())
- fprintf_filtered (file, _("The filename in which to record "
- "the command history is \"%ps\".\n"),
- styled_string (file_name_style.style (), value));
+ if (!history_filename.empty ())
+ gdb_printf (file, _("The filename in which to record "
+ "the command history is \"%ps\".\n"),
+ styled_string (file_name_style.style (), value));
else
- fprintf_filtered (file, _("There is no filename currently set for "
- "recording the command history in.\n"));
+ gdb_printf (file, _("There is no filename currently set for "
+ "recording the command history in.\n"));
}
/* This is like readline(), but it has some gdb-specific behavior.
current_ui->secondary_prompt_depth++;
if (m_target_is_async_orig)
- target_async (0);
+ target_async (false);
}
~gdb_readline_wrapper_cleanup ()
saved_after_char_processing_hook = NULL;
if (m_target_is_async_orig)
- target_async (1);
+ target_async (true);
}
DISABLE_COPY_AND_ASSIGN (gdb_readline_wrapper_cleanup);
int ret, saved_errno;
std::string local_history_filename
- = string_printf ("%s-gdb%ld~", history_filename, (long) getpid ());
+ = string_printf ("%s-gdb%ld~", history_filename.c_str (), (long) getpid ());
- ret = rename (history_filename, local_history_filename.c_str ());
+ ret = rename (history_filename.c_str (), local_history_filename.c_str ());
saved_errno = errno;
if (ret < 0 && saved_errno != ENOENT)
{
warning (_("Could not rename %ps to %ps: %s"),
- styled_string (file_name_style.style (), history_filename),
+ styled_string (file_name_style.style (),
+ history_filename.c_str ()),
styled_string (file_name_style.style (),
local_history_filename.c_str ()),
safe_strerror (saved_errno));
history_max_entries);
}
- ret = rename (local_history_filename.c_str (), history_filename);
+ ret = rename (local_history_filename.c_str (), history_filename.c_str ());
saved_errno = errno;
if (ret < 0 && saved_errno != EEXIST)
warning (_("Could not rename %s to %s: %s"),
- local_history_filename.c_str (), history_filename,
+ local_history_filename.c_str (), history_filename.c_str (),
safe_strerror (saved_errno));
}
}
/* Make sure that all output has been output. Some machines may
let you get away with leaving out some of the gdb_flush, but
not all. */
- wrap_here ("");
gdb_flush (gdb_stdout);
gdb_flush (gdb_stderr);
++source_line_number;
if (from_tty && annotation_level > 1)
- {
- puts_unfiltered ("\n\032\032pre-");
- puts_unfiltered (annotation_suffix);
- puts_unfiltered ("\n");
- }
+ printf_unfiltered ("\n\032\032pre-%s\n", annotation_suffix);
/* Don't use fancy stuff if not talking to stdin. */
if (deprecated_readline_hook
&& from_tty
- && input_interactive_p (current_ui))
+ && current_ui->input_interactive_p ())
{
rl.reset ((*deprecated_readline_hook) (prompt));
}
else if (command_editing_p
&& from_tty
- && input_interactive_p (current_ui))
+ && current_ui->input_interactive_p ())
{
rl.reset (gdb_readline_wrapper (prompt));
}
number, which starts after last space. */
std::string v_str = string_printf ("GNU gdb %s%s", PKGVERSION, version);
- fprintf_filtered (stream, "%ps\n",
- styled_string (version_style.style (), v_str.c_str ()));
+ gdb_printf (stream, "%ps\n",
+ styled_string (version_style.style (), v_str.c_str ()));
/* Second line is a copyright notice. */
- fprintf_filtered (stream,
- "Copyright (C) 2021 Free Software Foundation, Inc.\n");
+ gdb_printf (stream,
+ "Copyright (C) 2022 Free Software Foundation, Inc.\n");
/* Following the copyright is a brief statement that the program is
free software, that users are free to copy and change it on
certain conditions, that it is covered by the GNU GPL, and that
there is no warranty. */
- fprintf_filtered (stream, "\
-License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\
+ gdb_printf (stream, "\
+License GPLv3+: GNU GPL version 3 or later <%ps>\
\nThis is free software: you are free to change and redistribute it.\n\
-There is NO WARRANTY, to the extent permitted by law.");
+There is NO WARRANTY, to the extent permitted by law.",
+ styled_string (file_name_style.style (),
+ "http://gnu.org/licenses/gpl.html"));
if (!interactive)
return;
- fprintf_filtered (stream, ("\nType \"show copying\" and "
- "\"show warranty\" for details.\n"));
+ gdb_printf (stream, ("\nType \"show copying\" and "
+ "\"show warranty\" for details.\n"));
/* After the required info we print the configuration information. */
- fprintf_filtered (stream, "This GDB was configured as \"");
+ gdb_printf (stream, "This GDB was configured as \"");
if (strcmp (host_name, target_name) != 0)
{
- fprintf_filtered (stream, "--host=%s --target=%s",
- host_name, target_name);
+ gdb_printf (stream, "--host=%s --target=%s",
+ host_name, target_name);
}
else
{
- fprintf_filtered (stream, "%s", host_name);
+ gdb_printf (stream, "%s", host_name);
}
- fprintf_filtered (stream, "\".\n");
+ gdb_printf (stream, "\".\n");
- fprintf_filtered (stream, _("Type \"show configuration\" "
- "for configuration details.\n"));
+ gdb_printf (stream, _("Type \"show configuration\" "
+ "for configuration details.\n"));
if (REPORT_BUGS_TO[0])
{
- fprintf_filtered (stream,
- _("For bug reporting instructions, please see:\n"));
- fprintf_filtered (stream, "%s.\n", REPORT_BUGS_TO);
+ gdb_printf (stream,
+ _("For bug reporting instructions, please see:\n"));
+ gdb_printf (stream, "%ps.\n",
+ styled_string (file_name_style.style (),
+ REPORT_BUGS_TO));
}
- fprintf_filtered (stream,
- _("Find the GDB manual and other documentation \
-resources online at:\n <http://www.gnu.org/software/gdb/documentation/>."));
- fprintf_filtered (stream, "\n\n");
- fprintf_filtered (stream, _("For help, type \"help\".\n"));
- fprintf_filtered (stream,
- _("Type \"apropos word\" to search for commands \
+ gdb_printf (stream,
+ _("Find the GDB manual and other documentation \
+resources online at:\n <%ps>."),
+ styled_string (file_name_style.style (),
+ "http://www.gnu.org/software/gdb/documentation/"));
+ gdb_printf (stream, "\n\n");
+ gdb_printf (stream, _("For help, type \"help\".\n"));
+ gdb_printf (stream,
+ _("Type \"apropos word\" to search for commands \
related to \"word\"."));
}
void
print_gdb_configuration (struct ui_file *stream)
{
- fprintf_filtered (stream, _("\
+ gdb_printf (stream, _("\
This GDB was configured as follows:\n\
configure --host=%s --target=%s\n\
"), host_name, target_name);
- fprintf_filtered (stream, _("\
+ gdb_printf (stream, _("\
--with-auto-load-dir=%s\n\
--with-auto-load-safe-path=%s\n\
"), AUTO_LOAD_DIR, AUTO_LOAD_SAFE_PATH);
#if HAVE_LIBEXPAT
- fprintf_filtered (stream, _("\
+ gdb_printf (stream, _("\
--with-expat\n\
"));
#else
- fprintf_filtered (stream, _("\
+ gdb_printf (stream, _("\
--without-expat\n\
"));
#endif
if (GDB_DATADIR[0])
- fprintf_filtered (stream, _("\
+ gdb_printf (stream, _("\
--with-gdb-datadir=%s%s\n\
"), GDB_DATADIR, GDB_DATADIR_RELOCATABLE ? " (relocatable)" : "");
#ifdef ICONV_BIN
- fprintf_filtered (stream, _("\
+ gdb_printf (stream, _("\
--with-iconv-bin=%s%s\n\
"), ICONV_BIN, ICONV_BIN_RELOCATABLE ? " (relocatable)" : "");
#endif
if (JIT_READER_DIR[0])
- fprintf_filtered (stream, _("\
+ gdb_printf (stream, _("\
--with-jit-reader-dir=%s%s\n\
"), JIT_READER_DIR, JIT_READER_DIR_RELOCATABLE ? " (relocatable)" : "");
#if HAVE_LIBUNWIND_IA64_H
- fprintf_filtered (stream, _("\
+ gdb_printf (stream, _("\
--with-libunwind-ia64\n\
"));
#else
- fprintf_filtered (stream, _("\
+ gdb_printf (stream, _("\
--without-libunwind-ia64\n\
"));
#endif
#if HAVE_LIBLZMA
- fprintf_filtered (stream, _("\
+ gdb_printf (stream, _("\
--with-lzma\n\
"));
#else
- fprintf_filtered (stream, _("\
+ gdb_printf (stream, _("\
--without-lzma\n\
"));
#endif
#if HAVE_LIBBABELTRACE
- fprintf_filtered (stream, _("\
+ gdb_printf (stream, _("\
--with-babeltrace\n\
"));
#else
- fprintf_filtered (stream, _("\
+ gdb_printf (stream, _("\
--without-babeltrace\n\
"));
#endif
#if HAVE_LIBIPT
- fprintf_filtered (stream, _("\
+ gdb_printf (stream, _("\
--with-intel-pt\n\
"));
#else
- fprintf_filtered (stream, _("\
+ gdb_printf (stream, _("\
--without-intel-pt\n\
"));
#endif
#if HAVE_LIBMPFR
- fprintf_filtered (stream, _("\
+ gdb_printf (stream, _("\
--with-mpfr\n\
"));
#else
- fprintf_filtered (stream, _("\
+ gdb_printf (stream, _("\
--without-mpfr\n\
"));
#endif
#if HAVE_LIBXXHASH
- fprintf_filtered (stream, _("\
+ gdb_printf (stream, _("\
--with-xxhash\n\
"));
#else
- fprintf_filtered (stream, _("\
+ gdb_printf (stream, _("\
--without-xxhash\n\
"));
#endif
#ifdef WITH_PYTHON_PATH
- fprintf_filtered (stream, _("\
+ gdb_printf (stream, _("\
--with-python=%s%s\n\
"), WITH_PYTHON_PATH, PYTHON_PATH_RELOCATABLE ? " (relocatable)" : "");
#else
- fprintf_filtered (stream, _("\
+ gdb_printf (stream, _("\
--without-python\n\
"));
#endif
#ifdef WITH_PYTHON_LIBDIR
- fprintf_filtered (stream, _("\
+ gdb_printf (stream, _("\
--with-python-libdir=%s%s\n\
"), WITH_PYTHON_LIBDIR, PYTHON_LIBDIR_RELOCATABLE ? " (relocatable)" : "");
#else
- fprintf_filtered (stream, _("\
+ gdb_printf (stream, _("\
--without-python-libdir\n\
"));
#endif
#if HAVE_LIBDEBUGINFOD
- fprintf_filtered (stream, _("\
+ gdb_printf (stream, _("\
--with-debuginfod\n\
"));
#else
- fprintf_filtered (stream, _("\
+ gdb_printf (stream, _("\
--without-debuginfod\n\
"));
#endif
#if HAVE_GUILE
- fprintf_filtered (stream, _("\
+ gdb_printf (stream, _("\
--with-guile\n\
"));
#else
- fprintf_filtered (stream, _("\
+ gdb_printf (stream, _("\
--without-guile\n\
"));
#endif
#if HAVE_SOURCE_HIGHLIGHT
- fprintf_filtered (stream, _("\
+ gdb_printf (stream, _("\
--enable-source-highlight\n\
"));
#else
- fprintf_filtered (stream, _("\
+ gdb_printf (stream, _("\
--disable-source-highlight\n\
"));
#endif
+#if CXX_STD_THREAD
+ gdb_printf (stream, _("\
+ --enable-threading\n\
+"));
+#else
+ gdb_printf (stream, _("\
+ --disable-threading\n\
+"));
+#endif
+
#ifdef RELOC_SRCDIR
- fprintf_filtered (stream, _("\
+ gdb_printf (stream, _("\
--with-relocated-sources=%s\n\
"), RELOC_SRCDIR);
#endif
if (DEBUGDIR[0])
- fprintf_filtered (stream, _("\
+ gdb_printf (stream, _("\
--with-separate-debug-dir=%s%s\n\
"), DEBUGDIR, DEBUGDIR_RELOCATABLE ? " (relocatable)" : "");
if (TARGET_SYSTEM_ROOT[0])
- fprintf_filtered (stream, _("\
+ gdb_printf (stream, _("\
--with-sysroot=%s%s\n\
"), TARGET_SYSTEM_ROOT, TARGET_SYSTEM_ROOT_RELOCATABLE ? " (relocatable)" : "");
if (SYSTEM_GDBINIT[0])
- fprintf_filtered (stream, _("\
+ gdb_printf (stream, _("\
--with-system-gdbinit=%s%s\n\
"), SYSTEM_GDBINIT, SYSTEM_GDBINIT_RELOCATABLE ? " (relocatable)" : "");
if (SYSTEM_GDBINIT_DIR[0])
- fprintf_filtered (stream, _("\
+ gdb_printf (stream, _("\
--with-system-gdbinit-dir=%s%s\n\
"), SYSTEM_GDBINIT_DIR, SYSTEM_GDBINIT_DIR_RELOCATABLE ? " (relocatable)" : "");
/* We assume "relocatable" will be printed at least once, thus we always
print this text. It's a reasonably safe assumption for now. */
- fprintf_filtered (stream, _("\n\
+ gdb_printf (stream, _("\n\
(\"Relocatable\" means the directory can be moved with the GDB installation\n\
tree, and GDB will still find it.)\n\
"));
/* The current top level prompt, settable with "set prompt", and/or
with the python `gdb.prompt_hook' hook. */
-static char *top_prompt;
+static std::string top_prompt;
/* Access method for the GDB prompt string. */
-char *
-get_prompt (void)
+const std::string &
+get_prompt ()
{
return top_prompt;
}
void
set_prompt (const char *s)
{
- char *p = xstrdup (s);
-
- xfree (top_prompt);
- top_prompt = p;
+ top_prompt = s;
}
\f
return;
if (inf->attach_flag)
- fprintf_filtered (out,
- _("\tInferior %d [%s] will be detached.\n"), inf->num,
- target_pid_to_str (ptid_t (inf->pid)).c_str ());
+ gdb_printf (out,
+ _("\tInferior %d [%s] will be detached.\n"), inf->num,
+ target_pid_to_str (ptid_t (inf->pid)).c_str ());
else
- fprintf_filtered (out,
- _("\tInferior %d [%s] will be killed.\n"), inf->num,
- target_pid_to_str (ptid_t (inf->pid)).c_str ());
+ gdb_printf (out,
+ _("\tInferior %d [%s] will be killed.\n"), inf->num,
+ target_pid_to_str (ptid_t (inf->pid)).c_str ());
}
/* If necessary, make the user confirm that we should quit. Return
{
int exit_code = 0;
- undo_terminal_modifications_before_exit ();
-
/* An optional expression may be used to cause gdb to terminate with the
value of that expression. */
if (exit_arg)
else if (return_child_result)
exit_code = return_child_result_value;
+ gdb::observers::gdb_exiting.notify (exit_code);
+
+ undo_terminal_modifications_before_exit ();
+
/* We want to handle any quit errors and exit regardless. */
/* Get out of tfind mode, and kill or detach all inferiors. */
/* Save the history information if it is appropriate to do so. */
try
{
- if (write_history_p && history_filename)
+ if (write_history_p && !history_filename.empty ())
{
int save = 0;
any UI with a terminal, save history. */
for (ui *ui : all_uis ())
{
- if (input_interactive_p (ui))
+ if (ui->input_interactive_p ())
{
save = 1;
break;
const char *value)
{
if (interactive_mode == AUTO_BOOLEAN_AUTO)
- fprintf_filtered (file, "Debugger's interactive mode "
- "is %s (currently %s).\n",
- value, input_interactive_p (current_ui) ? "on" : "off");
+ gdb_printf (file, "Debugger's interactive mode "
+ "is %s (currently %s).\n",
+ value, current_ui->input_interactive_p () ? "on" : "off");
else
- fprintf_filtered (file, "Debugger's interactive mode is %s.\n", value);
+ gdb_printf (file, "Debugger's interactive mode is %s.\n", value);
}
/* Returns whether GDB is running on an interactive terminal. */
-int
-input_interactive_p (struct ui *ui)
+bool
+ui::input_interactive_p () const
{
if (batch_flag)
- return 0;
+ return false;
if (interactive_mode != AUTO_BOOLEAN_AUTO)
return interactive_mode == AUTO_BOOLEAN_TRUE;
- return ui->input_interactive_p;
+ return m_input_interactive_p;
}
\f
static void
offset < num + Hist_print && offset < history_length;
offset++)
{
- printf_filtered ("%5d %s\n", history_base + offset,
- (history_get (history_base + offset))->line);
+ gdb_printf ("%5d %s\n", history_base + offset,
+ (history_get (history_base + offset))->line);
}
/* The next command we want to display is the next one that we haven't
set_readline_history_size (history_size_setshow_var);
- tmpenv = getenv ("GDBHISTFILE");
- if (tmpenv != nullptr)
- history_filename = xstrdup (tmpenv);
- else if (history_filename == nullptr)
- {
- /* We include the current directory so that if the user changes
- directories the file written will be the same as the one
- that was read. */
-#ifdef __MSDOS__
- /* No leading dots in file names are allowed on MSDOS. */
- const char *fname = "_gdb_history";
-#else
- const char *fname = ".gdb_history";
-#endif
-
- gdb::unique_xmalloc_ptr<char> temp (gdb_abspath (fname));
- history_filename = temp.release ();
- }
-
- if (!history_filename_empty ())
- read_history (history_filename);
+ if (!history_filename.empty ())
+ read_history (history_filename.c_str ());
}
static void
show_prompt (struct ui_file *file, int from_tty,
struct cmd_list_element *c, const char *value)
{
- fprintf_filtered (file, _("Gdb's prompt is \"%s\".\n"), value);
+ gdb_printf (file, _("Gdb's prompt is \"%s\".\n"), value);
}
/* "set editing" command. */
show_editing (struct ui_file *file, int from_tty,
struct cmd_list_element *c, const char *value)
{
- fprintf_filtered (file, _("Editing of command lines as "
- "they are typed is %s.\n"),
- current_ui->command_editing ? _("on") : _("off"));
+ gdb_printf (file, _("Editing of command lines as "
+ "they are typed is %s.\n"),
+ current_ui->command_editing ? _("on") : _("off"));
}
static void
show_annotation_level (struct ui_file *file, int from_tty,
struct cmd_list_element *c, const char *value)
{
- fprintf_filtered (file, _("Annotation_level is %s.\n"), value);
+ gdb_printf (file, _("Annotation_level is %s.\n"), value);
}
static void
show_exec_done_display_p (struct ui_file *file, int from_tty,
struct cmd_list_element *c, const char *value)
{
- fprintf_filtered (file, _("Notification of completion for "
- "asynchronous execution commands is %s.\n"),
- value);
+ gdb_printf (file, _("Notification of completion for "
+ "asynchronous execution commands is %s.\n"),
+ value);
}
/* New values of the "data-directory" parameter are staged here.
Extension languages, for example Python's gdb.parameter API, will read
the value directory from this variable, so we must ensure that this
always contains the correct value. */
-static char *staged_gdb_datadir;
+static std::string staged_gdb_datadir;
/* "set" command for the gdb_datadir configuration variable. */
static void
set_gdb_datadir (const char *args, int from_tty, struct cmd_list_element *c)
{
- set_gdb_data_directory (staged_gdb_datadir);
+ set_gdb_data_directory (staged_gdb_datadir.c_str ());
/* SET_GDB_DATA_DIRECTORY will resolve relative paths in
STAGED_GDB_DATADIR, so we now copy the value from GDB_DATADIR
back into STAGED_GDB_DATADIR so the extension languages can read the
correct value. */
- free (staged_gdb_datadir);
- staged_gdb_datadir = strdup (gdb_datadir.c_str ());
+ staged_gdb_datadir = gdb_datadir;
gdb::observers::gdb_datadir_changed.notify ();
}
show_gdb_datadir (struct ui_file *file, int from_tty,
struct cmd_list_element *c, const char *value)
{
- fprintf_filtered (file, _("GDB's data directory is \"%ps\".\n"),
- styled_string (file_name_style.style (),
- gdb_datadir.c_str ()));
+ gdb_printf (file, _("GDB's data directory is \"%ps\".\n"),
+ styled_string (file_name_style.style (),
+ gdb_datadir.c_str ()));
}
/* Implement 'set history filename'. */
/* We include the current directory so that if the user changes
directories the file written will be the same as the one
that was read. */
- if (!history_filename_empty () && !IS_ABSOLUTE_PATH (history_filename))
- {
- gdb::unique_xmalloc_ptr<char> temp (gdb_abspath (history_filename));
-
- xfree (history_filename);
- history_filename = temp.release ();
- }
+ if (!history_filename.empty ()
+ && !IS_ABSOLUTE_PATH (history_filename.c_str ()))
+ history_filename = gdb_abspath (history_filename.c_str ());
}
/* Whether we're in quiet startup mode. */
show_startup_quiet (struct ui_file *file, int from_tty,
struct cmd_list_element *c, const char *value)
{
- fprintf_filtered (file, _("Whether to start up quietly is %s.\n"),
- value);
+ gdb_printf (file, _("Whether to start up quietly is %s.\n"),
+ value);
}
static void
rl_completion_display_matches_hook = cli_display_match_list;
rl_readline_name = "gdb";
rl_terminal_name = getenv ("TERM");
+ rl_deprep_term_function = gdb_rl_deprep_term_function;
/* The name for this defun comes from Bash, where it originated.
15 is Control-o, the same binding this function has in Bash. */
&setlist,
&showlist);
/* Prime the initial value for data-directory. */
- staged_gdb_datadir = strdup (gdb_datadir.c_str ());
+ staged_gdb_datadir = gdb_datadir;
add_setshow_auto_boolean_cmd ("interactive-mode", class_support,
&interactive_mode, _("\
show_interactive_mode,
&setlist, &showlist);
- c = add_setshow_boolean_cmd ("startup-quietly", class_support,
+ add_setshow_boolean_cmd ("startup-quietly", class_support,
&startup_quiet, _("\
Set whether GDB should start up quietly."), _(" \
Show whether GDB should start up quietly."), _("\
set_cmd_completer (c, interpreter_completer);
}
+/* See top.h. */
+
void
-gdb_init (char *argv0)
+gdb_init ()
{
saved_command_line = xstrdup ("");
previous_saved_command_line = xstrdup ("");
to alter it. */
set_initial_gdb_ttystate ();
- async_init_signals ();
+ gdb_init_signals ();
/* We need a default language for parsing expressions, so simple
things like "set width 0" won't fail if no language is explicitly
set_language (language_c);
expected_language = current_language; /* Don't warn about the change. */
- /* Python initialization, for example, can require various commands to be
- installed. For example "info pretty-printer" needs the "info"
- prefix to be installed. Keep things simple and just do final
- script initialization here. */
- finish_ext_lang_initialization ();
-
/* Create $_gdb_major and $_gdb_minor convenience variables. */
init_gdb_version_vars ();
}
+
+void _initialize_top ();
+void
+_initialize_top ()
+{
+ /* Determine a default value for the history filename. */
+ const char *tmpenv = getenv ("GDBHISTFILE");
+ if (tmpenv != nullptr)
+ history_filename = tmpenv;
+ else
+ {
+ /* We include the current directory so that if the user changes
+ directories the file written will be the same as the one
+ that was read. */
+#ifdef __MSDOS__
+ /* No leading dots in file names are allowed on MSDOS. */
+ const char *fname = "_gdb_history";
+#else
+ const char *fname = ".gdb_history";
+#endif
+
+ history_filename = gdb_abspath (fname);
+ }
+}
projects / binutils-gdb.git / blobdiff