More build fixes, some code cleanup and untabify.

This is a much cleaner design and also works with or without the configure
--enable-default-complete option.

See the examples for details.

TODO

@@ -4,3 +4,11 @@ TODO
 
 * Add --enable-FEATURE for features defined in Makefile-minix.in
 
+* Add support for custom completion, rl_attempted_completion_function.
+
+* Add support for inhibiting completion: rl_inhibit_completion
+
+* Add support for arrow keys, home, end, etc.  See the following URL
+  for how to catch complex key strokes such as escape sequences:
+  http://www.unixwiz.net/techtips/termios-vmin-vtime.html
+

config.h.in

@@ -19,6 +19,9 @@
 /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
 #undef HAVE_NDIR_H
 
+/* Define to 1 if you have the `perror' function. */
+#undef HAVE_PERROR
+
 /* Define to 1 if you have the <sgtty.h> header file. */
 #undef HAVE_SGTTY_H
 

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for Minix editline 0.2.0.
+# Generated by GNU Autoconf 2.61 for Minix editline 0.2.3.
 #
 # Report bugs to <joachim@vmlinux.org>.
 #
@@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='Minix editline'
 PACKAGE_TARNAME='minix-editline'
-PACKAGE_VERSION='0.2.0'
-PACKAGE_STRING='Minix editline 0.2.0'
+PACKAGE_VERSION='0.2.3'
+PACKAGE_STRING='Minix editline 0.2.3'
 PACKAGE_BUGREPORT='joachim@vmlinux.org'
 
 ac_unique_file="src/editline.c"
@@ -695,6 +695,8 @@ CPP
 GREP
 EGREP
 LIBOBJS
+COMPLETE_TRUE
+COMPLETE_FALSE
 LTLIBOBJS'
 ac_subst_files=''
       ac_precious_vars='build_alias
@@ -1208,7 +1210,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Minix editline 0.2.0 to adapt to many kinds of systems.
+\`configure' configures Minix editline 0.2.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1274,7 +1276,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Minix editline 0.2.0:";;
+     short | recursive ) echo "Configuration of Minix editline 0.2.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1283,6 +1285,7 @@ Optional Features:
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
+  --enable-default-complete      Enable default completion handler.
 
 Some influential environment variables:
   CC          C compiler command
@@ -1358,7 +1361,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Minix editline configure 0.2.0
+Minix editline configure 0.2.3
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1372,7 +1375,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Minix editline $as_me 0.2.0, which was
+It was created by Minix editline $as_me 0.2.3, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2067,7 +2070,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='minix-editline'
- VERSION='0.2.0'
+ VERSION='0.2.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4876,7 +4879,8 @@ fi
 
 
 
-for ac_func in strchr strdup strrchr tcgetattr
+
+for ac_func in strchr strdup strrchr tcgetattr perror
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 { echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -4970,6 +4974,35 @@ fi
 done
 
 
+# Check whether --enable-default-complete was given.
+if test "${enable_default_complete+set}" = set; then
+  enableval=$enable_default_complete;
+   case "${enableval}" in
+       yes)
+        complete=true
+        ;;
+       no)
+        complete=false
+        ;;
+       *)
+        { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-default-complete" >&5
+echo "$as_me: error: bad value ${enableval} for --enable-default-complete" >&2;}
+   { (exit 1); exit 1; }; }
+        ;;
+   esac
+else
+  complete=false
+fi
+
+ if test x$complete = xtrue; then
+  COMPLETE_TRUE=
+  COMPLETE_FALSE='#'
+else
+  COMPLETE_TRUE='#'
+  COMPLETE_FALSE=
+fi
+
+
 ac_config_files="$ac_config_files Makefile src/Makefile include/Makefile man/Makefile examples/Makefile"
 
 cat >confcache <<\_ACEOF
@@ -5082,6 +5115,13 @@ echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${COMPLETE_TRUE}" && test -z "${COMPLETE_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"COMPLETE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"COMPLETE\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
@@ -5382,7 +5422,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Minix editline $as_me 0.2.0, which was
+This file was extended by Minix editline $as_me 0.2.3, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5435,7 +5475,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-Minix editline config.status 0.2.0
+Minix editline config.status 0.2.3
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -5698,10 +5738,12 @@ CPP!$CPP$ac_delim
 GREP!$GREP$ac_delim
 EGREP!$EGREP$ac_delim
 LIBOBJS!$LIBOBJS$ac_delim
+COMPLETE_TRUE!$COMPLETE_TRUE$ac_delim
+COMPLETE_FALSE!$COMPLETE_FALSE$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 81; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 83; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.61)
-AC_INIT(Minix editline, 0.2.0, joachim@vmlinux.org)
+AC_INIT(Minix editline, 0.2.3, joachim@vmlinux.org)
 AC_CONFIG_SRCDIR([src/editline.c])
 AC_CONFIG_HEADER([config.h])
 
@@ -38,6 +38,21 @@ AC_PROG_GCC_TRADITIONAL
 #AC_FUNC_MALLOC
 #AC_FUNC_REALLOC
 AC_FUNC_STAT
-AC_CHECK_FUNCS([strchr strdup strrchr tcgetattr])
+AC_CHECK_FUNCS([strchr strdup strrchr tcgetattr perror])
+
+AC_ARG_ENABLE([default-complete],
+   [  --enable-default-complete      Enable default completion handler.],[
+   case "${enableval}" in
+       yes)
+        complete=true
+        ;;
+       no)
+        complete=false
+        ;;
+       *)
+        AC_MSG_ERROR([bad value ${enableval} for --enable-default-complete])
+        ;;
+   esac],[complete=false])
+AM_CONDITIONAL([COMPLETE], [test x$complete = xtrue])
 
 AC_OUTPUT(Makefile src/Makefile include/Makefile man/Makefile examples/Makefile)

examples/Makefile.am

@@ -1,10 +1,7 @@
 AUTOMAKE_OPTIONS = foreign
 
 LDADD = $(top_builddir)/src/libedit.a
-AM_CFLAGS = -I$(top_srcdir)/src
+AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include
 
 # TODO: Port "fileman" example from BSD editline
-noinst_PROGRAMS = testit
-
-testit_SOURCES = testit.c
-#fileman_SOURCES = fileman.c
+noinst_PROGRAMS = testit cli

examples/Makefile.in

@@ -30,7 +30,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-noinst_PROGRAMS = testit$(EXEEXT)
+noinst_PROGRAMS = testit$(EXEEXT) cli$(EXEEXT)
 subdir = examples
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -41,8 +41,12 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 PROGRAMS = $(noinst_PROGRAMS)
-am_testit_OBJECTS = testit.$(OBJEXT)
-testit_OBJECTS = $(am_testit_OBJECTS)
+cli_SOURCES = cli.c
+cli_OBJECTS = cli.$(OBJEXT)
+cli_LDADD = $(LDADD)
+cli_DEPENDENCIES = $(top_builddir)/src/libedit.a
+testit_SOURCES = testit.c
+testit_OBJECTS = testit.$(OBJEXT)
 testit_LDADD = $(LDADD)
 testit_DEPENDENCIES = $(top_builddir)/src/libedit.a
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
@@ -52,8 +56,8 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(testit_SOURCES)
-DIST_SOURCES = $(testit_SOURCES)
+SOURCES = cli.c testit.c
+DIST_SOURCES = cli.c testit.c
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -144,8 +148,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign
 LDADD = $(top_builddir)/src/libedit.a
-AM_CFLAGS = -I$(top_srcdir)/src
-testit_SOURCES = testit.c
+AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include
 all: all-am
 
 .SUFFIXES:
@@ -182,6 +185,9 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 
 clean-noinstPROGRAMS:
 	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
+cli$(EXEEXT): $(cli_OBJECTS) $(cli_DEPENDENCIES) 
+	@rm -f cli$(EXEEXT)
+	$(LINK) $(cli_OBJECTS) $(cli_LDADD) $(LIBS)
 testit$(EXEEXT): $(testit_OBJECTS) $(testit_DEPENDENCIES) 
 	@rm -f testit$(EXEEXT)
 	$(LINK) $(testit_OBJECTS) $(testit_LDADD) $(LIBS)
@@ -192,6 +198,7 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cli.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testit.Po@am__quote@
 
 .c.o:
@@ -381,7 +388,6 @@ uninstall-am:
 	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
 	uninstall-am
 
-#fileman_SOURCES = fileman.c
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

examples/cli.c

@@ -0,0 +1,80 @@
+/* Custom CLI command completion.  */
+#include "editline.h"
+#include <string.h>
+
+char *list[] = {
+   "foo ", "bar ", "bsd ", "cli ", "ls ", "cd ", "malloc ", "tee ", NULL
+};
+
+/*
+**  Attempt to complete the pathname, returning an allocated copy.
+**  Fill in *unique if we completed it, or set it to 0 if ambiguous.
+*/
+char *my_rl_complete(char *token, int *match)
+{
+   int i;
+   int index = -1;
+   int matchlen = 0;
+   int count = 0;
+
+   for (i = 0; list[i]; i++)
+   {
+      int partlen = strlen (token); /* Part of token */
+
+      if (!strncmp (list[i], token, partlen))
+      {
+         index = i;
+         matchlen = partlen;
+         count ++;
+      }
+   }
+
+   if (count == 1)
+   {
+      *match = 1;
+      return strdup (list[index] + matchlen);
+   }
+
+   return NULL;
+}
+
+/*
+**  Return all possible completions.
+*/
+int my_rl_list_possib(char *token, char ***av)
+{
+   int i, num, total = 0;
+   char **copy;
+   
+   for (num = 0; list[num]; num++)
+      ;
+   copy = (char **) malloc (num * sizeof(char *));
+   for (i = 0; i < num; i++)
+   {
+      if (!strncmp (list[i], token, strlen (token)))
+      {
+         copy[total] = strdup (list[i]);
+         total ++;
+      }
+   }
+   *av = copy;
+
+   return total;
+}
+
+int main(int ac __attribute__ ((unused)), char *av[] __attribute__ ((unused)))
+{
+   char *line;
+   char	*prompt = "cli> ";
+
+   /* Setup callbacks */
+   rl_complete = &my_rl_complete;
+   rl_list_possib = &my_rl_list_possib;
+
+   while ((line = readline(prompt)) != NULL) {
+      (void)printf("\t\t\t|%s|\n", line);
+      free(line);
+   }
+
+   return 0;
+}

examples/testit.c

@@ -3,25 +3,35 @@
 **  A "micro-shell" to test editline library.
 **  If given any arguments, commands aren't executed.
 */
+#include <config.h>
 #include <stdio.h>
-#if	defined(HAVE_STDLIB)
+#if	defined(HAVE_STDLIB_H)
 #include <stdlib.h>
-#endif	/* defined(HAVE_STDLIB) */
+#endif
+#if	defined(HAVE_STRING_H)
+#include <string.h>
+#endif
+#if	defined(HAVE_UNISTD_H)
+#include <unistd.h>
+#endif
 
 extern char	*readline();
 extern void	add_history();
 
-#if	!defined(HAVE_STDLIB)
-extern int	chdir();
+#if	!defined(HAVE_STDLIB_H)
 extern int	free();
-extern int	strncmp();
 extern int	system();
 extern void	exit();
 extern char	*getenv();
 #endif	/* !defined(HAVE_STDLIB) */
+#if   !defined(HAVE_STRING_H)
+extern int	strncmp();
+#endif
+#if   !defined(HAVE_UNISTD_H)
+extern int	chdir();
+#endif
 
-
-#if	defined(NEED_PERROR)
+#if	!defined(HAVE_PERROR)
 void
 perror(s)
     char	*s;
@@ -37,7 +47,7 @@ perror(s)
 int
 main(ac, av)
     int		ac;
-    char	*av[];
+    char	*av[] __attribute__ ((unused));
 {
     char	*prompt;
     char	*p;

include/editline.h

@@ -2,6 +2,11 @@
 #ifndef __EDITLINE_H__
 #define __EDITLINE_H__
 
+/* Assign these to get command completion, see cli.c for
+ * example usage. */
+extern char *(*rl_complete)(char *token, int *match);
+extern int (*rl_list_possib)(char *token, char ***av);
+
 /*
 **  For compatibility with FSF readline.
 */

src/Makefile.am

@@ -2,5 +2,9 @@ AUTOMAKE_OPTIONS = foreign
 
 lib_LIBRARIES = libedit.a
 
-libedit_a_SOURCES = editline.c editline.h complete.c sysunix.c unix.h
-
+libedit_a_SOURCES  = editline.c editline.h sysunix.c unix.h
+if COMPLETE
+# Built-in completion handler.
+libedit_a_SOURCES += complete.c
+AM_CPPFLAGS       = -DCOMPLETE
+endif

src/Makefile.in

@@ -30,6 +30,8 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+# Built-in completion handler.
+@COMPLETE_TRUE@am__append_1 = complete.c
 subdir = src
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -52,8 +54,11 @@ AR = ar
 ARFLAGS = cru
 libedit_a_AR = $(AR) $(ARFLAGS)
 libedit_a_LIBADD =
-am_libedit_a_OBJECTS = editline.$(OBJEXT) complete.$(OBJEXT) \
-	sysunix.$(OBJEXT)
+am__libedit_a_SOURCES_DIST = editline.c editline.h sysunix.c unix.h \
+	complete.c
+@COMPLETE_TRUE@am__objects_1 = complete.$(OBJEXT)
+am_libedit_a_OBJECTS = editline.$(OBJEXT) sysunix.$(OBJEXT) \
+	$(am__objects_1)
 libedit_a_OBJECTS = $(am_libedit_a_OBJECTS)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -63,7 +68,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(libedit_a_SOURCES)
-DIST_SOURCES = $(libedit_a_SOURCES)
+DIST_SOURCES = $(am__libedit_a_SOURCES_DIST)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -154,7 +159,9 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign
 lib_LIBRARIES = libedit.a
-libedit_a_SOURCES = editline.c editline.h complete.c sysunix.c unix.h
+libedit_a_SOURCES = editline.c editline.h sysunix.c unix.h \
+	$(am__append_1)
+@COMPLETE_TRUE@AM_CPPFLAGS = -DCOMPLETE
 all: all-am
 
 .SUFFIXES:

src/complete.c

@@ -24,7 +24,7 @@ strdup(p)
 /*
 **  strcmp-like sorting predicate for qsort.
 */
-STATIC int
+static int
 compare(p1, p2)
     CONST void  *p1;
     CONST void  *p2;
@@ -41,7 +41,7 @@ compare(p1, p2)
 **  Fill in *avp with an array of names that match file, up to its length.
 **  Ignore . and .. .
 */
-STATIC int
+static int
 FindMatches(dir, file, avp)
     char        *dir;
     char        *file;
@@ -124,7 +124,7 @@ FindMatches(dir, file, avp)
 /*
 **  Split a pathname into allocated directory and trailing filename parts.
 */
-STATIC int
+static int
 SplitPath(path, dirpart, filepart)
     char        *path;
     char        **dirpart;
@@ -161,7 +161,7 @@ SplitPath(path, dirpart, filepart)
 **  Fill in *unique if we completed it, or set it to 0 if ambiguous.
 */
 char *
-rl_complete(pathname, unique)
+default_rl_complete(pathname, unique)
     char        *pathname;
     int         *unique;
 {
@@ -233,7 +233,7 @@ rl_complete(pathname, unique)
 **  Return all possible completions.
 */
 int
-rl_list_possib(pathname, avp)
+default_rl_list_possib(pathname, avp)
     char        *pathname;
     char        ***avp;
 {

src/editline.h

@@ -2,6 +2,9 @@
 **
 **  Internal header file for editline library.
 */
+#ifndef __PRIVATE_EDITLINE_H__
+#define __PRIVATE_EDITLINE_H__
+
 #include <config.h>
 #include <stdio.h>
 #ifdef HAVE_MALLOC_H
@@ -32,21 +35,6 @@
 
 typedef unsigned char	CHAR;
 
-#if	defined(HIDE)
-#define STATIC	static
-#else
-#define STATIC	/* NULL */
-#endif	/* !defined(HIDE) */
-
-#if	!defined(CONST)
-#if	defined(__STDC__)
-#define CONST	const
-#else
-#define CONST
-#endif	/* defined(__STDC__) */
-#endif	/* !defined(CONST) */
-
-
 #define MEM_INC		64
 #define SCREEN_INC	256
 
@@ -70,8 +58,10 @@ extern int	rl_quit;
 #if	defined(DO_SIGTSTP)
 extern int	rl_susp;
 #endif	/* defined(DO_SIGTSTP) */
-extern char	*rl_complete();
-extern int	rl_list_possib(char *pathname, char ***avp);
+#ifdef COMPLETE
+extern char	*default_rl_complete();
+extern int	default_rl_list_possib(char *pathname, char ***avp);
+#endif
 extern void	rl_ttyset();
 extern void	rl_add_slash();
 
@@ -93,3 +83,6 @@ extern int	strncmp();
 #if	defined(NEED_STRDUP)
 extern char	*strdup();
 #endif
+
+#include "../include/editline.h"
+#endif  /* __PRIVATE_EDITLINE_H__ */