2005-02-10 Andrew Cagney <cagney@gnu.org>

[deliverable/binutils-gdb.git] / gdb / cli / cli-setshow.c

diff --git a/gdb/cli/cli-setshow.c b/gdb/cli/cli-setshow.c
index 6fe2ff0816ba2c7d67f8626a7343b67cf88a6669..73e47a4348ff873797615a1a32e20c2e10bb6c18 100644 (file)
--- a/gdb/cli/cli-setshow.c
+++ b/gdb/cli/cli-setshow.c
@@ -1,6 +1,6 @@
 /* Handle set and show GDB commands.
 
-   Copyright 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
    Boston, MA 02111-1307, USA.  */
 
 #include "defs.h"
-#include <readline/tilde.h>
+#include "readline/tilde.h"
 #include "value.h"
 #include <ctype.h>
 #include "gdb_string.h"
@@ -213,7 +213,7 @@ do_setshow_command (char *arg, int from_tty, struct cmd_list_element *c)
                    strcat (msg, c->enums[i]);
                  }
                strcat (msg, ".");
-               error (msg);
+               error ("%s", msg);
              }
 
            p = strchr (arg, ' ');
@@ -266,11 +266,6 @@ do_setshow_command (char *arg, int from_tty, struct cmd_list_element *c)
       if (c->pre_show_hook)
        (c->pre_show_hook) (c);
 
-      /* Print doc minus "show" at start.  */
-      print_doc_line (gdb_stdout, c->doc + 5);
-
-      ui_out_text (uiout, " is ");
-      ui_out_wrap_hint (uiout, "    ");
       quote = 0;
       switch (c->var_type)
        {
@@ -333,19 +328,37 @@ do_setshow_command (char *arg, int from_tty, struct cmd_list_element *c)
        default:
          error ("gdb internal error: bad var_type in do_setshow_command");
        }
-      if (quote)
-       ui_out_text (uiout, "\"");
-      ui_out_field_stream (uiout, "value", stb);
-      if (quote)
-       ui_out_text (uiout, "\"");
-      ui_out_text (uiout, ".\n");
+
+
+      /* FIXME: cagney/2005-02-10: Need to split this in half: code to
+        convert the value into a string (esentially the above); and
+        code to print the value out.  For the latter there should be
+        MI and CLI specific versions.  */
+
+      if (ui_out_is_mi_like_p (uiout))
+       ui_out_field_stream (uiout, "value", stb);
+      else
+       {
+         /* Print doc minus "show" at start.  */
+         print_doc_line (gdb_stdout, c->doc + 5);
+
+         ui_out_text (uiout, " is ");
+         ui_out_wrap_hint (uiout, "    ");
+         if (quote)
+           ui_out_text (uiout, "\"");
+         ui_out_field_stream (uiout, "value", stb);
+         if (quote)
+           ui_out_text (uiout, "\"");
+         ui_out_text (uiout, ".\n");
+         do_cleanups (old_chain);
+       }
       do_cleanups (old_chain);
     }
   else
     error ("gdb internal error: bad cmd_type in do_setshow_command");
   c->func (c, NULL, from_tty);
-  if (c->type == set_cmd && set_hook)
-    set_hook (c);
+  if (c->type == set_cmd && deprecated_set_hook)
+    deprecated_set_hook (c);
 }
 
 /* Show all the settings in a list of show commands.  */
@@ -353,28 +366,37 @@ do_setshow_command (char *arg, int from_tty, struct cmd_list_element *c)
 void
 cmd_show_list (struct cmd_list_element *list, int from_tty, char *prefix)
 {
-  ui_out_tuple_begin (uiout, "showlist");
+  struct cleanup *showlist_chain;
+
+  showlist_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "showlist");
   for (; list != NULL; list = list->next)
     {
       /* If we find a prefix, run its list, prefixing our output by its
          prefix (with "show " skipped).  */
       if (list->prefixlist && !list->abbrev_flag)
        {
-         ui_out_tuple_begin (uiout, "optionlist");
-         ui_out_field_string (uiout, "prefix", list->prefixname + 5);
-         cmd_show_list (*list->prefixlist, from_tty, list->prefixname + 5);
-         ui_out_tuple_end (uiout);
+         struct cleanup *optionlist_chain
+           = make_cleanup_ui_out_tuple_begin_end (uiout, "optionlist");
+         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);
        }
       if (list->type == show_cmd)
        {
-         ui_out_tuple_begin (uiout, "option");
+         struct cleanup *option_chain
+           = make_cleanup_ui_out_tuple_begin_end (uiout, "option");
          ui_out_text (uiout, prefix);
          ui_out_field_string (uiout, "name", list->name);
          ui_out_text (uiout, ":  ");
          do_setshow_command ((char *) NULL, from_tty, list);
-         ui_out_tuple_end (uiout);
+          /* Close the tuple.  */
+         do_cleanups (option_chain);
        }
     }
-  ui_out_tuple_end (uiout);
+  /* Close the tuple.  */
+  do_cleanups (showlist_chain);
 }