From owner-freebsd-current@FreeBSD.ORG  Sun Feb  8 23:10:02 2015
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D4475CA2;
 Sun,  8 Feb 2015 23:10:02 +0000 (UTC)
Received: from mail.auburn.protected-networks.net
 (mail.auburn.protected-networks.net [IPv6:2001:470:1f07:4e1::3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mail.auburn.protected-networks.net",
 Issuer "Protected Networks Certificate Authority" (not verified))
 by mx1.freebsd.org (Postfix) with ESMTPS id 9B91FA09;
 Sun,  8 Feb 2015 23:10:02 +0000 (UTC)
Received: from toshi.auburn.protected-networks.net
 (toshi.auburn.protected-networks.net [192.168.1.10])
 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
 (Client CN "Iain Butler", Issuer "RSA Class 2 Personal CA v2" (verified OK))
 (Authenticated sender: imb@mail.auburn.protected-networks.net)
 by mail.auburn.protected-networks.net (Postfix) with ESMTPSA id 7DFC1BC;
 Sun,  8 Feb 2015 18:10:01 -0500 (EST)
Message-ID: <54D7ECC9.6040907@protected-networks.net>
Date: Sun, 08 Feb 2015 18:10:01 -0500
From: Michael Butler <imb@protected-networks.net>
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64;
 rv:31.0) Gecko/20100101 Thunderbird/31.4.0
MIME-Version: 1.0
To: freebsd-current@freebsd.org, Baptiste Daroussin <bapt@FreeBSD.org>
Subject: Re: SVN r278414 is incorrect
References: <54D7EAE7.3010100@protected-networks.net>
 <54D7EB4A.8080107@protected-networks.net>
In-Reply-To: <54D7EB4A.8080107@protected-networks.net>
OpenPGP: id=0442D492
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
 <freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-current>, 
 <mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current/>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
 <mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 Feb 2015 23:10:02 -0000

On 02/08/15 18:03, Michael Butler wrote:
> On 02/08/15 18:01, Michael Butler wrote:
>> SVN r278414 causes a 'buildworld' to fail.
>>
>> The fix is attached,
>>
>> 	imb

<sigh>

Index: lib/libedit/readline.c


===================================================================


--- lib/libedit/readline.c      (revision 278418)


+++ lib/libedit/readline.c      (working copy)


@@ -395,9 +395,6 @@


        char *buf;


        static int used_event_hook;



-       if (line == NULL)
-               return 0;
-
        if (e == NULL || h == NULL)
                rl_initialize();

@@ -1443,6 +1440,9 @@
        HistEvent ev;
        int curr_num;

+       if (line == NULL)
+               return 0;
+
        if (h == NULL || e == NULL)
                rl_initialize();