From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 23657 invoked by alias); 21 Oct 2002 23:03:43 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 23646 invoked from network); 21 Oct 2002 23:03:42 -0000 Received: from unknown (HELO touchme.toronto.redhat.com) (216.138.202.10) by sources.redhat.com with SMTP; 21 Oct 2002 23:03:42 -0000 Received: from redhat.com (toocool.toronto.redhat.com [172.16.14.72]) by touchme.toronto.redhat.com (Postfix) with ESMTP id 1FB9C800084; Mon, 21 Oct 2002 19:03:40 -0400 (EDT) Message-ID: <3DB487CB.7F21B13@redhat.com> Date: Mon, 21 Oct 2002 16:03:00 -0000 From: "J. Johnston" Organization: Red Hat Inc. X-Accept-Language: en MIME-Version: 1.0 To: Elena Zannoni Cc: gdb-patches@sources.redhat.com Subject: Re: Patch for gdb/mi 604 References: <3D9B3D4D.C0B57920@redhat.com> <15796.32490.200752.700605@localhost.redhat.com> Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-SW-Source: 2002-10/txt/msg00363.txt.bz2 Elena Zannoni wrote: > > J. Johnston writes: > > The following patches mi-main.c to turn on the console output prefix prior > > to outputting the gdb startup messages. The code checks for mi level > > and defers to old behavior for mi1. > > > > Ok to commit? > > > > Wouldn't this affect the testsuite as well? > Or is this behavior not tested? > > Elena > It does not affect the testsuite. The testsuite startup code looks for the gdb prompt or some form of error indication, but does not specifically look at the start-up message. -- Jeff J. > > mi/ChangeLog: > > > > 2002-10-02 Jeff Johnston > > > > * mi-main.c: (mi_init_ui): If mi level > 1, set up gdb_stdout with > > console prefix. Fix for PR gdb/604. > > (mi_command_loop): Add check for mi level. If <= 1, set up gdb_stdout > > with console prefix. > > > > -- Jeff J.Index: mi/mi-main.c > > =================================================================== > > RCS file: /cvs/src/src/gdb/mi/mi-main.c,v > > retrieving revision 1.32 > > diff -u -r1.32 mi-main.c > > --- mi/mi-main.c 1 Oct 2002 21:15:43 -0000 1.32 > > +++ mi/mi-main.c 2 Oct 2002 18:34:12 -0000 > > @@ -1459,12 +1459,16 @@ > > static void > > mi_command_loop (int mi_version) > > { > > - /* HACK: Force stdout/stderr to point at the console. This avoids > > - any potential side effects caused by legacy code that is still > > - using the TUI / fputs_unfiltered_hook */ > > - raw_stdout = stdio_fileopen (stdout); > > - /* Route normal output through the MIx */ > > - gdb_stdout = mi_console_file_new (raw_stdout, "~"); > > + if (mi_version <= 1) > > + { > > + /* HACK: Force stdout/stderr to point at the console. This avoids > > + any potential side effects caused by legacy code that is still > > + using the TUI / fputs_unfiltered_hook */ > > + raw_stdout = stdio_fileopen (stdout); > > + /* Route normal output through the MIx */ > > + gdb_stdout = mi_console_file_new (raw_stdout, "~"); > > + } > > + > > /* Route error and log output through the MI */ > > gdb_stderr = mi_console_file_new (raw_stdout, "&"); > > gdb_stdlog = gdb_stderr; > > @@ -1536,8 +1540,16 @@ > > static void > > mi_init_ui (char *arg0) > > { > > - /* Eventually this will contain code that takes control of the > > - console. */ > > + if (strlen (interpreter_p) <= 2 || > > + interpreter_p[2] > '1') > > + { > > + /* HACK: Force stdout/stderr to point at the console. This avoids > > + any potential side effects caused by legacy code that is still > > + using the TUI / fputs_unfiltered_hook */ > > + raw_stdout = stdio_fileopen (stdout); > > + /* Route normal output through the MIx */ > > + gdb_stdout = mi_console_file_new (raw_stdout, "~"); > > + } > > } > > > > void