Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/lib/libedit ... if called prior to using_history(). This ne...



details:   https://anonhg.NetBSD.org/src/rev/005c72b7b039
branches:  trunk
changeset: 326162:005c72b7b039
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Jan 21 13:51:44 2014 +0000

description:
... if called prior to using_history().  This needed to be worked around
in PHP: http://git.php.net/?p=php-src.git;a=commitdiff;h=31d67bd3

Bug: https://bugzilla.redhat.com/show_bug.cgi?id=1055409

diffstat:

 lib/libedit/readline.c |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (28 lines):

diff -r e201b1fc39f9 -r 005c72b7b039 lib/libedit/readline.c
--- a/lib/libedit/readline.c    Tue Jan 21 12:47:20 2014 +0000
+++ b/lib/libedit/readline.c    Tue Jan 21 13:51:44 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: readline.c,v 1.109 2013/08/28 08:05:21 christos Exp $  */
+/*     $NetBSD: readline.c,v 1.110 2014/01/21 13:51:44 christos Exp $  */
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include "config.h"
 #if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: readline.c,v 1.109 2013/08/28 08:05:21 christos Exp $");
+__RCSID("$NetBSD: readline.c,v 1.110 2014/01/21 13:51:44 christos Exp $");
 #endif /* not lint && not SCCSID */
 
 #include <sys/types.h>
@@ -1482,6 +1482,9 @@
 {
        HistEvent ev;
 
+       if (h == NULL || e == NULL)
+               rl_initialize();
+
        (void)history(h, &ev, H_CLEAR);
        history_length = 0;
 }



Home | Main Index | Thread Index | Old Index