Merge GDB 7.5.1

gdb/cli/cli-logging.c

 /* Command-line output logging for GDB, the GNU debugger.
 
    Copyright (c) 2003-2004, 2007-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.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
 #include "gdbcmd.h"
 #include "ui-out.h"
+#include "interps.h"
 #include "gdb_assert.h"
 
 #include "gdb_string.h"
 
 /* These hold the pushed copies of the gdb output files.
    If NULL then nothing has yet been pushed.  */
 struct saved_output_files
 {
   struct ui_file *out;
   struct ui_file *err;
@@ skipping 75 matching lines @@
       output = tee_file_new (saved_output.out, 0, gdb_stdout, 0);
       if (output == NULL)
         perror_with_name (_("set logging"));
       new_logging_no_redirect_file = gdb_stdout;
 
       if (from_tty)
         fprintf_unfiltered (saved_output.out, "Copying output to %s.\n",
                             logging_filename);
     }
 
-  gdb_stdout = output;
-  gdb_stderr = output;
-  gdb_stdlog = output;
-  gdb_stdtarg = output;
-  gdb_stdtargerr = output;
+  /* Give the current interpreter a chance to do anything special that
+     it might need for logging, such as updating other channels.  */
+  if (current_interp_set_logging (1, output, NULL) == 0)
+    {
+      gdb_stdout = output;
+      gdb_stdlog = output;
+      gdb_stderr = output;
+      gdb_stdtarg = output;
+      gdb_stdtargerr = output;
+    }
+
   logging_no_redirect_file = new_logging_no_redirect_file;
 
   /* There is a former output pushed on the ui_out_redirect stack.  We
      want to replace it by OUTPUT so we must pop the former value
      first.  We should either do both the pop and push or to do
      neither of it.  At least do not try to push OUTPUT if the pop
      already failed.  */
 
   if (ui_out_redirect (uiout, NULL) < 0
       || ui_out_redirect (uiout, output) < 0)
     warning (_("Current output protocol does not support redirection"));
 
   if (logging_redirect != 0)
     do_cleanups (cleanups);
 }
 
 static void
 show_logging_redirect (struct ui_file *file, int from_tty,
                        struct cmd_list_element *c, const char *value)
 {
   fprintf_filtered (file, _("The logging output mode is %s.\n"), value);
 }
 
 /* If we've pushed output files, close them and pop them.  */
 static void
 pop_output_files (void)
 {
-  /* Only delete one of the files -- they are all set to the same
-     value.  */
-  ui_file_delete (gdb_stdout);
   if (logging_no_redirect_file)
     {
       ui_file_delete (logging_no_redirect_file);
       logging_no_redirect_file = NULL;
     }
-  gdb_stdout = saved_output.out;
-  gdb_stderr = saved_output.err;
-  gdb_stdlog = saved_output.log;
-  gdb_stdtarg = saved_output.targ;
-  gdb_stdtargerr = saved_output.targ;
+
+  if (current_interp_set_logging (0, NULL, NULL) == 0)
+    {
+      /* Only delete one of the files -- they are all set to the same
+         value.  */
+      ui_file_delete (gdb_stdout);
+
+      gdb_stdout = saved_output.out;
+      gdb_stderr = saved_output.err;
+      gdb_stdlog = saved_output.log;
+      gdb_stdtarg = saved_output.targ;
+      gdb_stdtargerr = saved_output.targ;
+    }
+
   saved_output.out = NULL;
   saved_output.err = NULL;
   saved_output.log = NULL;
   saved_output.targ = NULL;
   saved_output.targerr = NULL;
 
   ui_out_redirect (current_uiout, NULL);
 }
 
 /* This is a helper for the `set logging' command.  */
 static void
 handle_redirections (int from_tty)
 {
   struct cleanup *cleanups;
   struct ui_file *output;
+  struct ui_file *no_redirect_file = NULL;
 
   if (saved_filename != NULL)
     {
       fprintf_unfiltered (gdb_stdout, "Already logging to %s.\n",
                           saved_filename);
       return;
     }
 
   output = gdb_fopen (logging_filename, logging_overwrite ? "w" : "a");
   if (output == NULL)
     perror_with_name (_("set logging"));
   cleanups = make_cleanup_ui_file_delete (output);
 
   /* Redirects everything to gdb_stdout while this is running.  */
   if (!logging_redirect)
     {
-      struct ui_file *no_redirect_file = output;
+      no_redirect_file = output;
 
       output = tee_file_new (gdb_stdout, 0, no_redirect_file, 0);
       if (output == NULL)
         perror_with_name (_("set logging"));
       make_cleanup_ui_file_delete (output);
       if (from_tty)
         fprintf_unfiltered (gdb_stdout, "Copying output to %s.\n",
                             logging_filename);
       logging_no_redirect_file = no_redirect_file;
     }
   else
     {
       gdb_assert (logging_no_redirect_file == NULL);
 
       if (from_tty)
         fprintf_unfiltered (gdb_stdout, "Redirecting output to %s.\n",
                             logging_filename);
     }
 
   discard_cleanups (cleanups);
 
   saved_filename = xstrdup (logging_filename);
   saved_output.out = gdb_stdout;
   saved_output.err = gdb_stderr;
   saved_output.log = gdb_stdlog;
   saved_output.targ = gdb_stdtarg;
   saved_output.targerr = gdb_stdtargerr;
 
-  gdb_stdout = output;
-  gdb_stderr = output;
-  gdb_stdlog = output;
-  gdb_stdtarg = output;
-  gdb_stdtargerr = output;
+  /* Let the interpreter do anything it needs.  */
+  if (current_interp_set_logging (1, output, no_redirect_file) == 0)
+    {
+      gdb_stdout = output;
+      gdb_stdlog = output;
+      gdb_stderr = output;
+      gdb_stdtarg = output;
+      gdb_stdtargerr = output;
+    }
 
-  if (ui_out_redirect (current_uiout, output) < 0)
-    warning (_("Current output protocol does not support redirection"));
+  /* Don't do the redirect for MI, it confuses MI's ui-out scheme.  */
+  if (!ui_out_is_mi_like_p (current_uiout))
+    {
+      if (ui_out_redirect (current_uiout, output) < 0)
+        warning (_("Current output protocol does not support redirection"));
+    }
 }
 
 static void
 set_logging_on (char *args, int from_tty)
 {
   char *rest = args;
 
   if (rest && *rest)
     {
       xfree (logging_filename);
@@ skipping 93 matching lines @@
                             NULL,
                             show_logging_filename,
                             &set_logging_cmdlist, &show_logging_cmdlist);
   add_cmd ("on", class_support, set_logging_on,
            _("Enable logging."), &set_logging_cmdlist);
   add_cmd ("off", class_support, set_logging_off,
            _("Disable logging."), &set_logging_cmdlist);
 
   logging_filename = xstrdup ("gdb.txt");
 }