2000-12-01 Fernando Nasser <fnasser@redhat.com>

        * cli/cli-decode.c: New file. Handle lists of commands, their decoding
        and documentation.
        (add_cmd, deprecate_cmd, add_abbrev_cmd, add_alias_cmd, add_prefix_cmd,
        add_abbrev_prefix_cmd, not_just_help_class_command, empty_sfunc,
        add_set_cmd, add_set_enum_cmd, add_set_auto_boolean_cmd,
        add_show_from_set, delete_cmd, apropos_cmd, help_cmd, help_list,
        help_all, print_doc_line, help_cmd_list, find_cmd, lookup_cmd_1,
        undef_cmd_error, lookup_cmd, deprecated_cmd_warning,
        lookup_cmd_composition, complete_on_cmdlist, complete_on_enum):
        Moved here from command.c.
        (add_info, add_info_alias, add_com, add_com_alias): Moved here from
        top.c.
        * cli/cli-decode.h: Definitions/declarations for the above.
        * cli/cli-cmds.c: New file.  GDB CLI commands.
        (error_no_arg, info_command, show_command, help_command, show_version,
        quit_command, pwd_command, cd_command, echo_command, shell_escape,
        make_command, show_user, set_debug, show_debug, init_cmd_lists):
        Moved here from top.c.
        (apropos_command): Moved here from command.c.
        (complete_command, source_command): Moved here (part) from top.c.
        (is_complete_command): New function. Checks if a command is the
        "complete" command.
        (init_cli_cmds): New function. Add commands to the CLI (from code
        previously in top.c.
        * cli/cli-cmds.h: Definitions/declarations for the above.
        * cli/cli-script.c: New file. GDB CLI command scripting.
        (build_command_line, get_command_line, print_command_lines,
        print_command_line, execute_user_command, execute_control_command,
        while_command, if_command, arg_cleanup, setup_user_args, locate_arg,
        insert_args, realloc_body_list, read_next_line,
        recurse_read_control_structure, read_command_lines, free_command_lines,
        do_free_command_lines_cleanup, make_cleanup_free_command_lines,
        validate_comname, user_defined_command, define_command,
        document_command, source_cleanup_lines, do_fclose_cleanup,
        show_user_1): Moved here from top.c.
        (script_from_file): New function. Implements execution of a script
        contained in a file (part of code for the source_command() that used
        to exist in top.c).
        * cli/cli-script.h: Definitions/declarations for the above.
        * cli/cli-setshow.c: New file. Handle set and show GDB CLI commands.
        (parse_auto_binary_operation, parse_binary_operation,
        do_setshow_command, cmd_show_list): Moved here from command.c.
        * cli/cli-setshow.h: Definitions/declarations for the above.
        * top.c: Remove all CLI code, except the command loop.
        (gdb_init): Call init_cli_cmds().
        * command.c: Remove obsolete file.
        * command.h: Mark as DEPRECATED.
        * gdbcmd.h: Ditto.
        * call-cmds.h: Ditto.
        * Makefile.in (SFILES): Remove command.c.
        (COMMON_OBS): Remove command.o.
        (command.o): Remove obsolete target.
        (cli_decode_h, cli_cmds_h, cli_script_h, cli_setshow_h): New macros.
        Refer to CLI header files.
        (cli-decode.o, cli-cmds.o, cli-setshow.o, cli-script.o): New targets.
        (SUBDIR_CLI_OBS, SUBDIR_CLI_SRCS, SUBDIR_CLI_DEPS, SUBDIR_CLI_INITS,
        SUBDIR_CLI_LDFLAGS, SUBDIR_CLI_CFLAGS, SUBDIR_CLI_ALL, SUBDIR_CLI_CLEAN,
        SUBDIR_CLI_INSTALL, SUBDIR_CLI_UNINSTALL): New macros for new cli
        subdirectory.
        * configure.in (enable_gdbcli): New option. Include the CLI in the
        executable (cannot be disabled yet).
        (CONFIG_OBS, CONFIG_DEPS, CONFIG_SRCS, CONFIG_INITS, ENABLE_CFLAGS,
        CONFIG_ALL, CONFIG_CLEAN, CONFIG_INSTALL, CONFIG_UNINSTALL): Add
        the corresponding SUBDIR_CLI_* macros if CLI requested.
        * configure: Regenerate.

1 files changed, 34 insertions, 1881 deletions

diff --git a/gdb/top.c b/gdb/top.c
index c2db730e2a3..f80be47e13c 100644
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -56,91 +56,56 @@
 #include "cli-out.h"
 #endif
 
-/* Prototypes for local functions */
+/* From completer.c */
 
-static void dont_repeat_command (char *, int);
+extern int is_complete_command (void (*func) (char *args, int from_tty));
 
-static void source_cleanup_lines (PTR);
+/* From cli/cli-cmds.c */
 
-static void user_defined_command (char *, int);
+extern void init_cmd_lists (void);
 
-static void init_signals (void);
+extern void init_cli_cmds (void);
 
-#ifdef STOP_SIGNAL
-static void stop_sig (int);
-#endif
+extern void execute_user_command (struct cmd_list_element *c, char *args);
 
-static char *readline_line_completion_function (char *, int);
+/* From cli/cli-setshow.c */
 
-static void while_command (char *, int);
+extern void do_setshow_command (char *, int, struct cmd_list_element *);
 
-static void if_command (char *, int);
+/* Exported to CLI cli/cli-cmds.c. */
 
-static struct command_line *build_command_line (enum command_control_type,
-						char *);
+void set_verbose (char *, int, struct cmd_list_element *);
 
-static struct command_line *get_command_line (enum command_control_type,
-					      char *);
+void show_history (char *, int);
 
-static void realloc_body_list (struct command_line *, int);
+void set_history (char *, int);
 
-static enum misc_command_type read_next_line (struct command_line **);
+void show_commands (char *, int);
 
-static enum command_control_type
-recurse_read_control_structure (struct command_line *);
+void do_restore_instream_cleanup (void *stream);
 
-static struct cleanup *setup_user_args (char *);
+/* Prototypes for local functions */
 
-static char *locate_arg (char *);
+static void dont_repeat_command (char *, int);
 
-static char *insert_args (char *);
+static void init_signals (void);
 
-static void arg_cleanup (void *);
+#ifdef STOP_SIGNAL
+static void stop_sig (int);
+#endif
 
-static void init_main (void);
+static char *readline_line_completion_function (char *, int);
 
-static void init_cmd_lists (void);
+static void init_main (void);
 
 static void float_handler (int);
 
 static void init_signals (void);
 
-static void set_verbose (char *, int, struct cmd_list_element *);
-
-static void show_history (char *, int);
-
-static void set_history (char *, int);
-
 static void set_history_size_command (char *, int, struct cmd_list_element *);
 
-static void show_commands (char *, int);
-
-static void echo_command (char *, int);
-
-static void pwd_command (char *, int);
-
-static void show_version (char *, int);
-
-static void document_command (char *, int);
-
-static void define_command (char *, int);
-
-static void validate_comname (char *);
-
-static void help_command (char *, int);
-
-static void show_command (char *, int);
-
-static void info_command (char *, int);
-
-static void complete_command (char *, int);
-
 static void do_nothing (int);
 
-static void show_debug (char *, int);
-
-static void set_debug (char *, int);
-
 #ifdef SIGHUP
 /* NOTE 1999-04-29: This function will be static again, once we modify
    gdb to use the event loop as the default command loop and we merge
@@ -150,10 +115,6 @@ static void set_debug (char *, int);
 static void disconnect (int);
 #endif
 
-static void do_restore_instream_cleanup (void *stream);
-
-static struct cleanup *make_cleanup_free_command_lines (struct command_line **);
-
 /* Default command line prompt.  This is overriden in some configs. */
 
 #ifndef DEFAULT_PROMPT
@@ -180,88 +141,6 @@ extern char lang_frame_mismatch_warn[];		/* language.c */
 
 int caution = 1;		/* Default is yes, sigh. */
 
-/* Define all cmd_list_elements.  */
-
-/* Chain containing all defined commands.  */
-
-struct cmd_list_element *cmdlist;
-
-/* Chain containing all defined info subcommands.  */
-
-struct cmd_list_element *infolist;
-
-/* Chain containing all defined enable subcommands. */
-
-struct cmd_list_element *enablelist;
-
-/* Chain containing all defined disable subcommands. */
-
-struct cmd_list_element *disablelist;
-
-/* Chain containing all defined toggle subcommands. */
-
-struct cmd_list_element *togglelist;
-
-/* Chain containing all defined stop subcommands. */
-
-struct cmd_list_element *stoplist;
-
-/* Chain containing all defined delete subcommands. */
-
-struct cmd_list_element *deletelist;
-
-/* Chain containing all defined "enable breakpoint" subcommands. */
-
-struct cmd_list_element *enablebreaklist;
-
-/* Chain containing all defined set subcommands */
-
-struct cmd_list_element *setlist;
-
-/* Chain containing all defined unset subcommands */
-
-struct cmd_list_element *unsetlist;
-
-/* Chain containing all defined show subcommands.  */
-
-struct cmd_list_element *showlist;
-
-/* Chain containing all defined \"set history\".  */
-
-struct cmd_list_element *sethistlist;
-
-/* Chain containing all defined \"show history\".  */
-
-struct cmd_list_element *showhistlist;
-
-/* Chain containing all defined \"unset history\".  */
-
-struct cmd_list_element *unsethistlist;
-
-/* Chain containing all defined maintenance subcommands. */
-
-struct cmd_list_element *maintenancelist;
-
-/* Chain containing all defined "maintenance info" subcommands. */
-
-struct cmd_list_element *maintenanceinfolist;
-
-/* Chain containing all defined "maintenance print" subcommands. */
-
-struct cmd_list_element *maintenanceprintlist;
-
-struct cmd_list_element *setprintlist;
-
-struct cmd_list_element *showprintlist;
-
-struct cmd_list_element *setdebuglist;
-
-struct cmd_list_element *showdebuglist;
-
-struct cmd_list_element *setchecklist;
-
-struct cmd_list_element *showchecklist;
-
 /* stdio stream that command input is being read from.  Set to stdin normally.
    Set by source_command to the file we are sourcing.  Set to NULL if we are
    executing a user-defined command or interacting via a GUI.  */
@@ -750,7 +629,7 @@ static int source_error_allocated;
 /* Clean up on error during a "source" command (or execution of a
    user-defined command).  */
 
-static void
+void
 do_restore_instream_cleanup (void *stream)
 {
   /* Restore the previous input stream.  */
@@ -804,6 +683,7 @@ gdb_init (char *argv0)
   initialize_utils ();		/* Make errors and warnings possible */
   initialize_all_files ();
   initialize_current_architecture ();
+  init_cli_cmds();
   init_main ();			/* But that omits this file!  Do it now */
 
   /* The signal handling mechanism is different depending whether or
@@ -841,611 +721,6 @@ gdb_init (char *argv0)
     init_ui_hook (argv0);
 }
 
-/* Allocate, initialize a new command line structure for one of the
-   control commands (if/while).  */
-
-static struct command_line *
-build_command_line (enum command_control_type type, char *args)
-{
-  struct command_line *cmd;
-
-  if (args == NULL)
-    error ("if/while commands require arguments.\n");
-
-  cmd = (struct command_line *) xmalloc (sizeof (struct command_line));
-  cmd->next = NULL;
-  cmd->control_type = type;
-
-  cmd->body_count = 1;
-  cmd->body_list
-    = (struct command_line **) xmalloc (sizeof (struct command_line *)
-					* cmd->body_count);
-  memset (cmd->body_list, 0, sizeof (struct command_line *) * cmd->body_count);
-  cmd->line = savestring (args, strlen (args));
-  return cmd;
-}
-
-/* Build and return a new command structure for the control commands
-   such as "if" and "while".  */
-
-static struct command_line *
-get_command_line (enum command_control_type type, char *arg)
-{
-  struct command_line *cmd;
-  struct cleanup *old_chain = NULL;
-
-  /* Allocate and build a new command line structure.  */
-  cmd = build_command_line (type, arg);
-
-  old_chain = make_cleanup_free_command_lines (&cmd);
-
-  /* Read in the body of this command.  */
-  if (recurse_read_control_structure (cmd) == invalid_control)
-    {
-      warning ("error reading in control structure\n");
-      do_cleanups (old_chain);
-      return NULL;
-    }
-
-  discard_cleanups (old_chain);
-  return cmd;
-}
-
-/* Recursively print a command (including full control structures).  */
-#ifdef UI_OUT
-void
-print_command_lines (struct ui_out *uiout, struct command_line *cmd,
-		     unsigned int depth)
-{
-  struct command_line *list;
-
-  list = cmd;
-  while (list)
-    {
-
-      if (depth)
-	ui_out_spaces (uiout, 2 * depth);
-
-      /* A simple command, print it and continue.  */
-      if (list->control_type == simple_control)
-	{
-	  ui_out_field_string (uiout, NULL, list->line);
-	  ui_out_text (uiout, "\n");
-	  list = list->next;
-	  continue;
-	}
-
-      /* loop_continue to jump to the start of a while loop, print it
-         and continue. */
-      if (list->control_type == continue_control)
-	{
-	  ui_out_field_string (uiout, NULL, "loop_continue");
-	  ui_out_text (uiout, "\n");
-	  list = list->next;
-	  continue;
-	}
-
-      /* loop_break to break out of a while loop, print it and continue.  */
-      if (list->control_type == break_control)
-	{
-	  ui_out_field_string (uiout, NULL, "loop_break");
-	  ui_out_text (uiout, "\n");
-	  list = list->next;
-	  continue;
-	}
-
-      /* A while command.  Recursively print its subcommands and continue.  */
-      if (list->control_type == while_control)
-	{
-	  ui_out_text (uiout, "while ");
-	  ui_out_field_fmt (uiout, NULL, "while %s", list->line);
-	  ui_out_text (uiout, "\n");
-	  print_command_lines (uiout, *list->body_list, depth + 1);
-	  ui_out_field_string (uiout, NULL, "end");
-	  if (depth)
-	    ui_out_spaces (uiout, 2 * depth);
-	  ui_out_text (uiout, "end\n");
-	  list = list->next;
-	  continue;
-	}
-
-      /* An if command.  Recursively print both arms before continueing.  */
-      if (list->control_type == if_control)
-	{
-	  ui_out_text (uiout, "if ");
-	  ui_out_field_fmt (uiout, NULL, "if %s", list->line);
-	  ui_out_text (uiout, "\n");
-	  /* The true arm. */
-	  print_command_lines (uiout, list->body_list[0], depth + 1);
-
-	  /* Show the false arm if it exists.  */
-	  if (list->body_count == 2)
-	    {
-	      if (depth)
-		ui_out_spaces (uiout, 2 * depth);
-	      ui_out_field_string (uiout, NULL, "else");
-	      ui_out_text (uiout, "else\n");
-	      print_command_lines (uiout, list->body_list[1], depth + 1);
-	    }
-
-	  ui_out_field_string (uiout, NULL, "end");
-	  if (depth)
-	    ui_out_spaces (uiout, 2 * depth);
-	  ui_out_text (uiout, "end\n");
-	  list = list->next;
-	  continue;
-	}
-
-      /* ignore illegal command type and try next */
-      list = list->next;
-    }				/* while (list) */
-}
-#else
-void
-print_command_line (struct command_line *cmd, unsigned int depth,
-		    struct ui_file *stream)
-{
-  unsigned int i;
-
-  if (depth)
-    {
-      for (i = 0; i < depth; i++)
-	fputs_filtered ("  ", stream);
-    }
-
-  /* A simple command, print it and return.  */
-  if (cmd->control_type == simple_control)
-    {
-      fputs_filtered (cmd->line, stream);
-      fputs_filtered ("\n", stream);
-      return;
-    }
-
-  /* loop_continue to jump to the start of a while loop, print it
-     and return. */
-  if (cmd->control_type == continue_control)
-    {
-      fputs_filtered ("loop_continue\n", stream);
-      return;
-    }
-
-  /* loop_break to break out of a while loop, print it and return.  */
-  if (cmd->control_type == break_control)
-    {
-      fputs_filtered ("loop_break\n", stream);
-      return;
-    }
-
-  /* A while command.  Recursively print its subcommands before returning.  */
-  if (cmd->control_type == while_control)
-    {
-      struct command_line *list;
-      fputs_filtered ("while ", stream);
-      fputs_filtered (cmd->line, stream);
-      fputs_filtered ("\n", stream);
-      list = *cmd->body_list;
-      while (list)
-	{
-	  print_command_line (list, depth + 1, stream);
-	  list = list->next;
-	}
-    }
-
-  /* An if command.  Recursively print both arms before returning.  */
-  if (cmd->control_type == if_control)
-    {
-      fputs_filtered ("if ", stream);
-      fputs_filtered (cmd->line, stream);
-      fputs_filtered ("\n", stream);
-      /* The true arm. */
-      print_command_line (cmd->body_list[0], depth + 1, stream);
-
-      /* Show the false arm if it exists.  */
-      if (cmd->body_count == 2)
-	{
-	  if (depth)
-	    {
-	      for (i = 0; i < depth; i++)
-		fputs_filtered ("  ", stream);
-	    }
-	  fputs_filtered ("else\n", stream);
-	  print_command_line (cmd->body_list[1], depth + 1, stream);
-	}
-      if (depth)
-	{
-	  for (i = 0; i < depth; i++)
-	    fputs_filtered ("  ", stream);
-	}
-      fputs_filtered ("end\n", stream);
-    }
-}
-#endif
-
-/* Execute the command in CMD.  */
-
-enum command_control_type
-execute_control_command (struct command_line *cmd)
-{
-  struct expression *expr;
-  struct command_line *current;
-  struct cleanup *old_chain = 0;
-  value_ptr val;
-  value_ptr val_mark;
-  int loop;
-  enum command_control_type ret;
-  char *new_line;
-
-  switch (cmd->control_type)
-    {
-    case simple_control:
-      /* A simple command, execute it and return.  */
-      new_line = insert_args (cmd->line);
-      if (!new_line)
-	return invalid_control;
-      old_chain = make_cleanup (free_current_contents, &new_line);
-      execute_command (new_line, 0);
-      ret = cmd->control_type;
-      break;
-
-    case continue_control:
-    case break_control:
-      /* Return for "continue", and "break" so we can either
-         continue the loop at the top, or break out.  */
-      ret = cmd->control_type;
-      break;
-
-    case while_control:
-      {
-	/* Parse the loop control expression for the while statement.  */
-	new_line = insert_args (cmd->line);
-	if (!new_line)
-	  return invalid_control;
-	old_chain = make_cleanup (free_current_contents, &new_line);
-	expr = parse_expression (new_line);
-	make_cleanup (free_current_contents, &expr);
-
-	ret = simple_control;
-	loop = 1;
-
-	/* Keep iterating so long as the expression is true.  */
-	while (loop == 1)
-	  {
-	    int cond_result;
-
-	    QUIT;
-
-	    /* Evaluate the expression.  */
-	    val_mark = value_mark ();
-	    val = evaluate_expression (expr);
-	    cond_result = value_true (val);
-	    value_free_to_mark (val_mark);
-
-	    /* If the value is false, then break out of the loop.  */
-	    if (!cond_result)
-	      break;
-
-	    /* Execute the body of the while statement.  */
-	    current = *cmd->body_list;
-	    while (current)
-	      {
-		ret = execute_control_command (current);
-
-		/* If we got an error, or a "break" command, then stop
-		   looping.  */
-		if (ret == invalid_control || ret == break_control)
-		  {
-		    loop = 0;
-		    break;
-		  }
-
-		/* If we got a "continue" command, then restart the loop
-		   at this point.  */
-		if (ret == continue_control)
-		  break;
-
-		/* Get the next statement.  */
-		current = current->next;
-	      }
-	  }
-
-	/* Reset RET so that we don't recurse the break all the way down.  */
-	if (ret == break_control)
-	  ret = simple_control;
-
-	break;
-      }
-
-    case if_control:
-      {
-	new_line = insert_args (cmd->line);
-	if (!new_line)
-	  return invalid_control;
-	old_chain = make_cleanup (free_current_contents, &new_line);
-	/* Parse the conditional for the if statement.  */
-	expr = parse_expression (new_line);
-	make_cleanup (free_current_contents, &expr);
-
-	current = NULL;
-	ret = simple_control;
-
-	/* Evaluate the conditional.  */
-	val_mark = value_mark ();
-	val = evaluate_expression (expr);
-
-	/* Choose which arm to take commands from based on the value of the
-	   conditional expression.  */
-	if (value_true (val))
-	  current = *cmd->body_list;
-	else if (cmd->body_count == 2)
-	  current = *(cmd->body_list + 1);
-	value_free_to_mark (val_mark);
-
-	/* Execute commands in the given arm.  */
-	while (current)
-	  {
-	    ret = execute_control_command (current);
-
-	    /* If we got an error, get out.  */
-	    if (ret != simple_control)
-	      break;
-
-	    /* Get the next statement in the body.  */
-	    current = current->next;
-	  }
-
-	break;
-      }
-
-    default:
-      warning ("Invalid control type in command structure.");
-      return invalid_control;
-    }
-
-  if (old_chain)
-    do_cleanups (old_chain);
-
-  return ret;
-}
-
-/* "while" command support.  Executes a body of statements while the
-   loop condition is nonzero.  */
-
-static void
-while_command (char *arg, int from_tty)
-{
-  struct command_line *command = NULL;
-
-  control_level = 1;
-  command = get_command_line (while_control, arg);
-
-  if (command == NULL)
-    return;
-
-  execute_control_command (command);
-  free_command_lines (&command);
-}
-
-/* "if" command support.  Execute either the true or false arm depending
-   on the value of the if conditional.  */
-
-static void
-if_command (char *arg, int from_tty)
-{
-  struct command_line *command = NULL;
-
-  control_level = 1;
-  command = get_command_line (if_control, arg);
-
-  if (command == NULL)
-    return;
-
-  execute_control_command (command);
-  free_command_lines (&command);
-}
-
-/* Cleanup */
-static void
-arg_cleanup (void *ignore)
-{
-  struct user_args *oargs = user_args;
-  if (!user_args)
-    internal_error ("Internal error, arg_cleanup called with no user args.\n");
-
-  user_args = user_args->next;
-  free (oargs);
-}
-
-/* Bind the incomming arguments for a user defined command to
-   $arg0, $arg1 ... $argMAXUSERARGS.  */
-
-static struct cleanup *
-setup_user_args (char *p)
-{
-  struct user_args *args;
-  struct cleanup *old_chain;
-  unsigned int arg_count = 0;
-
-  args = (struct user_args *) xmalloc (sizeof (struct user_args));
-  memset (args, 0, sizeof (struct user_args));
-
-  args->next = user_args;
-  user_args = args;
-
-  old_chain = make_cleanup (arg_cleanup, 0/*ignored*/);
-
-  if (p == NULL)
-    return old_chain;
-
-  while (*p)
-    {
-      char *start_arg;
-      int squote = 0;
-      int dquote = 0;
-      int bsquote = 0;
-
-      if (arg_count >= MAXUSERARGS)
-	{
-	  error ("user defined function may only have %d arguments.\n",
-		 MAXUSERARGS);
-	  return old_chain;
-	}
-
-      /* Strip whitespace.  */
-      while (*p == ' ' || *p == '\t')
-	p++;
-
-      /* P now points to an argument.  */
-      start_arg = p;
-      user_args->a[arg_count].arg = p;
-
-      /* Get to the end of this argument.  */
-      while (*p)
-	{
-	  if (((*p == ' ' || *p == '\t')) && !squote && !dquote && !bsquote)
-	    break;
-	  else
-	    {
-	      if (bsquote)
-		bsquote = 0;
-	      else if (*p == '\\')
-		bsquote = 1;
-	      else if (squote)
-		{
-		  if (*p == '\'')
-		    squote = 0;
-		}
-	      else if (dquote)
-		{
-		  if (*p == '"')
-		    dquote = 0;
-		}
-	      else
-		{
-		  if (*p == '\'')
-		    squote = 1;
-		  else if (*p == '"')
-		    dquote = 1;
-		}
-	      p++;
-	    }
-	}
-
-      user_args->a[arg_count].len = p - start_arg;
-      arg_count++;
-      user_args->count++;
-    }
-  return old_chain;
-}
-
-/* Given character string P, return a point to the first argument ($arg),
-   or NULL if P contains no arguments.  */
-
-static char *
-locate_arg (char *p)
-{
-  while ((p = strchr (p, '$')))
-    {
-      if (strncmp (p, "$arg", 4) == 0 && isdigit (p[4]))
-	return p;
-      p++;
-    }
-  return NULL;
-}
-
-/* Insert the user defined arguments stored in user_arg into the $arg
-   arguments found in line, with the updated copy being placed into nline.  */
-
-static char *
-insert_args (char *line)
-{
-  char *p, *save_line, *new_line;
-  unsigned len, i;
-
-  /* First we need to know how much memory to allocate for the new line.  */
-  save_line = line;
-  len = 0;
-  while ((p = locate_arg (line)))
-    {
-      len += p - line;
-      i = p[4] - '0';
-
-      if (i >= user_args->count)
-	{
-	  error ("Missing argument %d in user function.\n", i);
-	  return NULL;
-	}
-      len += user_args->a[i].len;
-      line = p + 5;
-    }
-
-  /* Don't forget the tail.  */
-  len += strlen (line);
-
-  /* Allocate space for the new line and fill it in.  */
-  new_line = (char *) xmalloc (len + 1);
-  if (new_line == NULL)
-    return NULL;
-
-  /* Restore pointer to beginning of old line.  */
-  line = save_line;
-
-  /* Save pointer to beginning of new line.  */
-  save_line = new_line;
-
-  while ((p = locate_arg (line)))
-    {
-      int i, len;
-
-      memcpy (new_line, line, p - line);
-      new_line += p - line;
-      i = p[4] - '0';
-
-      len = user_args->a[i].len;
-      if (len)
-	{
-	  memcpy (new_line, user_args->a[i].arg, len);
-	  new_line += len;
-	}
-      line = p + 5;
-    }
-  /* Don't forget the tail.  */
-  strcpy (new_line, line);
-
-  /* Return a pointer to the beginning of the new line.  */
-  return save_line;
-}
-
-void
-execute_user_command (struct cmd_list_element *c, char *args)
-{
-  register struct command_line *cmdlines;
-  struct cleanup *old_chain;
-  enum command_control_type ret;
-
-  old_chain = setup_user_args (args);
-
-  cmdlines = c->user_commands;
-  if (cmdlines == 0)
-    /* Null command */
-    return;
-
-  /* Set the instream to 0, indicating execution of a
-     user-defined function.  */
-  old_chain = make_cleanup (do_restore_instream_cleanup, instream);
-  instream = (FILE *) 0;
-  while (cmdlines)
-    {
-      ret = execute_control_command (cmdlines);
-      if (ret != simple_control && ret != break_control)
-	{
-	  warning ("Error in control structure.\n");
-	  break;
-	}
-      cmdlines = cmdlines->next;
-    }
-  do_cleanups (old_chain);
-}
-
 /* Execute the line P as a command.
    Pass FROM_TTY as second argument to the defining function.  */
 
@@ -1493,7 +768,9 @@ extern void serial_log_command (const char *);
       arg = *p ? p : 0;
 
       /* Clear off trailing whitespace, except for set and complete command.  */
-      if (arg && c->type != set_cmd && c->function.cfunc != complete_command)
+      if (arg
+	  && c->type != set_cmd
+	  && !is_complete_command (c->function.cfunc))
 	{
 	  p = arg + strlen (arg) - 1;
 	  while (p >= arg && (*p == ' ' || *p == '\t'))
@@ -1785,41 +1062,6 @@ static int write_history_p;
 static int history_size;
 static char *history_filename;
 
-/* readline uses the word breaks for two things:
-   (1) In figuring out where to point the TEXT parameter to the
-   rl_completion_entry_function.  Since we don't use TEXT for much,
-   it doesn't matter a lot what the word breaks are for this purpose, but
-   it does affect how much stuff M-? lists.
-   (2) If one of the matches contains a word break character, readline
-   will quote it.  That's why we switch between
-   gdb_completer_word_break_characters and
-   gdb_completer_command_word_break_characters.  I'm not sure when
-   we need this behavior (perhaps for funky characters in C++ symbols?).  */
-
-/* Variables which are necessary for fancy command line editing.  */
-char *gdb_completer_word_break_characters =
-" \t\n!@#$%^&*()+=|~`}{[]\"';:?/>.<,-";
-
-/* When completing on command names, we remove '-' from the list of
-   word break characters, since we use it in command names.  If the
-   readline library sees one in any of the current completion strings,
-   it thinks that the string needs to be quoted and automatically supplies
-   a leading quote. */
-char *gdb_completer_command_word_break_characters =
-" \t\n!@#$%^&*()+=|~`}{[]\"';:?/>.<,";
-
-/* When completing on file names, we remove from the list of word
-   break characters any characters that are commonly used in file
-   names, such as '-', '+', '~', etc.  Otherwise, readline displays
-   incorrect completion candidates.  */
-char *gdb_completer_file_name_break_characters = " \t\n*|\"';:?/><";
-
-/* Characters that can be used to quote completion strings.  Note that we
-   can't include '"' because the gdb C parser treats such quoted sequences
-   as strings. */
-char *gdb_completer_quote_characters =
-"'";
-
 /* Functions that are used as part of the fancy command line editing.  */
 
 /* This can be used for functions which don't want to complete on symbols
@@ -1838,7 +1080,6 @@ readline_line_completion_function (char *text, int matches)
 {
   return line_completion_function (text, matches, rl_line_buffer, rl_point);
 }
-
 
 #ifdef STOP_SIGNAL
 static void
@@ -2136,637 +1377,6 @@ command_line_input (char *prompt_arg, int repeat, char *annotation_suffix)
   return linebuffer;
 }
 
-
-/* Expand the body_list of COMMAND so that it can hold NEW_LENGTH
-   code bodies.  This is typically used when we encounter an "else"
-   clause for an "if" command.  */
-
-static void
-realloc_body_list (struct command_line *command, int new_length)
-{
-  int n;
-  struct command_line **body_list;
-
-  n = command->body_count;
-
-  /* Nothing to do?  */
-  if (new_length <= n)
-    return;
-
-  body_list = (struct command_line **)
-    xmalloc (sizeof (struct command_line *) * new_length);
-
-  memcpy (body_list, command->body_list, sizeof (struct command_line *) * n);
-
-  free (command->body_list);
-  command->body_list = body_list;
-  command->body_count = new_length;
-}
-
-/* Read one line from the input stream.  If the command is an "else" or
-   "end", return such an indication to the caller.  */
-
-static enum misc_command_type
-read_next_line (struct command_line **command)
-{
-  char *p, *p1, *prompt_ptr, control_prompt[256];
-  int i = 0;
-
-  if (control_level >= 254)
-    error ("Control nesting too deep!\n");
-
-  /* Set a prompt based on the nesting of the control commands.  */
-  if (instream == stdin || (instream == 0 && readline_hook != NULL))
-    {
-      for (i = 0; i < control_level; i++)
-	control_prompt[i] = ' ';
-      control_prompt[i] = '>';
-      control_prompt[i + 1] = '\0';
-      prompt_ptr = (char *) &control_prompt[0];
-    }
-  else
-    prompt_ptr = NULL;
-
-  p = command_line_input (prompt_ptr, instream == stdin, "commands");
-
-  /* Not sure what to do here.  */
-  if (p == NULL)
-    return end_command;
-
-  /* Strip leading and trailing whitespace.  */
-  while (*p == ' ' || *p == '\t')
-    p++;
-
-  p1 = p + strlen (p);
-  while (p1 != p && (p1[-1] == ' ' || p1[-1] == '\t'))
-    p1--;
-
-  /* Blanks and comments don't really do anything, but we need to
-     distinguish them from else, end and other commands which can be
-     executed.  */
-  if (p1 == p || p[0] == '#')
-    return nop_command;
-
-  /* Is this the end of a simple, while, or if control structure?  */
-  if (p1 - p == 3 && !strncmp (p, "end", 3))
-    return end_command;
-
-  /* Is the else clause of an if control structure?  */
-  if (p1 - p == 4 && !strncmp (p, "else", 4))
-    return else_command;
-
-  /* Check for while, if, break, continue, etc and build a new command
-     line structure for them.  */
-  if (p1 - p > 5 && !strncmp (p, "while", 5))
-    *command = build_command_line (while_control, p + 6);
-  else if (p1 - p > 2 && !strncmp (p, "if", 2))
-    *command = build_command_line (if_control, p + 3);
-  else if (p1 - p == 10 && !strncmp (p, "loop_break", 10))
-    {
-      *command = (struct command_line *)
-	xmalloc (sizeof (struct command_line));
-      (*command)->next = NULL;
-      (*command)->line = NULL;
-      (*command)->control_type = break_control;
-      (*command)->body_count = 0;
-      (*command)->body_list = NULL;
-    }
-  else if (p1 - p == 13 && !strncmp (p, "loop_continue", 13))
-    {
-      *command = (struct command_line *)
-	xmalloc (sizeof (struct command_line));
-      (*command)->next = NULL;
-      (*command)->line = NULL;
-      (*command)->control_type = continue_control;
-      (*command)->body_count = 0;
-      (*command)->body_list = NULL;
-    }
-  else
-    {
-      /* A normal command.  */
-      *command = (struct command_line *)
-	xmalloc (sizeof (struct command_line));
-      (*command)->next = NULL;
-      (*command)->line = savestring (p, p1 - p);
-      (*command)->control_type = simple_control;
-      (*command)->body_count = 0;
-      (*command)->body_list = NULL;
-    }
-
-  /* Nothing special.  */
-  return ok_command;
-}
-
-/* Recursively read in the control structures and create a command_line 
-   structure from them.
-
-   The parent_control parameter is the control structure in which the
-   following commands are nested.  */
-
-static enum command_control_type
-recurse_read_control_structure (struct command_line *current_cmd)
-{
-  int current_body, i;
-  enum misc_command_type val;
-  enum command_control_type ret;
-  struct command_line **body_ptr, *child_tail, *next;
-
-  child_tail = NULL;
-  current_body = 1;
-
-  /* Sanity checks.  */
-  if (current_cmd->control_type == simple_control)
-    {
-      error ("Recursed on a simple control type\n");
-      return invalid_control;
-    }
-
-  if (current_body > current_cmd->body_count)
-    {
-      error ("Allocated body is smaller than this command type needs\n");
-      return invalid_control;
-    }
-
-  /* Read lines from the input stream and build control structures.  */
-  while (1)
-    {
-      dont_repeat ();
-
-      next = NULL;
-      val = read_next_line (&next);
-
-      /* Just skip blanks and comments.  */
-      if (val == nop_command)
-	continue;
-
-      if (val == end_command)
-	{
-	  if (current_cmd->control_type == while_control
-	      || current_cmd->control_type == if_control)
-	    {
-	      /* Success reading an entire control structure.  */
-	      ret = simple_control;
-	      break;
-	    }
-	  else
-	    {
-	      ret = invalid_control;
-	      break;
-	    }
-	}
-
-      /* Not the end of a control structure.  */
-      if (val == else_command)
-	{
-	  if (current_cmd->control_type == if_control
-	      && current_body == 1)
-	    {
-	      realloc_body_list (current_cmd, 2);
-	      current_body = 2;
-	      child_tail = NULL;
-	      continue;
-	    }
-	  else
-	    {
-	      ret = invalid_control;
-	      break;
-	    }
-	}
-
-      if (child_tail)
-	{
-	  child_tail->next = next;
-	}
-      else
-	{
-	  body_ptr = current_cmd->body_list;
-	  for (i = 1; i < current_body; i++)
-	    body_ptr++;
-
-	  *body_ptr = next;
-
-	}
-
-      child_tail = next;
-
-      /* If the latest line is another control structure, then recurse
-         on it.  */
-      if (next->control_type == while_control
-	  || next->control_type == if_control)
-	{
-	  control_level++;
-	  ret = recurse_read_control_structure (next);
-	  control_level--;
-
-	  if (ret != simple_control)
-	    break;
-	}
-    }
-
-  dont_repeat ();
-
-  return ret;
-}
-
-/* Read lines from the input stream and accumulate them in a chain of
-   struct command_line's, which is then returned.  For input from a
-   terminal, the special command "end" is used to mark the end of the
-   input, and is not included in the returned chain of commands. */
-
-#define END_MESSAGE "End with a line saying just \"end\"."
-
-struct command_line *
-read_command_lines (char *prompt_arg, int from_tty)
-{
-  struct command_line *head, *tail, *next;
-  struct cleanup *old_chain;
-  enum command_control_type ret;
-  enum misc_command_type val;
-
-  control_level = 0;
-  if (readline_begin_hook)
-    {
-      /* Note - intentional to merge messages with no newline */
-      (*readline_begin_hook) ("%s  %s\n", prompt_arg, END_MESSAGE);
-    }
-  else if (from_tty && input_from_terminal_p ())
-    {
-      printf_unfiltered ("%s\n%s\n", prompt_arg, END_MESSAGE);
-      gdb_flush (gdb_stdout);
-    }
-
-  head = tail = NULL;
-  old_chain = NULL;
-
-  while (1)
-    {
-      val = read_next_line (&next);
-
-      /* Ignore blank lines or comments.  */
-      if (val == nop_command)
-	continue;
-
-      if (val == end_command)
-	{
-	  ret = simple_control;
-	  break;
-	}
-
-      if (val != ok_command)
-	{
-	  ret = invalid_control;
-	  break;
-	}
-
-      if (next->control_type == while_control
-	  || next->control_type == if_control)
-	{
-	  control_level++;
-	  ret = recurse_read_control_structure (next);
-	  control_level--;
-
-	  if (ret == invalid_control)
-	    break;
-	}
-
-      if (tail)
-	{
-	  tail->next = next;
-	}
-      else
-	{
-	  head = next;
-	  old_chain = make_cleanup_free_command_lines (&head);
-	}
-      tail = next;
-    }
-
-  dont_repeat ();
-
-  if (head)
-    {
-      if (ret != invalid_control)
-	{
-	  discard_cleanups (old_chain);
-	}
-      else
-	do_cleanups (old_chain);
-    }
-
-  if (readline_end_hook)
-    {
-      (*readline_end_hook) ();
-    }
-  return (head);
-}
-
-/* Free a chain of struct command_line's.  */
-
-void
-free_command_lines (struct command_line **lptr)
-{
-  register struct command_line *l = *lptr;
-  register struct command_line *next;
-  struct command_line **blist;
-  int i;
-
-  while (l)
-    {
-      if (l->body_count > 0)
-	{
-	  blist = l->body_list;
-	  for (i = 0; i < l->body_count; i++, blist++)
-	    free_command_lines (blist);
-	}
-      next = l->next;
-      free (l->line);
-      free ((PTR) l);
-      l = next;
-    }
-}
-
-static void
-do_free_command_lines_cleanup (void *arg)
-{
-  free_command_lines (arg);
-}
-
-static struct cleanup *
-make_cleanup_free_command_lines (struct command_line **arg)
-{
-  return make_cleanup (do_free_command_lines_cleanup, arg);
-}
-
-/* Add an element to the list of info subcommands.  */
-
-struct cmd_list_element *
-add_info (char *name, void (*fun) (char *, int), char *doc)
-{
-  return add_cmd (name, no_class, fun, doc, &infolist);
-}
-
-/* Add an alias to the list of info subcommands.  */
-
-struct cmd_list_element *
-add_info_alias (char *name, char *oldname, int abbrev_flag)
-{
-  return add_alias_cmd (name, oldname, 0, abbrev_flag, &infolist);
-}
-
-/* The "info" command is defined as a prefix, with allow_unknown = 0.
-   Therefore, its own definition is called only for "info" with no args.  */
-
-/* ARGSUSED */
-static void
-info_command (char *arg, int from_tty)
-{
-  printf_unfiltered ("\"info\" must be followed by the name of an info command.\n");
-  help_list (infolist, "info ", -1, gdb_stdout);
-}
-
-/* The "complete" command is used by Emacs to implement completion.  */
-
-/* ARGSUSED */
-static void
-complete_command (char *arg, int from_tty)
-{
-  int i;
-  int argpoint;
-  char *completion;
-
-  dont_repeat ();
-
-  if (arg == NULL)
-    arg = "";
-  argpoint = strlen (arg);
-
-  for (completion = line_completion_function (arg, i = 0, arg, argpoint);
-       completion;
-       completion = line_completion_function (arg, ++i, arg, argpoint))
-    {
-      printf_unfiltered ("%s\n", completion);
-      free (completion);
-    }
-}
-
-/* The "show" command with no arguments shows all the settings.  */
-
-/* ARGSUSED */
-static void
-show_command (char *arg, int from_tty)
-{
-  cmd_show_list (showlist, from_tty, "");
-}
-
-/* Add an element to the list of commands.  */
-
-struct cmd_list_element *
-add_com (char *name, enum command_class class, void (*fun) (char *, int),
-	 char *doc)
-{
-  return add_cmd (name, class, fun, doc, &cmdlist);
-}
-
-/* Add an alias or abbreviation command to the list of commands.  */
-
-struct cmd_list_element *
-add_com_alias (char *name, char *oldname, enum command_class class,
-	       int abbrev_flag)
-{
-  return add_alias_cmd (name, oldname, class, abbrev_flag, &cmdlist);
-}
-
-void
-error_no_arg (char *why)
-{
-  error ("Argument required (%s).", why);
-}
-
-/* Provide documentation on command or list given by COMMAND.  FROM_TTY
-   is ignored.  */
-
-/* ARGSUSED */
-static void
-help_command (char *command, int from_tty)
-{
-  help_cmd (command, gdb_stdout);
-}
-
-static void
-validate_comname (char *comname)
-{
-  register char *p;
-
-  if (comname == 0)
-    error_no_arg ("name of command to define");
-
-  p = comname;
-  while (*p)
-    {
-      if (!isalnum (*p) && *p != '-' && *p != '_')
-	error ("Junk in argument list: \"%s\"", p);
-      p++;
-    }
-}
-
-/* This is just a placeholder in the command data structures.  */
-static void
-user_defined_command (char *ignore, int from_tty)
-{
-}
-
-static void
-define_command (char *comname, int from_tty)
-{
-#define MAX_TMPBUF 128   
-  enum cmd_hook_type
-    {
-      CMD_NO_HOOK = 0,
-      CMD_PRE_HOOK,
-      CMD_POST_HOOK
-    };
-  register struct command_line *cmds;
-  register struct cmd_list_element *c, *newc, *oldc, *hookc = 0;
-  char *tem = comname;
-  char *tem2; 
-  char tmpbuf[MAX_TMPBUF];
-  int  hook_type      = CMD_NO_HOOK;
-  int  hook_name_size = 0;
-   
-#define	HOOK_STRING	"hook-"
-#define	HOOK_LEN 5
-#define HOOK_POST_STRING "hookpost-"
-#define HOOK_POST_LEN    9
-
-  validate_comname (comname);
-
-  /* Look it up, and verify that we got an exact match.  */
-  c = lookup_cmd (&tem, cmdlist, "", -1, 1);
-  if (c && !STREQ (comname, c->name))
-    c = 0;
-
-  if (c)
-    {
-      if (c->class == class_user || c->class == class_alias)
-	tem = "Redefine command \"%s\"? ";
-      else
-	tem = "Really redefine built-in command \"%s\"? ";
-      if (!query (tem, c->name))
-	error ("Command \"%s\" not redefined.", c->name);
-    }
-
-  /* If this new command is a hook, then mark the command which it
-     is hooking.  Note that we allow hooking `help' commands, so that
-     we can hook the `stop' pseudo-command.  */
-
-  if (!strncmp (comname, HOOK_STRING, HOOK_LEN))
-    {
-       hook_type      = CMD_PRE_HOOK;
-       hook_name_size = HOOK_LEN;
-    }
-  else if (!strncmp (comname, HOOK_POST_STRING, HOOK_POST_LEN))
-    {
-      hook_type      = CMD_POST_HOOK;
-      hook_name_size = HOOK_POST_LEN;
-    }
-   
-  if (hook_type != CMD_NO_HOOK)
-    {
-      /* Look up cmd it hooks, and verify that we got an exact match.  */
-      tem = comname + hook_name_size;
-      hookc = lookup_cmd (&tem, cmdlist, "", -1, 0);
-      if (hookc && !STREQ (comname + hook_name_size, hookc->name))
-	hookc = 0;
-      if (!hookc)
-	{
-	  warning ("Your new `%s' command does not hook any existing command.",
-		   comname);
-	  if (!query ("Proceed? "))
-	    error ("Not confirmed.");
-	}
-    }
-
-  comname = savestring (comname, strlen (comname));
-
-  /* If the rest of the commands will be case insensitive, this one
-     should behave in the same manner. */
-  for (tem = comname; *tem; tem++)
-    if (isupper (*tem))
-      *tem = tolower (*tem);
-
-  sprintf (tmpbuf, "Type commands for definition of \"%s\".", comname);
-  cmds = read_command_lines (tmpbuf, from_tty);
-
-  if (c && c->class == class_user)
-    free_command_lines (&c->user_commands);
-
-  newc = add_cmd (comname, class_user, user_defined_command,
-		  (c && c->class == class_user)
-		  ? c->doc : savestring ("User-defined.", 13), &cmdlist);
-  newc->user_commands = cmds;
-
-  /* If this new command is a hook, then mark both commands as being
-     tied.  */
-  if (hookc)
-    {
-      switch (hook_type)
-        {
-        case CMD_PRE_HOOK:
-          hookc->hook_pre  = newc;  /* Target gets hooked.  */
-          newc->hookee_pre = hookc; /* We are marked as hooking target cmd. */
-          break;
-        case CMD_POST_HOOK:
-          hookc->hook_pre  = newc;  /* Target gets hooked.  */
-          newc->hookee_pre = hookc; /* We are marked as hooking target cmd. */
-          break;
-        default:
-          /* Should never come here as hookc would be 0. */
-        }
-    }
-}
-
-static void
-document_command (char *comname, int from_tty)
-{
-  struct command_line *doclines;
-  register struct cmd_list_element *c;
-  char *tem = comname;
-  char tmpbuf[128];
-
-  validate_comname (comname);
-
-  c = lookup_cmd (&tem, cmdlist, "", 0, 1);
-
-  if (c->class != class_user)
-    error ("Command \"%s\" is built-in.", comname);
-
-  sprintf (tmpbuf, "Type documentation for \"%s\".", comname);
-  doclines = read_command_lines (tmpbuf, from_tty);
-
-  if (c->doc)
-    free (c->doc);
-
-  {
-    register struct command_line *cl1;
-    register int len = 0;
-
-    for (cl1 = doclines; cl1; cl1 = cl1->next)
-      len += strlen (cl1->line) + 1;
-
-    c->doc = (char *) xmalloc (len + 1);
-    *c->doc = 0;
-
-    for (cl1 = doclines; cl1; cl1 = cl1->next)
-      {
-	strcat (c->doc, cl1->line);
-	if (cl1->next)
-	  strcat (c->doc, "\n");
-      }
-  }
-
-  free_command_lines (&doclines);
-}
-
 /* Print the GDB banner. */
 void
 print_gdb_version (struct ui_file *stream)
@@ -2810,16 +1420,6 @@ There is absolutely no warranty for GDB.  Type \"show warranty\" for details.\n"
     }
   fprintf_filtered (stream, "\".");
 }
-
-/* ARGSUSED */
-static void
-show_version (char *args, int from_tty)
-{
-  immediate_quit++;
-  print_gdb_version (gdb_stdout);
-  printf_filtered ("\n");
-  immediate_quit--;
-}
 
 /* get_prompt: access method for the GDB prompt string.  */
 
@@ -3174,16 +1774,6 @@ quit_force (char *args, int from_tty)
   exit (exit_code);
 }
 
-/* Handle the quit command.  */
-
-void
-quit_command (char *args, int from_tty)
-{
-  if (!quit_confirm ())
-    error ("Not confirmed.");
-  quit_force (args, from_tty);
-}
-
 /* Returns whether GDB is running on a terminal and whether the user
    desires that questions be asked of them on that terminal.  */
 
@@ -3195,235 +1785,6 @@ input_from_terminal_p (void)
 
 /* ARGSUSED */
 static void
-pwd_command (char *args, int from_tty)
-{
-  if (args)
-    error ("The \"pwd\" command does not take an argument: %s", args);
-  getcwd (gdb_dirbuf, sizeof (gdb_dirbuf));
-
-  if (!STREQ (gdb_dirbuf, current_directory))
-    printf_unfiltered ("Working directory %s\n (canonically %s).\n",
-		       current_directory, gdb_dirbuf);
-  else
-    printf_unfiltered ("Working directory %s.\n", current_directory);
-}
-
-void
-cd_command (char *dir, int from_tty)
-{
-  int len;
-  /* Found something other than leading repetitions of "/..".  */
-  int found_real_path;
-  char *p;
-
-  /* If the new directory is absolute, repeat is a no-op; if relative,
-     repeat might be useful but is more likely to be a mistake.  */
-  dont_repeat ();
-
-  if (dir == 0)
-    error_no_arg ("new working directory");
-
-  dir = tilde_expand (dir);
-  make_cleanup (free, dir);
-
-  if (chdir (dir) < 0)
-    perror_with_name (dir);
-
-#if defined(_WIN32) || defined(__MSDOS__)
-  /* There's too much mess with DOSish names like "d:", "d:.",
-     "d:./foo" etc.  Instead of having lots of special #ifdef'ed code,
-     simply get the canonicalized name of the current directory.  */
-  dir = getcwd (gdb_dirbuf, sizeof (gdb_dirbuf));
-#endif
-
-  len = strlen (dir);
-  if (SLASH_P (dir[len - 1]))
-    {
-      /* Remove the trailing slash unless this is a root directory
-         (including a drive letter on non-Unix systems).  */
-      if (!(len == 1)		/* "/" */
-#if defined(_WIN32) || defined(__MSDOS__)
-	  && !(!SLASH_P (*dir) && ROOTED_P (dir) && len <= 3)	/* "d:/" */
-#endif
-	  )
-	len--;
-    }
-
-  dir = savestring (dir, len);
-  if (ROOTED_P (dir))
-    current_directory = dir;
-  else
-    {
-      if (SLASH_P (current_directory[strlen (current_directory) - 1]))
-	current_directory = concat (current_directory, dir, NULL);
-      else
-	current_directory = concat (current_directory, SLASH_STRING, dir, NULL);
-      free (dir);
-    }
-
-  /* Now simplify any occurrences of `.' and `..' in the pathname.  */
-
-  found_real_path = 0;
-  for (p = current_directory; *p;)
-    {
-      if (SLASH_P (p[0]) && p[1] == '.' && (p[2] == 0 || SLASH_P (p[2])))
-	strcpy (p, p + 2);
-      else if (SLASH_P (p[0]) && p[1] == '.' && p[2] == '.'
-	       && (p[3] == 0 || SLASH_P (p[3])))
-	{
-	  if (found_real_path)
-	    {
-	      /* Search backwards for the directory just before the "/.."
-	         and obliterate it and the "/..".  */
-	      char *q = p;
-	      while (q != current_directory && !SLASH_P (q[-1]))
-		--q;
-
-	      if (q == current_directory)
-		/* current_directory is
-		   a relative pathname ("can't happen"--leave it alone).  */
-		++p;
-	      else
-		{
-		  strcpy (q - 1, p + 3);
-		  p = q - 1;
-		}
-	    }
-	  else
-	    /* We are dealing with leading repetitions of "/..", for example
-	       "/../..", which is the Mach super-root.  */
-	    p += 3;
-	}
-      else
-	{
-	  found_real_path = 1;
-	  ++p;
-	}
-    }
-
-  forget_cached_source_info ();
-
-  if (from_tty)
-    pwd_command ((char *) 0, 1);
-}
-
-struct source_cleanup_lines_args
-{
-  int old_line;
-  char *old_file;
-  char *old_pre_error;
-  char *old_error_pre_print;
-};
-
-static void
-source_cleanup_lines (PTR args)
-{
-  struct source_cleanup_lines_args *p =
-  (struct source_cleanup_lines_args *) args;
-  source_line_number = p->old_line;
-  source_file_name = p->old_file;
-  source_pre_error = p->old_pre_error;
-  error_pre_print = p->old_error_pre_print;
-}
-
-/* ARGSUSED */
-static void
-do_fclose_cleanup (void *stream)
-{
-  fclose (stream);
-}
-
-void
-source_command (char *args, int from_tty)
-{
-  FILE *stream;
-  struct cleanup *old_cleanups;
-  char *file = args;
-  struct source_cleanup_lines_args old_lines;
-  int needed_length;
-
-  if (file == NULL)
-    {
-      error ("source command requires pathname of file to source.");
-    }
-
-  file = tilde_expand (file);
-  old_cleanups = make_cleanup (free, file);
-
-  stream = fopen (file, FOPEN_RT);
-  if (!stream)
-    {
-      if (from_tty)
-	perror_with_name (file);
-      else
-	return;
-    }
-
-  make_cleanup (do_fclose_cleanup, stream);
-
-  old_lines.old_line = source_line_number;
-  old_lines.old_file = source_file_name;
-  old_lines.old_pre_error = source_pre_error;
-  old_lines.old_error_pre_print = error_pre_print;
-  make_cleanup (source_cleanup_lines, &old_lines);
-  source_line_number = 0;
-  source_file_name = file;
-  source_pre_error = error_pre_print == NULL ? "" : error_pre_print;
-  source_pre_error = savestring (source_pre_error, strlen (source_pre_error));
-  make_cleanup (free, source_pre_error);
-  /* This will get set every time we read a line.  So it won't stay "" for
-     long.  */
-  error_pre_print = "";
-
-  needed_length = strlen (source_file_name) + strlen (source_pre_error) + 80;
-  if (source_error_allocated < needed_length)
-    {
-      source_error_allocated *= 2;
-      if (source_error_allocated < needed_length)
-	source_error_allocated = needed_length;
-      if (source_error == NULL)
-	source_error = xmalloc (source_error_allocated);
-      else
-	source_error = xrealloc (source_error, source_error_allocated);
-    }
-
-  read_command_file (stream);
-
-  do_cleanups (old_cleanups);
-}
-
-/* ARGSUSED */
-static void
-echo_command (char *text, int from_tty)
-{
-  char *p = text;
-  register int c;
-
-  if (text)
-    while ((c = *p++) != '\0')
-      {
-	if (c == '\\')
-	  {
-	    /* \ at end of argument is used after spaces
-	       so they won't be lost.  */
-	    if (*p == 0)
-	      return;
-
-	    c = parse_escape (&p);
-	    if (c >= 0)
-	      printf_filtered ("%c", c);
-	  }
-	else
-	  printf_filtered ("%c", c);
-      }
-
-  /* Force this output to appear now.  */
-  wrap_here ("");
-  gdb_flush (gdb_stdout);
-}
-
-/* ARGSUSED */
-static void
 dont_repeat_command (char *ignored, int from_tty)
 {
   *line = 0;			/* Can't call dont_repeat here because we're not
@@ -3434,7 +1795,7 @@ dont_repeat_command (char *ignored, int from_tty)
 
 /* Number of commands to print in each call to show_commands.  */
 #define Hist_print 10
-static void
+void
 show_commands (char *args, int from_tty)
 {
   /* Index for history commands.  Relative to history_base.  */
@@ -3526,7 +1887,7 @@ set_history_size_command (char *args, int from_tty, struct cmd_list_element *c)
 }
 
 /* ARGSUSED */
-static void
+void
 set_history (char *args, int from_tty)
 {
   printf_unfiltered ("\"set history\" must be followed by the name of a history subcommand.\n");
@@ -3534,7 +1895,7 @@ set_history (char *args, int from_tty)
 }
 
 /* ARGSUSED */
-static void
+void
 show_history (char *args, int from_tty)
 {
   cmd_show_list (showhistlist, from_tty, "");
@@ -3544,7 +1905,7 @@ int info_verbose = 0;		/* Default verbose msgs off */
 
 /* Called by do_setshow_command.  An elaborate joke.  */
 /* ARGSUSED */
-static void
+void
 set_verbose (char *args, int from_tty, struct cmd_list_element *c)
 {
   char *cmdname = "verbose";
@@ -3573,45 +1934,6 @@ float_handler (int signo)
   error ("Erroneous arithmetic operation.");
 }
 
-static void
-set_debug (char *arg, int from_tty)
-{
-  printf_unfiltered ("\"set debug\" must be followed by the name of a print subcommand.\n");
-  help_list (setdebuglist, "set debug ", -1, gdb_stdout);
-}
-
-static void
-show_debug (char *args, int from_tty)
-{
-  cmd_show_list (showdebuglist, from_tty, "");
-}
-
-static void
-init_cmd_lists (void)
-{
-  cmdlist = NULL;
-  infolist = NULL;
-  enablelist = NULL;
-  disablelist = NULL;
-  togglelist = NULL;
-  stoplist = NULL;
-  deletelist = NULL;
-  enablebreaklist = NULL;
-  setlist = NULL;
-  unsetlist = NULL;
-  showlist = NULL;
-  sethistlist = NULL;
-  showhistlist = NULL;
-  unsethistlist = NULL;
-  maintenancelist = NULL;
-  maintenanceinfolist = NULL;
-  maintenanceprintlist = NULL;
-  setprintlist = NULL;
-  showprintlist = NULL;
-  setchecklist = NULL;
-  showchecklist = NULL;
-}
-
 /* Init the history buffer.  Note that we are called after the init file(s)
  * have been read so that the user can change the history file via his
  * .gdbinit file (for instance).  The GDBHISTFILE environment variable
@@ -3683,48 +2005,11 @@ init_main (void)
 
   /* Setup important stuff for command line editing.  */
   rl_completion_entry_function = (int (*)()) readline_line_completion_function;
-  rl_completer_word_break_characters = gdb_completer_word_break_characters;
-  rl_completer_quote_characters = gdb_completer_quote_characters;
+  rl_completer_word_break_characters =
+				 get_gdb_completer_word_break_characters ();
+  rl_completer_quote_characters = get_gdb_completer_quote_characters ();
   rl_readline_name = "gdb";
 
-  /* Define the classes of commands.
-     They will appear in the help list in the reverse of this order.  */
-
-  add_cmd ("internals", class_maintenance, NO_FUNCTION,
-	   "Maintenance commands.\n\
-Some gdb commands are provided just for use by gdb maintainers.\n\
-These commands are subject to frequent change, and may not be as\n\
-well documented as user commands.",
-	   &cmdlist);
-  add_cmd ("obscure", class_obscure, NO_FUNCTION, "Obscure features.", &cmdlist);
-  add_cmd ("aliases", class_alias, NO_FUNCTION, "Aliases of other commands.", &cmdlist);
-  add_cmd ("user-defined", class_user, NO_FUNCTION, "User-defined commands.\n\
-The commands in this class are those defined by the user.\n\
-Use the \"define\" command to define a command.", &cmdlist);
-  add_cmd ("support", class_support, NO_FUNCTION, "Support facilities.", &cmdlist);
-  if (!dbx_commands)
-    add_cmd ("status", class_info, NO_FUNCTION, "Status inquiries.", &cmdlist);
-  add_cmd ("files", class_files, NO_FUNCTION, "Specifying and examining files.", &cmdlist);
-  add_cmd ("breakpoints", class_breakpoint, NO_FUNCTION, "Making program stop at certain points.", &cmdlist);
-  add_cmd ("data", class_vars, NO_FUNCTION, "Examining data.", &cmdlist);
-  add_cmd ("stack", class_stack, NO_FUNCTION, "Examining the stack.\n\
-The stack is made up of stack frames.  Gdb assigns numbers to stack frames\n\
-counting from zero for the innermost (currently executing) frame.\n\n\
-At any time gdb identifies one frame as the \"selected\" frame.\n\
-Variable lookups are done with respect to the selected frame.\n\
-When the program being debugged stops, gdb selects the innermost frame.\n\
-The commands below can be used to select other frames by number or address.",
-	   &cmdlist);
-  add_cmd ("running", class_run, NO_FUNCTION, "Running the program.", &cmdlist);
-
-  add_com ("pwd", class_files, pwd_command,
-	"Print working directory.  This is used for your program as well.");
-  c = add_cmd ("cd", class_files, cd_command,
-	       "Set working directory to DIR for debugger and program being debugged.\n\
-The change does not take effect for the program being debugged\n\
-until the next time it is started.", &cmdlist);
-  c->completer = filename_completer;
-
   /* The set prompt command is different depending whether or not the
      async version is run. NOTE: this difference is going to
      disappear as we make the event loop be the default engine of
@@ -3753,55 +2038,10 @@ until the next time it is started.", &cmdlist);
 		  &setlist),
      &showlist);
 
-  add_com ("echo", class_support, echo_command,
-	   "Print a constant string.  Give string as argument.\n\
-C escape sequences may be used in the argument.\n\
-No newline is added at the end of the argument;\n\
-use \"\\n\" if you want a newline to be printed.\n\
-Since leading and trailing whitespace are ignored in command arguments,\n\
-if you want to print some you must use \"\\\" before leading whitespace\n\
-to be printed or after trailing whitespace.");
-  add_com ("document", class_support, document_command,
-	   "Document a user-defined command.\n\
-Give command name as argument.  Give documentation on following lines.\n\
-End with a line of just \"end\".");
-  add_com ("define", class_support, define_command,
-	   "Define a new command name.  Command name is argument.\n\
-Definition appears on following lines, one command per line.\n\
-End with a line of just \"end\".\n\
-Use the \"document\" command to give documentation for the new command.\n\
-Commands defined in this way may have up to ten arguments.");
-
-#ifdef __STDC__
-  c = add_cmd ("source", class_support, source_command,
-	       "Read commands from a file named FILE.\n\
-Note that the file \"" GDBINIT_FILENAME "\" is read automatically in this way\n\
-when gdb is started.", &cmdlist);
-#else
-  /* Punt file name, we can't help it easily.  */
-  c = add_cmd ("source", class_support, source_command,
-	       "Read commands from a file named FILE.\n\
-Note that the file \".gdbinit\" is read automatically in this way\n\
-when gdb is started.", &cmdlist);
-#endif
-  c->completer = filename_completer;
-
-  add_com ("quit", class_support, quit_command, "Exit gdb.");
-  add_com ("help", class_support, help_command, "Print list of commands.");
-  add_com_alias ("q", "quit", class_support, 1);
-  add_com_alias ("h", "help", class_support, 1);
-
   add_com ("dont-repeat", class_support, dont_repeat_command, "Don't repeat this command.\n\
 Primarily used inside of user-defined commands that should not be repeated when\n\
 hitting return.");
 
-  c = add_set_cmd ("verbose", class_support, var_boolean, (char *) &info_verbose,
-		   "Set ",
-		   &setlist),
-    add_show_from_set (c, &showlist);
-  c->function.sfunc = set_verbose;
-  set_verbose (NULL, 0, c);
-
   /* The set editing command is different depending whether or not the
      async version is run. NOTE: this difference is going to disappear
      as we make the event loop be the default engine of gdb. */
@@ -3827,19 +2067,6 @@ EMACS-like or VI-like commands like control-P or ESC.", &setlist);
       c->function.sfunc = set_async_editing_command;
     }
 
-  add_prefix_cmd ("history", class_support, set_history,
-		  "Generic command for setting command history parameters.",
-		  &sethistlist, "set history ", 0, &setlist);
-  add_prefix_cmd ("history", class_support, show_history,
-		  "Generic command for showing command history parameters.",
-		  &showhistlist, "show history ", 0, &showlist);
-
-  add_show_from_set
-    (add_set_cmd ("expansion", no_class, var_boolean, (char *) &history_expansion_p,
-		  "Set history expansion on command input.\n\
-Without an argument, history expansion is enabled.", &sethistlist),
-     &showhistlist);
-
   add_show_from_set
     (add_set_cmd ("save", no_class, var_boolean, (char *) &write_history_p,
 		  "Set saving of the history record on exit.\n\
@@ -3866,73 +2093,6 @@ ie. the number of previous commands to keep a record of.", &sethistlist);
 		  &setlist),
      &showlist);
 
-  add_prefix_cmd ("info", class_info, info_command,
-     "Generic command for showing things about the program being debugged.",
-		  &infolist, "info ", 0, &cmdlist);
-  add_com_alias ("i", "info", class_info, 1);
-
-  add_com ("complete", class_obscure, complete_command,
-	   "List the completions for the rest of the line as a command.");
-
-  add_prefix_cmd ("show", class_info, show_command,
-		  "Generic command for showing things about the debugger.",
-		  &showlist, "show ", 0, &cmdlist);
-  /* Another way to get at the same thing.  */
-  add_info ("set", show_command, "Show all GDB settings.");
-
-  add_cmd ("commands", no_class, show_commands,
-	   "Show the history of commands you typed.\n\
-You can supply a command number to start with, or a `+' to start after\n\
-the previous command number shown.",
-	   &showlist);
-
-  add_cmd ("version", no_class, show_version,
-	   "Show what version of GDB this is.", &showlist);
-
-  add_com ("while", class_support, while_command,
-	   "Execute nested commands WHILE the conditional expression is non zero.\n\
-The conditional expression must follow the word `while' and must in turn be\n\
-followed by a new line.  The nested commands must be entered one per line,\n\
-and should be terminated by the word `end'.");
-
-  add_com ("if", class_support, if_command,
-	   "Execute nested commands once IF the conditional expression is non zero.\n\
-The conditional expression must follow the word `if' and must in turn be\n\
-followed by a new line.  The nested commands must be entered one per line,\n\
-and should be terminated by the word 'else' or `end'.  If an else clause\n\
-is used, the same rules apply to its nested commands as to the first ones.");
-
-  /* If target is open when baud changes, it doesn't take effect until the
-     next open (I think, not sure).  */
-  add_show_from_set (add_set_cmd ("remotebaud", no_class,
-				  var_zinteger, (char *) &baud_rate,
-				  "Set baud rate for remote serial I/O.\n\
-This value is used to set the speed of the serial port when debugging\n\
-using remote targets.", &setlist),
-		     &showlist);
-
-  c = add_set_cmd ("remotedebug", no_class, var_zinteger,
-		   (char *) &remote_debug,
-		   "Set debugging of remote protocol.\n\
-When enabled, each packet sent or received with the remote target\n\
-is displayed.", &setlist);
-  deprecate_cmd (c, "set debug remote");
-  deprecate_cmd (add_show_from_set (c, &showlist), "show debug remote");
-
-  add_show_from_set (add_set_cmd ("remote", no_class, var_zinteger,
-				  (char *) &remote_debug,
-				  "Set debugging of remote protocol.\n\
-When enabled, each packet sent or received with the remote target\n\
-is displayed.", &setdebuglist),
-		     &showdebuglist);
-
-  add_show_from_set (
-		      add_set_cmd ("remotetimeout", no_class, var_integer, (char *) &remote_timeout,
-				   "Set timeout limit to wait for target to respond.\n\
-This value is used to set the time limit for gdb to wait for a response\n\
-from the target.", &setlist),
-		      &showlist);
-
   /* The set annotate command is different depending whether or not
      the async version is run. NOTE: this difference is going to
      disappear as we make the event loop be the default engine of
@@ -3964,11 +2124,4 @@ from the target.", &setlist),
 Use \"on\" to enable the notification, and \"off\" to disable it.", &setlist),
 	 &showlist);
     }
-  add_prefix_cmd ("debug", no_class, set_debug,
-		  "Generic command for setting gdb debugging flags",
-		  &setdebuglist, "set debug ", 0, &setlist);
-
-  add_prefix_cmd ("debug", no_class, show_debug,
-		  "Generic command for showing gdb debugging flags",
-		  &showdebuglist, "show debug ", 0, &showlist);
 }