/* Handle set and show GDB commands.
- Copyright (C) 2000-2013 Free Software Foundation, Inc.
+ Copyright (C) 2000-2017 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
#include "readline/tilde.h"
#include "value.h"
#include <ctype.h>
-#include "gdb_string.h"
#include "arch-utils.h"
#include "observer.h"
if (param_changed == 0)
return 0;
- if (c->class == class_maintenance || c->class == class_deprecated
- || c->class == class_obscure)
+ if (c->theclass == class_maintenance || c->theclass == class_deprecated
+ || c->theclass == class_obscure)
return 0;
return 1;
/* See cli-setshow.h. */
int
-parse_cli_boolean_value (char *arg)
+parse_cli_boolean_value (const char *arg)
{
int length;
{
size_t len = sizeof ("unlimited") - 1;
- arg = skip_spaces_const (arg);
+ arg = skip_spaces (arg);
return (strncmp (arg, "unlimited", len) == 0
&& (isspace (arg[len]) || arg[len] == '\0'));
other command). C is the command list element for the command. */
void
-do_set_command (char *arg, int from_tty, struct cmd_list_element *c)
+do_set_command (const char *arg, int from_tty, struct cmd_list_element *c)
{
/* A flag to indicate the option is changed or not. */
int option_changed = 0;
{
case var_string:
{
- char *new;
- char *p;
+ char *newobj;
+ const char *p;
char *q;
int ch;
if (arg == NULL)
arg = "";
- new = (char *) xmalloc (strlen (arg) + 2);
+ newobj = (char *) xmalloc (strlen (arg) + 2);
p = arg;
- q = new;
+ q = newobj;
while ((ch = *p++) != '\000')
{
if (ch == '\\')
*q++ = ' ';
#endif
*q++ = '\0';
- new = (char *) xrealloc (new, q - new);
+ newobj = (char *) xrealloc (newobj, q - newobj);
if (*(char **) c->var == NULL
- || strcmp (*(char **) c->var, new) != 0)
+ || strcmp (*(char **) c->var, newobj) != 0)
{
xfree (*(char **) c->var);
- *(char **) c->var = new;
+ *(char **) c->var = newobj;
option_changed = 1;
}
else
- xfree (new);
+ xfree (newobj);
}
break;
case var_string_noescape:
if (arg != NULL)
{
/* Clear trailing whitespace of filename. */
- char *ptr = arg + strlen (arg) - 1;
+ const char *ptr = arg + strlen (arg) - 1;
+ char *copy;
while (ptr >= arg && (*ptr == ' ' || *ptr == '\t'))
ptr--;
- *(ptr + 1) = '\0';
+ copy = xstrndup (arg, ptr + 1 - arg);
- val = tilde_expand (arg);
+ val = tilde_expand (copy);
+ xfree (copy);
}
else
val = xstrdup ("");
int len;
int nmatches;
const char *match = NULL;
- char *p;
+ const char *p;
/* If no argument was supplied, print an informative error
message. */
if (arg == NULL)
{
- char *msg;
- int msg_len = 0;
-
- for (i = 0; c->enums[i]; i++)
- msg_len += strlen (c->enums[i]) + 2;
-
- msg = xmalloc (msg_len);
- *msg = '\0';
- make_cleanup (xfree, msg);
+ std::string msg;
for (i = 0; c->enums[i]; i++)
{
if (i != 0)
- strcat (msg, ", ");
- strcat (msg, c->enums[i]);
+ msg += ", ";
+ msg += c->enums[i];
}
error (_("Requires an argument. Valid arguments are %s."),
- msg);
+ msg.c_str ());
}
p = strchr (arg, ' ');
error (_("gdb internal error: bad var_type in do_setshow_command"));
}
c->func (c, NULL, from_tty);
- if (deprecated_set_hook)
- deprecated_set_hook (c);
if (notify_command_param_changed_p (option_changed, c))
{
p = p->prefix;
}
- cp = name = xmalloc (length);
- cmds = xmalloc (sizeof (struct cmd_list_element *) * i);
+ cp = name = (char *) xmalloc (length);
+ cmds = XNEWVEC (struct cmd_list_element *, i);
/* Track back through filed 'prefix' and cache them in CMDS. */
for (i = 0, p = c; p != NULL; i++)
break;
case var_boolean:
{
- char *opt = *(int *) c->var ? "on" : "off";
+ const char *opt = *(int *) c->var ? "on" : "off";
observer_notify_command_param_changed (name, opt);
}
other command). C is the command list element for the command. */
void
-do_show_command (char *arg, int from_tty, struct cmd_list_element *c)
+do_show_command (const char *arg, int from_tty, struct cmd_list_element *c)
{
struct ui_out *uiout = current_uiout;
- struct cleanup *old_chain;
- struct ui_file *stb;
gdb_assert (c->type == show_cmd);
- stb = mem_fileopen ();
- old_chain = make_cleanup_ui_file_delete (stb);
+ string_file stb;
/* Possibly call the pre hook. */
if (c->pre_show_hook)
{
case var_string:
if (*(char **) c->var)
- fputstr_filtered (*(char **) c->var, '"', stb);
+ stb.putstr (*(char **) c->var, '"');
break;
case var_string_noescape:
case var_optional_filename:
case var_filename:
case var_enum:
if (*(char **) c->var)
- fputs_filtered (*(char **) c->var, stb);
+ stb.puts (*(char **) c->var);
break;
case var_boolean:
- fputs_filtered (*(int *) c->var ? "on" : "off", stb);
+ stb.puts (*(int *) c->var ? "on" : "off");
break;
case var_auto_boolean:
switch (*(enum auto_boolean*) c->var)
{
case AUTO_BOOLEAN_TRUE:
- fputs_filtered ("on", stb);
+ stb.puts ("on");
break;
case AUTO_BOOLEAN_FALSE:
- fputs_filtered ("off", stb);
+ stb.puts ("off");
break;
case AUTO_BOOLEAN_AUTO:
- fputs_filtered ("auto", stb);
+ stb.puts ("auto");
break;
default:
internal_error (__FILE__, __LINE__,
case var_zuinteger:
if (c->var_type == var_uinteger
&& *(unsigned int *) c->var == UINT_MAX)
- fputs_filtered ("unlimited", stb);
+ stb.puts ("unlimited");
else
- fprintf_filtered (stb, "%u", *(unsigned int *) c->var);
+ stb.printf ("%u", *(unsigned int *) c->var);
break;
case var_integer:
case var_zinteger:
if (c->var_type == var_integer
&& *(int *) c->var == INT_MAX)
- fputs_filtered ("unlimited", stb);
+ stb.puts ("unlimited");
else
- fprintf_filtered (stb, "%d", *(int *) c->var);
+ stb.printf ("%d", *(int *) c->var);
break;
case var_zuinteger_unlimited:
{
if (*(int *) c->var == -1)
- fputs_filtered ("unlimited", stb);
+ stb.puts ("unlimited");
else
- fprintf_filtered (stb, "%d", *(int *) c->var);
+ stb.printf ("%d", *(int *) c->var);
}
break;
default:
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);
+ if (uiout->is_mi_like_p ())
+ uiout->field_stream ("value", stb);
else
{
- char *value = ui_file_xstrdup (stb, NULL);
-
- make_cleanup (xfree, value);
if (c->show_value_func != NULL)
- c->show_value_func (gdb_stdout, from_tty, c, value);
+ c->show_value_func (gdb_stdout, from_tty, c, stb.c_str ());
else
- deprecated_show_value_hack (gdb_stdout, from_tty, c, value);
+ deprecated_show_value_hack (gdb_stdout, from_tty, c, stb.c_str ());
}
- do_cleanups (old_chain);
c->func (c, NULL, from_tty);
}
/* Show all the settings in a list of show commands. */
void
-cmd_show_list (struct cmd_list_element *list, int from_tty, char *prefix)
+cmd_show_list (struct cmd_list_element *list, int from_tty, const char *prefix)
{
- struct cleanup *showlist_chain;
struct ui_out *uiout = current_uiout;
- showlist_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "showlist");
+ ui_out_emit_tuple tuple_emitter (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)
{
- struct cleanup *optionlist_chain
- = make_cleanup_ui_out_tuple_begin_end (uiout, "optionlist");
- char *new_prefix = strstr (list->prefixname, "show ") + 5;
+ ui_out_emit_tuple optionlist_emitter (uiout, "optionlist");
+ const char *new_prefix = strstr (list->prefixname, "show ") + 5;
- if (ui_out_is_mi_like_p (uiout))
- ui_out_field_string (uiout, "prefix", new_prefix);
+ if (uiout->is_mi_like_p ())
+ uiout->field_string ("prefix", new_prefix);
cmd_show_list (*list->prefixlist, from_tty, new_prefix);
- /* Close the tuple. */
- do_cleanups (optionlist_chain);
}
else
{
- if (list->class != no_set_class)
+ if (list->theclass != no_set_class)
{
- struct cleanup *option_chain
- = make_cleanup_ui_out_tuple_begin_end (uiout, "option");
+ ui_out_emit_tuple option_emitter (uiout, "option");
- ui_out_text (uiout, prefix);
- ui_out_field_string (uiout, "name", list->name);
- ui_out_text (uiout, ": ");
+ uiout->text (prefix);
+ uiout->field_string ("name", list->name);
+ uiout->text (": ");
if (list->type == show_cmd)
do_show_command ((char *) NULL, from_tty, list);
else
cmd_func (list, NULL, from_tty);
- /* Close the tuple. */
- do_cleanups (option_chain);
}
}
}
- /* Close the tuple. */
- do_cleanups (showlist_chain);
}