summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Jacobowitz <dan@debian.org>2004-04-19 19:57:32 +0000
committerDaniel Jacobowitz <dan@debian.org>2004-04-19 19:57:32 +0000
commitaab1b71ed23f49c177e38b3e3b6c63a53c9f1e54 (patch)
treedf3f9804964725bd112cf05107424181b30c9fef
parenta18da32287cc8eeb9f0001bf031e53b6bb8d4a71 (diff)
downloadgdb-aab1b71ed23f49c177e38b3e3b6c63a53c9f1e54.tar.gz
* cli/cli-setshow.c (cmd_show_list): Check for "show" in the middle
of prefixes. Don't print the prefix twice in the CLI.
-rw-r--r--gdb/ChangeLog.intercu5
-rw-r--r--gdb/cli/cli-setshow.c6
2 files changed, 9 insertions, 2 deletions
diff --git a/gdb/ChangeLog.intercu b/gdb/ChangeLog.intercu
index 4b70276ff22..9f68f20bcca 100644
--- a/gdb/ChangeLog.intercu
+++ b/gdb/ChangeLog.intercu
@@ -1,3 +1,8 @@
+2004-04-19 Daniel Jacobowitz <drow@mvista.com>
+
+ * cli/cli-setshow.c (cmd_show_list): Check for "show" in the middle
+ of prefixes. Don't print the prefix twice in the CLI.
+
2004-04-18 Daniel Jacobowitz <drow@mvista.com>
* dwarf2read.c (add_partial_structure): Remove.
diff --git a/gdb/cli/cli-setshow.c b/gdb/cli/cli-setshow.c
index 62fe36f360b..91b018eeb82 100644
--- a/gdb/cli/cli-setshow.c
+++ b/gdb/cli/cli-setshow.c
@@ -364,8 +364,10 @@ cmd_show_list (struct cmd_list_element *list, int from_tty, char *prefix)
{
struct cleanup *optionlist_chain
= make_cleanup_ui_out_tuple_begin_end (uiout, "optionlist");
- ui_out_field_string (uiout, "prefix", list->prefixname + 5);
- cmd_show_list (*list->prefixlist, from_tty, list->prefixname + 5);
+ char *new_prefix = strstr (list->prefixname, "show ") + 5;
+ if (ui_out_is_mi_like_p (uiout))
+ ui_out_field_string (uiout, "prefix", new_prefix);
+ cmd_show_list (*list->prefixlist, from_tty, new_prefix);
/* Close the tuple. */
do_cleanups (optionlist_chain);
}