From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 5676 invoked by alias); 2 Dec 2006 18:02:51 -0000 Received: (qmail 5664 invoked by uid 22791); 2 Dec 2006 18:02:49 -0000 X-Spam-Check-By: sourceware.org Received: from nile.gnat.com (HELO nile.gnat.com) (205.232.38.5) by sourceware.org (qpsmtpd/0.31) with ESMTP; Sat, 02 Dec 2006 18:02:35 +0000 Received: from localhost (localhost [127.0.0.1]) by filtered-nile.gnat.com (Postfix) with ESMTP id DEA3F48CF26; Sat, 2 Dec 2006 13:02:30 -0500 (EST) Received: from nile.gnat.com ([127.0.0.1]) by localhost (nile.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 29169-01-7; Sat, 2 Dec 2006 13:02:30 -0500 (EST) Received: from takamaka.act-europe.fr (unknown [70.71.0.212]) by nile.gnat.com (Postfix) with ESMTP id 9B61248CDC5; Sat, 2 Dec 2006 13:02:30 -0500 (EST) Received: by takamaka.act-europe.fr (Postfix, from userid 1000) id 93E8E34C099; Sat, 2 Dec 2006 10:02:59 -0800 (PST) Date: Sat, 02 Dec 2006 18:02:00 -0000 From: Joel Brobecker To: "H. J. Lu" Cc: gdb@sourceware.org Subject: Re: GDB 6.6 branch FROZEN Message-ID: <20061202180259.GV3304@adacore.com> References: <20061202174613.GU3304@adacore.com> <20061202175623.GA14513@lucon.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20061202175623.GA14513@lucon.org> User-Agent: Mutt/1.4.2.2i Mailing-List: contact gdb-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-owner@sourceware.org X-SW-Source: 2006-12/txt/msg00007.txt.bz2 > Any possibility to fix the regression from gdb 6.4, PR tui/2173? > I am enclosing the patch here. I am not opposed, but I don't know readline very well. I'll pass for this pre-release, but can you send the question on gdb-patches and ask if the patch is safe enough for the branch? I'll defer to the judgment of the global maintainers. Thank you, > Index: readline/readline.c > =================================================================== > RCS file: /cvs/src/src/readline/readline.c,v > retrieving revision 1.10 > diff -u -p -r1.10 readline.c > --- readline/readline.c 5 May 2006 18:26:12 -0000 1.10 > +++ readline/readline.c 22 Nov 2006 19:40:17 -0000 > @@ -295,6 +295,7 @@ readline (prompt) > const char *prompt; > { > char *value; > + int in_callback; > > /* If we are at EOF return a NULL string. */ > if (rl_pending_input == EOF) > @@ -303,6 +304,13 @@ readline (prompt) > return ((char *)NULL); > } > > + /* When we call readline, we have to make sure that readline isn't in > + the callback state. Otherwise, it will get really confused. > + PR gdb tui/2173. */ > + in_callback = RL_ISSTATE (RL_STATE_CALLBACK); > + if (in_callback) > + RL_UNSETSTATE (RL_STATE_CALLBACK); > + > rl_set_prompt (prompt); > > rl_initialize (); > @@ -321,6 +329,9 @@ readline (prompt) > rl_clear_signals (); > #endif > > + if (in_callback) > + RL_SETSTATE (RL_STATE_CALLBACK); > + > return (value); > } > -- Joel