Merge GDB 7.5.1

gdb/tui/tui-hooks.c

 /* GDB hooks for TUI.
 
    Copyright (C) 2001-2012 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
    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
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
@@ skipping 51 matching lines @@
   if (tui_active)
     tui_display_main ();
 }
 
 static int ATTRIBUTE_PRINTF (1, 0)
 tui_query_hook (const char *msg, va_list argp)
 {
   int retval;
   int ans2;
   int answer;
+  char *question;
+  struct cleanup *old_chain;
+
+  /* Format the question outside of the loop, to avoid reusing
+     ARGP.  */
+  question = xstrvprintf (msg, argp);
+  old_chain = make_cleanup (xfree, question);
 
   echo ();
   while (1)
     {
       wrap_here ("");           /* Flush any buffered output.  */
       gdb_flush (gdb_stdout);
 
-      vfprintf_filtered (gdb_stdout, msg, argp);
+      fputs_filtered (question, gdb_stdout);
       printf_filtered (_("(y or n) "));
 
       wrap_here ("");
       gdb_flush (gdb_stdout);
 
       answer = tui_getc (stdin);
       clearerr (stdin);         /* in case of C-d */
       if (answer == EOF)        /* C-d */
         {
           retval = 1;
@@ skipping 16 matching lines @@
           break;
         }
       if (answer == 'N')
         {
           retval = 0;
           break;
         }
       printf_filtered (_("Please answer y or n.\n"));
     }
   noecho ();
+
+  do_cleanups (old_chain);
   return retval;
 }
 
 /* Prevent recursion of deprecated_register_changed_hook().  */
 static int tui_refreshing_registers = 0;
 
 static void
 tui_register_changed_hook (int regno)
 {
   struct frame_info *fi;
@@ skipping 169 matching lines @@
 }
 
 void _initialize_tui_hooks (void);
 
 void
 _initialize_tui_hooks (void)
 {
   /* Install the permanent hooks.  */
   observer_attach_new_objfile (tui_new_objfile_hook);
 }