Update libedit to a snapshot from 2019-09-10

This version bring many fixes regarding unicode support
It also adds proper support for filename completion (we do not need our custom
patches anymore)
Improves the libreadline compatibility

Note that the same work was done by Yuichiro Naito in
https://reviews.freebsd.org/D21196 the main difference is in this case we have
reimported libedit in contrib to fix a long standing mess in the previous merges
which prevented a proper update workflow. (discussed long ago with pfg@)

The only difference with upstream libedit is we have added a compatibility shim
for the _elf_fn_sh_complete function which we previously added to support quoting
in filename completion and is not needed anymore.
This was added to continue supported old /bin/sh binaries and not break backward
compatibility (as discussed with jilles@)

Reviewed by:	Yuichiro Naito <naito.yuichiro_gmail.com>
MFC after:	3 weeks
Differential Revision:	https://reviews.freebsd.org/D21584

1 files changed, 0 insertions, 394 deletions

diff --git a/lib/libedit/eln.c b/lib/libedit/eln.c
deleted file mode 100644
index d35e742cd822..000000000000
--- a/lib/libedit/eln.c
+++ /dev/null
@@ -1,394 +0,0 @@
-/*	$NetBSD: eln.c,v 1.28 2016/02/28 23:02:24 christos Exp $	*/
-
-/*-
- * Copyright (c) 2009 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include "config.h"
-#if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: eln.c,v 1.28 2016/02/28 23:02:24 christos Exp $");
-#endif /* not lint && not SCCSID */
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <errno.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "el.h"
-
-public int
-el_getc(EditLine *el, char *cp)
-{
-	int num_read;
-	wchar_t wc = 0;
-
-	num_read = el_wgetc(el, &wc);
-	*cp = '\0';
-	if (num_read <= 0)
-		return num_read;
-	num_read = ct_wctob(wc);
-	if (num_read == EOF) {
-		errno = ERANGE;
-		return -1;
-	} else {
-		*cp = (char)num_read;
-		return 1;
-	}
-}
-
-
-#ifdef WIDECHAR
-public void
-el_push(EditLine *el, const char *str)
-{
-	/* Using multibyte->wide string decoding works fine under single-byte
-	 * character sets too, and Does The Right Thing. */
-	el_wpush(el, ct_decode_string(str, &el->el_lgcyconv));
-}
-
-
-public const char *
-el_gets(EditLine *el, int *nread)
-{
-	const wchar_t *tmp;
-
-	tmp = el_wgets(el, nread);
-	if (tmp != NULL) {
-	    int i;
-	    size_t nwread = 0;
-
-	    for (i = 0; i < *nread; i++)
-		nwread += ct_enc_width(tmp[i]);
-	    *nread = (int)nwread;
-	}
-	return ct_encode_string(tmp, &el->el_lgcyconv);
-}
-
-
-public int
-el_parse(EditLine *el, int argc, const char *argv[])
-{
-	int ret;
-	const wchar_t **wargv;
-
-	wargv = (const wchar_t **)
-	    ct_decode_argv(argc, argv, &el->el_lgcyconv);
-	if (!wargv)
-		return -1;
-	ret = el_wparse(el, argc, wargv);
-	ct_free_argv(wargv);
-
-	return ret;
-}
-
-
-public int
-el_set(EditLine *el, int op, ...)
-{
-	va_list ap;
-	int ret;
-
-	if (!el)
-		return -1;
-	va_start(ap, op);
-
-	switch (op) {
-	case EL_PROMPT:         /* el_pfunc_t */
-	case EL_RPROMPT: {
-		el_pfunc_t p = va_arg(ap, el_pfunc_t);
-		ret = prompt_set(el, p, 0, op, 0);
-		break;
-	}
-
-	case EL_RESIZE: {
-		el_zfunc_t p = va_arg(ap, el_zfunc_t);
-		void *arg = va_arg(ap, void *);
-		ret = ch_resizefun(el, p, arg);
-		break;
-	}
-
-	case EL_ALIAS_TEXT: {
-		el_afunc_t p = va_arg(ap, el_afunc_t);
-		void *arg = va_arg(ap, void *);
-		ret = ch_aliasfun(el, p, arg);
-		break;
-	}
-
-	case EL_PROMPT_ESC:
-	case EL_RPROMPT_ESC: {
-		el_pfunc_t p = va_arg(ap, el_pfunc_t);
-		int c = va_arg(ap, int);
-
-		ret = prompt_set(el, p, c, op, 0);
-		break;
-	}
-
-	case EL_TERMINAL:       /* const char * */
-		ret = el_wset(el, op, va_arg(ap, char *));
-		break;
-
-	case EL_EDITOR:		/* const wchar_t * */
-		ret = el_wset(el, op, ct_decode_string(va_arg(ap, char *),
-		    &el->el_lgcyconv));
-		break;
-
-	case EL_SIGNAL:         /* int */
-	case EL_EDITMODE:
-	case EL_UNBUFFERED:
-	case EL_PREP_TERM:
-		ret = el_wset(el, op, va_arg(ap, int));
-		break;
-
-	case EL_BIND:   /* const char * list -> const wchar_t * list */
-	case EL_TELLTC:
-	case EL_SETTC:
-	case EL_ECHOTC:
-	case EL_SETTY: {
-		const char *argv[20];
-		int i;
-		const wchar_t **wargv;
-		for (i = 1; i < (int)__arraycount(argv) - 1; ++i)
-			if ((argv[i] = va_arg(ap, const char *)) == NULL)
-			    break;
-		argv[0] = argv[i] = NULL;
-		wargv = (const wchar_t **)
-		    ct_decode_argv(i + 1, argv, &el->el_lgcyconv);
-		if (!wargv) {
-		    ret = -1;
-		    goto out;
-		}
-		/*
-		 * AFAIK we can't portably pass through our new wargv to
-		 * el_wset(), so we have to reimplement the body of
-		 * el_wset() for these ops.
-		 */
-		switch (op) {
-		case EL_BIND:
-			wargv[0] = STR("bind");
-			ret = map_bind(el, i, wargv);
-			break;
-		case EL_TELLTC:
-			wargv[0] = STR("telltc");
-			ret = terminal_telltc(el, i, wargv);
-			break;
-		case EL_SETTC:
-			wargv[0] = STR("settc");
-			ret = terminal_settc(el, i, wargv);
-			break;
-		case EL_ECHOTC:
-			wargv[0] = STR("echotc");
-			ret = terminal_echotc(el, i, wargv);
-			break;
-		case EL_SETTY:
-			wargv[0] = STR("setty");
-			ret = tty_stty(el, i, wargv);
-			break;
-		default:
-			ret = -1;
-		}
-		ct_free_argv(wargv);
-		break;
-	}
-
-	/* XXX: do we need to change el_func_t too? */
-	case EL_ADDFN: {          /* const char *, const char *, el_func_t */
-		const char *args[2];
-		el_func_t func;
-		wchar_t **wargv;
-
-		args[0] = va_arg(ap, const char *);
-		args[1] = va_arg(ap, const char *);
-		func = va_arg(ap, el_func_t);
-
-		wargv = ct_decode_argv(2, args, &el->el_lgcyconv);
-		if (!wargv) {
-		    ret = -1;
-		    goto out;
-		}
-		/* XXX: The two strdup's leak */
-		ret = map_addfunc(el, Strdup(wargv[0]), Strdup(wargv[1]),
-		    func);
-		ct_free_argv(wargv);
-		break;
-	}
-	case EL_HIST: {           /* hist_fun_t, const char * */
-		hist_fun_t fun = va_arg(ap, hist_fun_t);
-		void *ptr = va_arg(ap, void *);
-		ret = hist_set(el, fun, ptr);
-		el->el_flags |= NARROW_HISTORY;
-		break;
-	}
-
-	case EL_GETCFN:         /* el_rfunc_t */
-		ret = el_wset(el, op, va_arg(ap, el_rfunc_t));
-		break;
-
-	case EL_CLIENTDATA:     /* void * */
-		ret = el_wset(el, op, va_arg(ap, void *));
-		break;
-
-	case EL_SETFP: {          /* int, FILE * */
-		int what = va_arg(ap, int);
-		FILE *fp = va_arg(ap, FILE *);
-		ret = el_wset(el, op, what, fp);
-		break;
-	}
-
-	case EL_REFRESH:
-		re_clear_display(el);
-		re_refresh(el);
-		terminal__flush(el);
-		ret = 0;
-		break;
-
-	default:
-		ret = -1;
-		break;
-	}
-
-out:
-	va_end(ap);
-	return ret;
-}
-
-
-public int
-el_get(EditLine *el, int op, ...)
-{
-	va_list ap;
-	int ret;
-
-	if (!el)
-		return -1;
-
-	va_start(ap, op);
-
-	switch (op) {
-	case EL_PROMPT:         /* el_pfunc_t * */
-	case EL_RPROMPT: {
-		el_pfunc_t *p = va_arg(ap, el_pfunc_t *);
-		ret = prompt_get(el, p, 0, op);
-		break;
-	}
-
-	case EL_PROMPT_ESC: /* el_pfunc_t *, char **/
-	case EL_RPROMPT_ESC: {
-		el_pfunc_t *p = va_arg(ap, el_pfunc_t *);
-		char *c = va_arg(ap, char *);
-		wchar_t wc = 0;
-		ret = prompt_get(el, p, &wc, op);
-		*c = (char)wc;
-		break;
-	}
-
-	case EL_EDITOR: {
-		const char **p = va_arg(ap, const char **);
-		const wchar_t *pw;
-		ret = el_wget(el, op, &pw);
-		*p = ct_encode_string(pw, &el->el_lgcyconv);
-		if (!el->el_lgcyconv.csize)
-			ret = -1;
-		break;
-	}
-
-	case EL_TERMINAL:       /* const char ** */
-		ret = el_wget(el, op, va_arg(ap, const char **));
-		break;
-
-	case EL_SIGNAL:         /* int * */
-	case EL_EDITMODE:
-	case EL_UNBUFFERED:
-	case EL_PREP_TERM:
-		ret = el_wget(el, op, va_arg(ap, int *));
-		break;
-
-	case EL_GETTC: {
-		char *argv[20];
-		static char gettc[] = "gettc";
-		int i;
-		for (i = 1; i < (int)__arraycount(argv); ++i)
-			if ((argv[i] = va_arg(ap, char *)) == NULL)
-				break;
-		argv[0] = gettc;
-		ret = terminal_gettc(el, i, argv);
-		break;
-	}
-
-	case EL_GETCFN:         /* el_rfunc_t */
-		ret = el_wget(el, op, va_arg(ap, el_rfunc_t *));
-		break;
-
-	case EL_CLIENTDATA:     /* void ** */
-		ret = el_wget(el, op, va_arg(ap, void **));
-		break;
-
-	case EL_GETFP: {          /* int, FILE ** */
-		int what = va_arg(ap, int);
-		FILE **fpp = va_arg(ap, FILE **);
-		ret = el_wget(el, op, what, fpp);
-		break;
-	}
-
-	default:
-		ret = -1;
-		break;
-	}
-
-	va_end(ap);
-	return ret;
-}
-
-
-const LineInfo *
-el_line(EditLine *el)
-{
-	const LineInfoW *winfo = el_wline(el);
-	LineInfo *info = &el->el_lgcylinfo;
-	size_t offset;
-	const Char *p;
-
-	info->buffer   = ct_encode_string(winfo->buffer, &el->el_lgcyconv);
-
-	offset = 0;
-	for (p = winfo->buffer; p < winfo->cursor; p++)
-		offset += ct_enc_width(*p);
-	info->cursor = info->buffer + offset;
-
-	offset = 0;
-	for (p = winfo->buffer; p < winfo->lastchar; p++)
-		offset += ct_enc_width(*p);
-	info->lastchar = info->buffer + offset;
-
-	return info;
-}
-
-
-int
-el_insertstr(EditLine *el, const char *str)
-{
-	return el_winsertstr(el, ct_decode_string(str, &el->el_lgcyconv));
-}
-#endif /* WIDECHAR */