Merge branch 'master' into readline-compat-for-fileman

examples/Makefile.am

@@ -3,4 +3,4 @@ AUTOMAKE_OPTIONS = foreign
 noinst_PROGRAMS  = testit cli fileman
 LDADD            = $(top_builddir)/src/libeditline.la $(TERMLIBS)
 AM_CFLAGS        = -I$(top_srcdir)/src -I$(top_srcdir)/include
-
+AM_LDFLAGS       = -static

examples/Makefile.in

@@ -215,6 +215,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign
 LDADD = $(top_builddir)/src/libeditline.la $(TERMLIBS)
+AM_LDFLAGS = -static
 all: all-am
 
 .SUFFIXES:

examples/cli.c

@@ -22,6 +22,8 @@
 #include "editline.h"
 #include <string.h>
 
+#define HISTORY "/tmp/.cli-history"
+
 static char *list[] = {
    "foo ", "bar ", "bsd ", "cli ", "ls ", "cd ", "malloc ", "tee ", NULL
 };
@@ -78,6 +80,28 @@ static int my_rl_list_possib(char *token, char ***av)
    return total;
 }
 
+el_status_t list_possible(void)
+{
+    char        **av;
+    char        *word;
+    int         ac;
+
+    word = el_find_word();
+    ac = rl_list_possib(word, &av);
+    if (word)
+        free(word);
+    if (ac) {
+        el_print_columns(ac, av);
+        while (--ac >= 0)
+            free(av[ac]);
+        free(av);
+
+        return CSmove;
+    }
+
+    return el_ring_bell();
+}
+
 int main(int ac __attribute__ ((unused)), char *av[] __attribute__ ((unused)))
 {
    char *line;
@@ -86,11 +110,15 @@ int main(int ac __attribute__ ((unused)), char *av[] __attribute__ ((unused)))
    /* Setup callbacks */
    rl_set_complete_func(&my_rl_complete);
    rl_set_list_possib_func(&my_rl_list_possib);
+   el_bind_key('?', list_possible);
+   read_history(HISTORY);
 
    while ((line = readline(prompt)) != NULL) {
       printf("\t\t\t|%s|\n", line);
       free(line);
    }
 
+   write_history(HISTORY);
+
    return 0;
 }