From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 601 invoked by alias); 2 Dec 2006 17:56:37 -0000 Received: (qmail 586 invoked by uid 22791); 2 Dec 2006 17:56:36 -0000 X-Spam-Check-By: sourceware.org Received: from smtp112.sbc.mail.mud.yahoo.com (HELO smtp112.sbc.mail.mud.yahoo.com) (68.142.198.211) by sourceware.org (qpsmtpd/0.31) with SMTP; Sat, 02 Dec 2006 17:56:26 +0000 Received: (qmail 20528 invoked from network); 2 Dec 2006 17:56:25 -0000 Received: from unknown (HELO lucon.org) (hjjean@sbcglobal.net@71.146.122.56 with login) by smtp112.sbc.mail.mud.yahoo.com with SMTP; 2 Dec 2006 17:56:24 -0000 X-YMail-OSG: wGxSPAAVM1nIihTzJo7RV_d82Juk1usteuGELpDgAULjt8PcgTFzANqzvaw1Z55uGZdLHTQWsAvbXI9so5u.WgXTBbNUqzWRcVkt1BbfgOtlFX0eouEt2w-- Received: by lucon.org (Postfix, from userid 500) id EC62346EEAA; Sat, 2 Dec 2006 09:56:23 -0800 (PST) Date: Sat, 02 Dec 2006 17:56:00 -0000 From: "H. J. Lu" To: Joel Brobecker Cc: gdb@sourceware.org Subject: Re: GDB 6.6 branch FROZEN Message-ID: <20061202175623.GA14513@lucon.org> References: <20061202174613.GU3304@adacore.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20061202174613.GU3304@adacore.com> User-Agent: Mutt/1.4.2.2i X-IsSubscribed: yes 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/msg00006.txt.bz2 On Sat, Dec 02, 2006 at 09:46:13AM -0800, Joel Brobecker wrote: > Hello everyone, > > please avoid any checkins on the gdb-6.6 branch, as I'm preparing > the first release candidate... Any possibility to fix the regression from gdb 6.4, PR tui/2173? I am enclosing the patch here. H.J. ---- 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); }