add readline_list_history with libedit >= 3.1

Author: remicollet

ext/readline/config.m4

@@ -74,6 +74,7 @@ if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then
     -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS
   ])
 
+  AC_DEFINE(HAVE_HISTORY_LIST, 1, [ ])
   AC_DEFINE(HAVE_LIBREADLINE, 1, [ ])
 
 elif test "$PHP_LIBEDIT" != "no"; then
@@ -128,6 +129,13 @@ elif test "$PHP_LIBEDIT" != "no"; then
     -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS
   ])
 
+  PHP_CHECK_LIBRARY(edit, history_list,
+  [
+    AC_DEFINE(HAVE_HISTORY_LIST, 1, [ ])
+  ],[],[
+    -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS
+  ])
+
   AC_DEFINE(HAVE_LIBEDIT, 1, [ ])
 fi
 

ext/readline/readline.c

@@ -45,7 +45,7 @@ PHP_FUNCTION(readline);
 PHP_FUNCTION(readline_add_history);
 PHP_FUNCTION(readline_info);
 PHP_FUNCTION(readline_clear_history);
-#ifndef HAVE_LIBEDIT
+#ifdef HAVE_HISTORY_LIST
 PHP_FUNCTION(readline_list_history);
 #endif
 PHP_FUNCTION(readline_read_history);
@@ -90,7 +90,7 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_INFO(arginfo_readline_clear_history, 0)
 ZEND_END_ARG_INFO()
 
-#ifndef HAVE_LIBEDIT
+#ifdef HAVE_HISTORY_LIST
 ZEND_BEGIN_ARG_INFO(arginfo_readline_list_history, 0)
 ZEND_END_ARG_INFO()
 #endif
@@ -135,7 +135,7 @@ static const zend_function_entry php_readline_functions[] = {
 	PHP_FE(readline_info,  	            arginfo_readline_info)
 	PHP_FE(readline_add_history, 		arginfo_readline_add_history)
 	PHP_FE(readline_clear_history, 		arginfo_readline_clear_history)
-#ifndef HAVE_LIBEDIT
+#ifdef HAVE_HISTORY_LIST
 	PHP_FE(readline_list_history, 		arginfo_readline_list_history)
 #endif
 	PHP_FE(readline_read_history, 		arginfo_readline_read_history)
@@ -379,22 +379,35 @@ PHP_FUNCTION(readline_clear_history)
 /* }}} */
 /* {{{ proto array readline_list_history(void)
    Lists the history */
-#ifndef HAVE_LIBEDIT
+#ifdef HAVE_HISTORY_LIST
 PHP_FUNCTION(readline_list_history)
 {
 	HIST_ENTRY **history;
+#ifdef HAVE_LIBEDIT
+	HISTORY_STATE *hs;
+#endif
 
 	if (zend_parse_parameters_none() == FAILURE) {
 		return;
 	}
 
+	array_init(return_value);
+
+#ifdef HAVE_LIBEDIT
+	using_history();
 	history = history_list();
+	hs = history_get_history_state();
 
-	array_init(return_value);
+	if (history && hs) {
+		int i;
+		for (i = 0; i < hs->length; i++) {
+#else
+	history = history_list();
 
 	if (history) {
 		int i;
 		for (i = 0; history[i]; i++) {
+#endif
 			add_next_index_string(return_value,history[i]->line);
 		}
 	}