From bf298dd37122d45dbeaa609472714cb74793a521 Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Mon, 19 Apr 2004 19:57:32 +0000 Subject: [PATCH] * cli/cli-setshow.c (cmd_show_list): Check for "show" in the middle of prefixes. Don't print the prefix twice in the CLI. --- gdb/ChangeLog.intercu | 5 +++++ gdb/cli/cli-setshow.c | 6 ++++-- 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 + + * 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 * 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); } -- 2.47.2