From 275f2e57c2a0194f9606ca966506ceb5ce0677b5 Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Tue, 16 Feb 2010 21:18:46 +0000 Subject: [PATCH] gdb/ * infcmd.c (show_inferior_tty_command): Check for NULL. Correct output message. --- gdb/ChangeLog | 5 +++++ gdb/infcmd.c | 8 +++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d7d71fd..077528a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2010-02-16 Daniel Jacobowitz + * infcmd.c (show_inferior_tty_command): Check for NULL. + Correct output message. + +2010-02-16 Daniel Jacobowitz + * linespec.c (decode_line_1): Handle FILE:FUNCTION even if FUNCTION contains parentheses. Improve removal of a trailing single quote. diff --git a/gdb/infcmd.c b/gdb/infcmd.c index f99a4ae..29cf427 100644 --- a/gdb/infcmd.c +++ b/gdb/infcmd.c @@ -197,10 +197,12 @@ show_inferior_tty_command (struct ui_file *file, int from_tty, { /* Note that we ignore the passed-in value in favor of computing it directly. */ + const char *inferior_io_terminal = get_inferior_io_terminal (); + if (inferior_io_terminal == NULL) + inferior_io_terminal = ""; fprintf_filtered (gdb_stdout, - _("argument list to give program being debugged when " - "it is started is %s"), - get_inferior_io_terminal ()); + _("Terminal for future runs of program being debugged " + "is \"%s\".\n"), inferior_io_terminal); } char * -- 2.7.4