Merge GDB 7.5.1

gdb/interps.c

 /* Manages interpreters for GDB, the GNU debugger.
 
    Copyright (C) 2000, 2002-2003, 2007-2012 Free Software Foundation,
    Inc.
 
    Written by Jim Ingham <jingham@apple.com> of Apple Computer, Inc.
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
@@ skipping 55 matching lines @@
 
   /* Has the init_proc been run?  */
   int inited;
 
   const struct interp_procs *procs;
   int quiet_p;
 };
 
 /* Functions local to this file.  */
 static void initialize_interps (void);
-static char **interpreter_completer (struct cmd_list_element *cmd,
-                                     char *text, char *word);
 
 /* The magic initialization routine for this module.  */
 
 void _initialize_interpreter (void);
 
 /* Variables local to this file: */
 
 static struct interp *interp_list = NULL;
 static struct interp *current_interpreter = NULL;
 static struct interp *top_level_interpreter_ptr = NULL;
@@ skipping 158 matching lines @@
 
 struct ui_out *
 interp_ui_out (struct interp *interp)
 {
   if (interp != NULL)
     return interp->procs->ui_out_proc (interp);
 
   return current_interpreter->procs->ui_out_proc (current_interpreter);
 }
 
+int
+current_interp_set_logging (int start_log, struct ui_file *out,
+                            struct ui_file *logfile)
+{
+  if (current_interpreter == NULL
+      || current_interpreter->procs->set_logging_proc == NULL)
+    return 0;
+
+  return current_interpreter->procs->set_logging_proc (current_interpreter,
+                                                       start_log, out,
+                                                       logfile);
+}
+
+/* Temporarily overrides the current interpreter.  */
+struct interp *
+interp_set_temp (const char *name)
+{
+  struct interp *interp = interp_lookup (name);
+  struct interp *old_interp = current_interpreter;
+
+  if (interp)
+    current_interpreter = interp;
+  return old_interp;
+}
+
 /* Returns the interpreter's cookie.  */
 
 void *
 interp_data (struct interp *interp)
 {
   return interp->data;
 }
 
 /* Returns the interpreter's name.  */
 
@@ skipping 160 matching lines @@
           error (_("error in command: \"%s\"."), prules[i]);
         }
     }
 
   interp_set (old_interp, 0);
   interp_set_quiet (interp_to_use, use_quiet);
   interp_set_quiet (old_interp, old_quiet);
 }
 
 /* List the possible interpreters which could complete the given text.  */
-static char **
+static VEC (char_ptr) *
 interpreter_completer (struct cmd_list_element *ignore, char *text, char *word)
 {
-  int alloced = 0;
   int textlen;
-  int num_matches;
-  char **matches;
+  VEC (char_ptr) *matches = NULL;
   struct interp *interp;
 
-  /* We expect only a very limited number of interpreters, so just
-     allocate room for all of them plus one for the last that must be NULL
-     to correctly end the list.  */
-  for (interp = interp_list; interp != NULL; interp = interp->next)
-    ++alloced;
-  matches = (char **) xcalloc (alloced + 1, sizeof (char *));
-
-  num_matches = 0;
   textlen = strlen (text);
   for (interp = interp_list; interp != NULL; interp = interp->next)
     {
       if (strncmp (interp->name, text, textlen) == 0)
         {
-          matches[num_matches] =
-            (char *) xmalloc (strlen (word) + strlen (interp->name) + 1);
+          char *match;
+
+          match = (char *) xmalloc (strlen (word) + strlen (interp->name) + 1);
           if (word == text)
-            strcpy (matches[num_matches], interp->name);
+            strcpy (match, interp->name);
           else if (word > text)
             {
               /* Return some portion of interp->name.  */
-              strcpy (matches[num_matches], interp->name + (word - text));
+              strcpy (match, interp->name + (word - text));
             }
           else
             {
               /* Return some of text plus interp->name.  */
-              strncpy (matches[num_matches], word, text - word);
-              matches[num_matches][text - word] = '\0';
-              strcat (matches[num_matches], interp->name);
+              strncpy (match, word, text - word);
+              match[text - word] = '\0';
+              strcat (match, interp->name);
             }
-          ++num_matches;
+          VEC_safe_push (char_ptr, matches, match);
         }
     }
 
-  if (num_matches == 0)
-    {
-      xfree (matches);
-      matches = NULL;
-    }
-
   return matches;
 }
 
 struct interp *
 top_level_interpreter (void)
 {
   return top_level_interpreter_ptr;  
 }
 
 void *
 top_level_interpreter_data (void)
 {
   gdb_assert (top_level_interpreter_ptr);
   return top_level_interpreter_ptr->data;  
 }
 
 /* This just adds the "interpreter-exec" command.  */
 void
 _initialize_interpreter (void)
 {
   struct cmd_list_element *c;
 
   c = add_cmd ("interpreter-exec", class_support,
                interpreter_exec_cmd, _("\
 Execute a command in an interpreter.  It takes two arguments:\n\
 The first argument is the name of the interpreter to use.\n\
 The second argument is the command to execute.\n"), &cmdlist);
   set_cmd_completer (c, interpreter_completer);
 }