 @@ -1,1462 +1,1462 @@
-/*	$NetBSD: readline.c,v 1.172 2022/02/08 15:05:10 christos Exp $	*/
+/*	$NetBSD: readline.c,v 1.173 2022/02/19 17:45:02 christos Exp $	*/
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jaromir Dolecek.
+ *
  * 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: readline.c,v 1.172 2022/02/08 15:05:10 christos Exp $");
+__RCSID("$NetBSD: readline.c,v 1.173 2022/02/19 17:45:02 christos Exp $");
 #endif /* not lint && not SCCSID */
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <ctype.h>
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
 #include <pwd.h>
 #include <setjmp.h>
 #include <stdarg.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <vis.h>
 #include "readline/readline.h"
 #include "el.h"
 #include "fcns.h"
 #include "filecomplete.h"
 void rl_prep_terminal(int);
 void rl_deprep_terminal(void);
 /* for rl_complete() */
 #define TAB		'\r'
 /* see comment at the #ifdef for sense of this */
 /* #define GDB_411_HACK */
 /* readline compatibility stuff - look at readline sources/documentation */
 /* to see what these variables mean */
 const char *rl_library_version = "EditLine wrapper";
 int rl_readline_version = RL_READLINE_VERSION;
 static char empty[] = { '\0' };
 static char expand_chars[] = { ' ', '\t', '\n', '=', '(', '\0' };
 static char break_chars[] = { ' ', '\t', '\n', '"', '\\', '\'', '`', '@', '$',
     '>', '<', '=', ';', '|', '&', '{', '(', '\0' };
 const char *rl_readline_name = empty;
 FILE *rl_instream = NULL;
 FILE *rl_outstream = NULL;
 int rl_point = 0;
 int rl_end = 0;
 char *rl_line_buffer = NULL;
 rl_vcpfunc_t *rl_linefunc = NULL;
 int rl_done = 0;
 rl_hook_func_t *rl_event_hook = NULL;
 KEYMAP_ENTRY_ARRAY emacs_standard_keymap,
     emacs_meta_keymap,
     emacs_ctlx_keymap;
 /*
  * The following is not implemented; we always catch signals in the
  * libedit fashion: set handlers on entry to el_gets() and clear them
  * on the way out. This simplistic approach works for most cases; if
  * it does not work for your application, please let us know.
  */
 int rl_catch_signals = 1;
 int rl_catch_sigwinch = 1;
 int history_base = 1;		/* probably never subject to change */
 int history_length = 0;
 int history_offset = 0;
 int max_input_history = 0;
 char history_expansion_char = '!';
 char history_subst_char = '^';
 char *history_no_expand_chars = expand_chars;
 Function *history_inhibit_expansion_function = NULL;
 char *history_arg_extract(int start, int end, const char *str);
 int rl_inhibit_completion = 0;
 int rl_attempted_completion_over = 0;
 const char *rl_basic_word_break_characters = break_chars;
 char *rl_completer_word_break_characters = NULL;
 const char *rl_completer_quote_characters = NULL;
 const char *rl_basic_quote_characters = "\"'";
 rl_compentry_func_t *rl_completion_entry_function = NULL;
 char *(*rl_completion_word_break_hook)(void) = NULL;
 rl_completion_func_t *rl_attempted_completion_function = NULL;
-Function *rl_pre_input_hook = NULL;
+rl_hook_func_t *rl_pre_input_hook = NULL;
-Function *rl_startup1_hook = NULL;
+rl_hook_func_t *rl_startup1_hook = NULL;
 int (*rl_getc_function)(FILE *) = NULL;
 char *rl_terminal_name = NULL;
 int rl_already_prompted = 0;
 int rl_filename_completion_desired = 0;
 int rl_ignore_completion_duplicates = 0;
 int readline_echoing_p = 1;
 int _rl_print_completions_horizontally = 0;
 VFunction *rl_redisplay_function = NULL;
-Function *rl_startup_hook = NULL;
+rl_hook_func_t *rl_startup_hook = NULL;
 VFunction *rl_completion_display_matches_hook = NULL;
 VFunction *rl_prep_term_function = (VFunction *)rl_prep_terminal;
 VFunction *rl_deprep_term_function = (VFunction *)rl_deprep_terminal;
 KEYMAP_ENTRY_ARRAY emacs_meta_keymap;
 unsigned long rl_readline_state = RL_STATE_NONE;
 int _rl_complete_mark_directories;
 rl_icppfunc_t *rl_directory_completion_hook;
 int rl_completion_suppress_append;
 int rl_sort_completion_matches;
 int _rl_completion_prefix_display_length;
 int _rl_echoing_p;
 int history_max_entries;
 char *rl_display_prompt;
 int rl_erase_empty_line;
 /*
  * The current prompt string.
  */
 char *rl_prompt = NULL;
 char *rl_prompt_saved = NULL;
 /*
  * This is set to character indicating type of completion being done by
  * rl_complete_internal(); this is available for application completion
  * functions.
  */
 int rl_completion_type = 0;
 /*
  * If more than this number of items results from query for possible
  * completions, we ask user if they are sure to really display the list.
  */
 int rl_completion_query_items = 100;
 /*
  * List of characters which are word break characters, but should be left
  * in the parsed text when it is passed to the completion function.
  * Shell uses this to help determine what kind of completing to do.
  */
 const char *rl_special_prefixes = NULL;
 /*
  * This is the character appended to the completed words if at the end of
  * the line. Default is ' ' (a space).
  */
 int rl_completion_append_character = ' ';
 /* stuff below is used internally by libedit for readline emulation */
 static History *h = NULL;
 static EditLine *e = NULL;
 static rl_command_func_t *map[256];
 static jmp_buf topbuf;
 /* internal functions */
 static unsigned char	 _el_rl_complete(EditLine *, int);
 static unsigned char	 _el_rl_tstp(EditLine *, int);
 static char		*_get_prompt(EditLine *);
 static int		 _getc_function(EditLine *, wchar_t *);
 static int		 _history_expand_command(const char *, size_t, size_t,
     char **);
 static char		*_rl_compat_sub(const char *, const char *,
     const char *, int);
 static int		 _rl_event_read_char(EditLine *, wchar_t *);
 static void		 _rl_update_pos(void);
 static HIST_ENTRY rl_he;
 /* ARGSUSED */
 static char *
 _get_prompt(EditLine *el __attribute__((__unused__)))
+{
 	rl_already_prompted = 1;
 	return rl_prompt;
+}
 /*
  * read one key from user defined input function
  */
 static int
 /*ARGSUSED*/
 _getc_function(EditLine *el __attribute__((__unused__)), wchar_t *c)
+{
 	int i;
 	i = (*rl_getc_function)(rl_instream);
 	if (i == -1)
 		return 0;
 	*c = (wchar_t)i;
 	return 1;
+}
 static void
 _resize_fun(EditLine *el, void *a)
+{
 	const LineInfo *li;
 	const char **ap = a;
 	li = el_line(el);
 	*ap = li->buffer;
+}
 static const char *
 _default_history_file(void)
+{
 	struct passwd *p;
 	static char *path;
 	size_t len;
 	if (path)
 		return path;
 	if ((p = getpwuid(getuid())) == NULL)
 		return NULL;
 	len = strlen(p->pw_dir) + sizeof("/.history");
 	if ((path = malloc(len)) == NULL)
 		return NULL;
 	(void)snprintf(path, len, "%s/.history", p->pw_dir);
 	return path;
+}
 /*
  * READLINE compatibility stuff
  */
 /*
  * Set the prompt
  */
 int
 rl_set_prompt(const char *prompt)
+{
 	char *p;
 	if (!prompt)
 		prompt = "";
 	if (rl_prompt != NULL && strcmp(rl_prompt, prompt) == 0)
 		return 0;
 	if (rl_prompt)
 		el_free(rl_prompt);
 	rl_prompt = strdup(prompt);
 	if (rl_prompt == NULL)
 		return -1;
 	while ((p = strchr(rl_prompt, RL_PROMPT_END_IGNORE)) != NULL) {
 		/* Remove adjacent end/start markers to avoid double-escapes. */
 		if (p[1] == RL_PROMPT_START_IGNORE) {
 			memmove(p, p + 2, 1 + strlen(p + 2));
 		} else {
 			*p = RL_PROMPT_START_IGNORE;
+		}
+	}
 	return 0;
+}
 void
 rl_save_prompt(void)
+{
 	rl_prompt_saved = strdup(rl_prompt);
+}
 void
 rl_restore_prompt(void)
+{
 	if (!rl_prompt_saved)
 		return;
 	rl_prompt = rl_prompt_saved;
 	rl_prompt_saved = NULL;
+}
 /*
  * initialize rl compat stuff
  */
 int
 rl_initialize(void)
+{
 	HistEvent ev;
 	int editmode = 1;
 	struct termios t;
 	if (e != NULL)
 		el_end(e);
 	if (h != NULL)
 		history_end(h);
 	RL_UNSETSTATE(RL_STATE_DONE);
 	if (!rl_instream)
 		rl_instream = stdin;
 	if (!rl_outstream)
 		rl_outstream = stdout;
 	/*
 	 * See if we don't really want to run the editor
 	 */
 	if (tcgetattr(fileno(rl_instream), &t) != -1 && (t.c_lflag & ECHO) == 0)
 		editmode = 0;
 	e = el_init_internal(rl_readline_name, rl_instream, rl_outstream,
 	    stderr, fileno(rl_instream), fileno(rl_outstream), fileno(stderr),
 	    NO_RESET);
 	if (!editmode)
 		el_set(e, EL_EDITMODE, 0);
 	h = history_init();
 	if (!e || !h)
 		return -1;
 	history(h, &ev, H_SETSIZE, INT_MAX);	/* unlimited */
 	history_length = 0;
 	max_input_history = INT_MAX;
 	el_set(e, EL_HIST, history, h);
 	/* Setup resize function */
 	el_set(e, EL_RESIZE, _resize_fun, &rl_line_buffer);
 	/* setup getc function if valid */
 	if (rl_getc_function)
 		el_set(e, EL_GETCFN, _getc_function);
 	/* for proper prompt printing in readline() */
 	if (rl_set_prompt("") == -1) {
 		history_end(h);
 		el_end(e);
 		return -1;
+	}
 	el_set(e, EL_PROMPT_ESC, _get_prompt, RL_PROMPT_START_IGNORE);
 	el_set(e, EL_SIGNAL, rl_catch_signals);
 	/* set default mode to "emacs"-style and read setting afterwards */
 	/* so this can be overridden */
 	el_set(e, EL_EDITOR, "emacs");
 	if (rl_terminal_name != NULL)
 		el_set(e, EL_TERMINAL, rl_terminal_name);
 	else
 		el_get(e, EL_TERMINAL, &rl_terminal_name);
 	/*
 	 * Word completion - this has to go AFTER rebinding keys
 	 * to emacs-style.
 	 */
 	el_set(e, EL_ADDFN, "rl_complete",
 	    "ReadLine compatible completion function",
 	    _el_rl_complete);
 	el_set(e, EL_BIND, "^I", "rl_complete", NULL);
 	/*
 	 * Send TSTP when ^Z is pressed.
 	 */
 	el_set(e, EL_ADDFN, "rl_tstp",
 	    "ReadLine compatible suspend function",
 	    _el_rl_tstp);
 	el_set(e, EL_BIND, "^Z", "rl_tstp", NULL);
 	/*
 	 * Set some readline compatible key-bindings.
 	 */
 	el_set(e, EL_BIND, "^R", "em-inc-search-prev", NULL);
 	/*
 	 * Allow the use of Home/End keys.
 	 */
 	el_set(e, EL_BIND, "\\e[1~", "ed-move-to-beg", NULL);
 	el_set(e, EL_BIND, "\\e[4~", "ed-move-to-end", NULL);
 	el_set(e, EL_BIND, "\\e[7~", "ed-move-to-beg", NULL);
 	el_set(e, EL_BIND, "\\e[8~", "ed-move-to-end", NULL);
 	el_set(e, EL_BIND, "\\e[H", "ed-move-to-beg", NULL);
 	el_set(e, EL_BIND, "\\e[F", "ed-move-to-end", NULL);
 	/*
 	 * Allow the use of the Delete/Insert keys.
 	 */
 	el_set(e, EL_BIND, "\\e[3~", "ed-delete-next-char", NULL);
 	el_set(e, EL_BIND, "\\e[2~", "ed-quoted-insert", NULL);
 	/*
 	 * Ctrl-left-arrow and Ctrl-right-arrow for word moving.
 	 */
 	el_set(e, EL_BIND, "\\e[1;5C", "em-next-word", NULL);
 	el_set(e, EL_BIND, "\\e[1;5D", "ed-prev-word", NULL);
 	el_set(e, EL_BIND, "\\e[5C", "em-next-word", NULL);
 	el_set(e, EL_BIND, "\\e[5D", "ed-prev-word", NULL);
 	el_set(e, EL_BIND, "\\e\\e[C", "em-next-word", NULL);
 	el_set(e, EL_BIND, "\\e\\e[D", "ed-prev-word", NULL);
 	/* read settings from configuration file */
 	el_source(e, NULL);
 	/*
 	 * Unfortunately, some applications really do use rl_point
 	 * and rl_line_buffer directly.
 	 */
 	_resize_fun(e, &rl_line_buffer);
 	_rl_update_pos();
 	tty_end(e, TCSADRAIN);
 	return 0;
+}
 /*
  * read one line from input stream and return it, chomping
  * trailing newline (if there is any)
  */
 char *
 readline(const char *p)
+{
 	HistEvent ev;
 	const char * volatile prompt = p;
 	int count;
 	const char *ret;
 	char *buf;
 	static int used_event_hook;
 	if (e == NULL || h == NULL)
 		rl_initialize();
 	if (rl_startup_hook) {
-		(*rl_startup_hook)(NULL, 0);
+		(*rl_startup_hook)();
+	}
 	tty_init(e);
 	rl_done = 0;
 	(void)setjmp(topbuf);
 	buf = NULL;
 	/* update prompt accordingly to what has been passed */
 	if (rl_set_prompt(prompt) == -1)
 		goto out;
 	if (rl_pre_input_hook)
-		(*rl_pre_input_hook)(NULL, 0);
+		(*rl_pre_input_hook)();
 	if (rl_event_hook && !(e->el_flags & NO_TTY)) {
 		el_set(e, EL_GETCFN, _rl_event_read_char);
 		used_event_hook = 1;
+	}
 	if (!rl_event_hook && used_event_hook) {
 		el_set(e, EL_GETCFN, EL_BUILTIN_GETCFN);
 		used_event_hook = 0;
+	}
 	rl_already_prompted = 0;
 	/* get one line from input stream */
 	ret = el_gets(e, &count);
 	if (ret && count > 0) {
 		buf = strdup(ret);
 		if (buf == NULL)
 			goto out;
 		buf[strcspn(buf, "\n")] = '\0';
 	} else
 		buf = NULL;
 	history(h, &ev, H_GETSIZE);
 	history_length = ev.num;
 out:
 	tty_end(e, TCSADRAIN);
 	return buf;
+}
 /*
  * history functions
  */
 /*
  * is normally called before application starts to use
  * history expansion functions
  */
 void
 using_history(void)
+{
 	if (h == NULL || e == NULL)
 		rl_initialize();
 	history_offset = history_length;
+}
 /*
  * substitute ``what'' with ``with'', returning resulting string; if
  * globally == 1, substitutes all occurrences of what, otherwise only the
  * first one
  */
 static char *
 _rl_compat_sub(const char *str, const char *what, const char *with,
     int globally)
+{
 	const	char	*s;
 	char	*r, *result;
 	size_t	len, with_len, what_len;
 	len = strlen(str);
 	with_len = strlen(with);
 	what_len = strlen(what);
 	/* calculate length we need for result */
 	s = str;
 	while (*s) {
 		if (*s == *what && !strncmp(s, what, what_len)) {
 			len += with_len - what_len;
 			if (!globally)
 				break;
 			s += what_len;
 		} else
 			s++;
+	}
 	r = result = el_calloc(len + 1, sizeof(*r));
 	if (result == NULL)
 		return NULL;
 	s = str;
 	while (*s) {
 		if (*s == *what && !strncmp(s, what, what_len)) {
 			memcpy(r, with, with_len);
 			r += with_len;
 			s += what_len;
 			if (!globally) {
 				(void)strcpy(r, s);
 				return result;
+			}
 		} else
 			*r++ = *s++;
+	}
 	*r = '\0';
 	return result;
+}
 static	char	*last_search_pat;	/* last !?pat[?] search pattern */
 static	char	*last_search_match;	/* last !?pat[?] that matched */
 const char *
 get_history_event(const char *cmd, int *cindex, int qchar)
+{
 	int idx, sign, sub, num, begin, ret;
 	size_t len;
 	char	*pat;
 	const char *rptr;
 	HistEvent ev;
 	idx = *cindex;
 	if (cmd[idx++] != history_expansion_char)
 		return NULL;
 	/* find out which event to take */
 	if (cmd[idx] == history_expansion_char || cmd[idx] == '\0') {
 		if (history(h, &ev, H_FIRST) != 0)
 			return NULL;
 		*cindex = cmd[idx]? (idx + 1):idx;
 		return ev.str;
+	}
 	sign = 0;
 	if (cmd[idx] == '-') {
 		sign = 1;
 		idx++;
+	}
 	if ('0' <= cmd[idx] && cmd[idx] <= '9') {
 		HIST_ENTRY *he;
 		num = 0;
 		while (cmd[idx] && '0' <= cmd[idx] && cmd[idx] <= '9') {
 			num = num * 10 + cmd[idx] - '0';
 			idx++;
+		}
 		if (sign)
 			num = history_length - num + history_base;
 		if (!(he = history_get(num)))
 			return NULL;
 		*cindex = idx;
 		return he->line;
+	}
 	sub = 0;
 	if (cmd[idx] == '?') {
 		sub = 1;
 		idx++;
+	}
 	begin = idx;
 	while (cmd[idx]) {
 		if (cmd[idx] == '\n')
 			break;
 		if (sub && cmd[idx] == '?')
 			break;
 		if (!sub && (cmd[idx] == ':' || cmd[idx] == ' '
 		    || cmd[idx] == '\t' || cmd[idx] == qchar))
 			break;
 		idx++;
+	}
 	len = (size_t)idx - (size_t)begin;
 	if (sub && cmd[idx] == '?')
 		idx++;
 	if (sub && len == 0 && last_search_pat && *last_search_pat)
 		pat = last_search_pat;
 	else if (len == 0)
 		return NULL;
 	else {
 		if ((pat = el_calloc(len + 1, sizeof(*pat))) == NULL)
 			return NULL;
 		(void)strlcpy(pat, cmd + begin, len + 1);
+	}
 	if (history(h, &ev, H_CURR) != 0) {
 		if (pat != last_search_pat)
 			el_free(pat);
 		return NULL;
+	}
 	num = ev.num;
 	if (sub) {
 		if (pat != last_search_pat) {
 			el_free(last_search_pat);
 			last_search_pat = pat;
+		}
 		ret = history_search(pat, -1);
 	} else
 		ret = history_search_prefix(pat, -1);
 	if (ret == -1) {
 		/* restore to end of list on failed search */
 		history(h, &ev, H_FIRST);
 		(void)fprintf(rl_outstream, "%s: Event not found\n", pat);
 		if (pat != last_search_pat)
 			el_free(pat);
 		return NULL;
+	}
 	if (sub && len) {
 		el_free(last_search_match);
 		last_search_match = strdup(pat);
+	}
 	if (pat != last_search_pat)
 		el_free(pat);
 	if (history(h, &ev, H_CURR) != 0)
 		return NULL;
 	*cindex = idx;
 	rptr = ev.str;
 	/* roll back to original position */
 	(void)history(h, &ev, H_SET, num);
 	return rptr;
+}
 static int
 getfrom(const char **cmdp, char **fromp, const char *search, int delim)
+{
 	size_t size = 16;
 	size_t len = 0;
 	const char *cmd = *cmdp;
 	char *what = el_realloc(*fromp, size * sizeof(*what));
 	if (what == NULL){
 		el_free(*fromp);
 		*fromp = NULL;
 		return 0;
+	}
 	for (; *cmd && *cmd != delim; cmd++) {
 		if (*cmd == '\\' && cmd[1] == delim)
 			cmd++;
 		if (len - 1 >= size) {
 			char *nwhat;
 			nwhat = el_realloc(what, (size <<= 1) * sizeof(*nwhat));
 			if (nwhat == NULL) {
 				el_free(what);
 				el_free(*fromp);
 				*cmdp = cmd;
 				*fromp = NULL;
 				return 0;
+			}
 			what = nwhat;
+		}
 		what[len++] = *cmd;
+	}
 	what[len] = '\0';
 	*fromp = what;
 	*cmdp = cmd;
 	if (*what == '\0') {
 		el_free(what);
 		if (search) {
 			*fromp = strdup(search);
 			if (*fromp == NULL) {
 				return 0;
+			}
 		} else {
 			*fromp = NULL;
 			return -1;
+		}
+	}
 	if (!*cmd) {
 		el_free(what);
 		*fromp = NULL;
 		return -1;
+	}
 	cmd++;	/* shift after delim */
 	*cmdp = cmd;
 	if (!*cmd) {
 		el_free(what);
 		*fromp = NULL;
 		return -1;
+	}
 	return 1;
+}
 static int
 getto(const char **cmdp, char **top, const char *from, int delim)
+{
 	size_t size = 16;
 	size_t len = 0;
 	size_t from_len = strlen(from);
 	const char *cmd = *cmdp;
 	char *with = el_realloc(*top, size * sizeof(*with));
 	*top = NULL;
 	if (with == NULL)
 		goto out;
 	for (; *cmd && *cmd != delim; cmd++) {
 		if (len + from_len + 1 >= size) {
 			char *nwith;
 			size += from_len + 1;
 			nwith = el_realloc(with, size * sizeof(*nwith));
 			if (nwith == NULL)
 				goto out;
 			with = nwith;
+		}
 		if (*cmd == '&') {
 			/* safe */
 			strcpy(&with[len], from);
 			len += from_len;
 			continue;
+		}
 		if (*cmd == '\\' && (*(cmd + 1) == delim || *(cmd + 1) == '&'))
 			cmd++;
 		with[len++] = *cmd;
+	}
 	if (!*cmd)
 		goto out;
 	with[len] = '\0';
 	*top = with;
 	*cmdp = cmd;
 	return 1;
 out:
 	el_free(with);
 	el_free(*top);
 	*top = NULL;
 	*cmdp = cmd;
 	return -1;
+}
 static void
 replace(char **tmp, int c)
+{
 	char *aptr;
 	if ((aptr = strrchr(*tmp, c)) == NULL)
 		return;
 	aptr = strdup(aptr + 1); // XXX: check
 	el_free(*tmp);
 	*tmp = aptr;
+}
 /*
  * the real function doing history expansion - takes as argument command
  * to do and data upon which the command should be executed
  * does expansion the way I've understood readline documentation
+ *
  * returns 0 if data was not modified, 1 if it was and 2 if the string
  * should be only printed and not executed; in case of error,
  * returns -1 and *result points to NULL
  * it's the caller's responsibility to free() the string returned in *result
  */
 static int
 _history_expand_command(const char *command, size_t offs, size_t cmdlen,
     char **result)
+{
 	char *tmp, *search = NULL, *aptr, delim;
 	const char *ptr, *cmd;
 	static char *from = NULL, *to = NULL;
 	int start, end, idx, has_mods = 0;
 	int p_on = 0, g_on = 0, ev;
 	*result = NULL;
 	aptr = NULL;
 	ptr = NULL;
 	/* First get event specifier */
 	idx = 0;
 	if (strchr(":^*$", command[offs + 1])) {
 		char str[4];
 		/*
 		* "!:" is shorthand for "!!:".
 		* "!^", "!*" and "!$" are shorthand for
 		* "!!:^", "!!:*" and "!!:$" respectively.
 		*/
 		str[0] = str[1] = '!';
 		str[2] = '0';
 		ptr = get_history_event(str, &idx, 0);
 		idx = (command[offs + 1] == ':')? 1:0;
 		has_mods = 1;
 	} else {
 		if (command[offs + 1] == '#') {
 			/* use command so far */
 			if ((aptr = el_calloc(offs + 1, sizeof(*aptr)))
 			    == NULL)
 				return -1;
 			(void)strlcpy(aptr, command, offs + 1);
 			idx = 1;
 		} else {
 			int	qchar;
 			qchar = (offs > 0 && command[offs - 1] == '"')
 			    ? '"' : '\0';
 			ptr = get_history_event(command + offs, &idx, qchar);
+		}
 		has_mods = command[offs + (size_t)idx] == ':';
+	}
 	if (ptr == NULL && aptr == NULL)
 		return -1;
 	if (!has_mods) {
 		*result = strdup(aptr ? aptr : ptr);
 		if (aptr)
 			el_free(aptr);
 		if (*result == NULL)
 			return -1;
 		return 1;
+	}
 	cmd = command + offs + idx + 1;
 	/* Now parse any word designators */
 	if (*cmd == '%')	/* last word matched by ?pat? */
 		tmp = strdup(last_search_match ? last_search_match : "");
 	else if (strchr("^*$-0123456789", *cmd)) {
 		start = end = -1;
 		if (*cmd == '^')
 			start = end = 1, cmd++;
 		else if (*cmd == '$')
 			start = -1, cmd++;
 		else if (*cmd == '*')
 			start = 1, cmd++;
 		else if (*cmd == '-' || isdigit((unsigned char) *cmd)) {
 			start = 0;
 			while (*cmd && '0' <= *cmd && *cmd <= '9')
 				start = start * 10 + *cmd++ - '0';
 			if (*cmd == '-') {
 				if (isdigit((unsigned char) cmd[1])) {
 					cmd++;
 					end = 0;
 					while (*cmd && '0' <= *cmd && *cmd <= '9')
 						end = end * 10 + *cmd++ - '0';
 				} else if (cmd[1] == '$') {
 					cmd += 2;
 					end = -1;
 				} else {
 					cmd++;
 					end = -2;
+				}
 			} else if (*cmd == '*')
 				end = -1, cmd++;
 			else
 				end = start;
+		}
 		tmp = history_arg_extract(start, end, aptr? aptr:ptr);
 		if (tmp == NULL) {
 			(void)fprintf(rl_outstream, "%s: Bad word specifier",
 			    command + offs + idx);
 			if (aptr)
 				el_free(aptr);
 			return -1;
+		}
 	} else
 		tmp = strdup(aptr? aptr:ptr);
 	if (aptr)
 		el_free(aptr);
 	if (*cmd == '\0' || ((size_t)(cmd - (command + offs)) >= cmdlen)) {
 		*result = tmp;
 		return 1;
+	}
 	for (; *cmd; cmd++) {
 		switch (*cmd) {
 		case ':':
 			continue;
 		case 'h':	/* remove trailing path */
 			if ((aptr = strrchr(tmp, '/')) != NULL)
 				*aptr = '\0';
 			continue;
 		case 't':	/* remove leading path */
 			replace(&tmp, '/');
 			continue;
 		case 'r':	/* remove trailing suffix */
 			if ((aptr = strrchr(tmp, '.')) != NULL)
 				*aptr = '\0';
 			continue;
 		case 'e':	/* remove all but suffix */
 			replace(&tmp, '.');
 			continue;
 		case 'p':	/* print only */
 			p_on = 1;
 			continue;
 		case 'g':
 			g_on = 2;
 			continue;
 		case '&':
 			if (from == NULL || to == NULL)
 				continue;
 			/*FALLTHROUGH*/
 		case 's':
 			ev = -1;
 			delim = *++cmd;
 			if (delim == '\0' || *++cmd == '\0')
 				goto out;
 			if ((ev = getfrom(&cmd, &from, search, delim)) != 1)
 				goto out;
 			if ((ev = getto(&cmd, &to, from, delim)) != 1)
 				goto out;
 			aptr = _rl_compat_sub(tmp, from, to, g_on);
 			if (aptr) {
 				el_free(tmp);
 				tmp = aptr;
+			}
 			g_on = 0;
 			cmd--;
 			continue;
+		}
+	}
 	*result = tmp;
 	return p_on ? 2 : 1;
 out:
 	el_free(tmp);
 	return ev;
+}
 /*
  * csh-style history expansion
  */
 int
 history_expand(char *str, char **output)
+{
 	int ret = 0;
 	size_t idx, i, size;
 	char *tmp, *result;
 	if (h == NULL || e == NULL)
 		rl_initialize();
 	if (history_expansion_char == 0) {
 		*output = strdup(str);
 		return 0;
+	}
 	*output = NULL;
 	if (str[0] == history_subst_char) {
 		/* ^foo^foo2^ is equivalent to !!:s^foo^foo2^ */
 		*output = el_calloc(strlen(str) + 4 + 1, sizeof(**output));
 		if (*output == NULL)
 			return 0;
 		(*output)[0] = (*output)[1] = history_expansion_char;
 		(*output)[2] = ':';
 		(*output)[3] = 's';
 		(void)strcpy((*output) + 4, str);
 		str = *output;
 	} else {
 		*output = strdup(str);
 		if (*output == NULL)
 			return 0;
+	}
 #define ADD_STRING(what, len, fr)					\
 	{								\
 		if (idx + len + 1 > size) {				\
 			char *nresult = el_realloc(result,		\
 			    (size += len + 1) * sizeof(*nresult));	\
 			if (nresult == NULL) {				\
 				el_free(*output);			\
 				el_free(fr);				\
 				return 0;				\
 			}						\
 			result = nresult;				\
 		}							\
 		(void)strlcpy(&result[idx], what, len + 1);		\
 		idx += len;						\
+	}
 	result = NULL;
 	size = idx = 0;
 	tmp = NULL;
 	for (i = 0; str[i];) {
 		int qchar, loop_again;
 		size_t len, start, j;
 		qchar = 0;
 		loop_again = 1;
 		start = j = i;
 loop:
 		for (; str[j]; j++) {
 			if (str[j] == '\\' &&
 			    str[j + 1] == history_expansion_char) {
 				len = strlen(&str[j + 1]) + 1;
 				memmove(&str[j], &str[j + 1], len);
 				continue;
+			}
 			if (!loop_again) {
 				if (isspace((unsigned char) str[j])
 				    || str[j] == qchar)
 					break;
+			}
 			if (str[j] == history_expansion_char
 			    && !strchr(history_no_expand_chars, str[j + 1])
 			    && (!history_inhibit_expansion_function ||
 			    (*history_inhibit_expansion_function)(str,
 			    (int)j) == 0))
 				break;
+		}
 		if (str[j] && loop_again) {
 			i = j;
 			qchar = (j > 0 && str[j - 1] == '"' )? '"':0;
 			j++;
 			if (str[j] == history_expansion_char)
 				j++;
 			loop_again = 0;
 			goto loop;
+		}
 		len = i - start;
 		ADD_STRING(&str[start], len, NULL);
 		if (str[i] == '\0' || str[i] != history_expansion_char) {
 			len = j - i;
 			ADD_STRING(&str[i], len, NULL);
 			if (start == 0)
 				ret = 0;
 			else
 				ret = 1;
 			break;
+		}
 		ret = _history_expand_command (str, i, (j - i), &tmp);
 		if (ret > 0 && tmp) {
 			len = strlen(tmp);
 			ADD_STRING(tmp, len, tmp);
+		}
 		if (tmp) {
 			el_free(tmp);
 			tmp = NULL;
+		}
 		i = j;
+	}
 	/* ret is 2 for "print only" option */
 	if (ret == 2) {
 		add_history(result);
 #ifdef GDB_411_HACK
 		/* gdb 4.11 has been shipped with readline, where */
 		/* history_expand() returned -1 when the line	  */
 		/* should not be executed; in readline 2.1+	  */
 		/* it should return 2 in such a case		  */
 		ret = -1;
 #endif
+	}
 	el_free(*output);
 	*output = result;
 	return ret;
+}
 /*
 * Return a string consisting of arguments of "str" from "start" to "end".
 */
 char *
 history_arg_extract(int start, int end, const char *str)
+{
 	size_t  i, len, max;
 	char	**arr, *result = NULL;
 	arr = history_tokenize(str);
 	if (!arr)
 		return NULL;
 	if (arr && *arr == NULL)
 		goto out;
 	for (max = 0; arr[max]; max++)
 		continue;
 	max--;
 	if (start == '$')
 		start = (int)max;
 	if (end == '$')
 		end = (int)max;
 	if (end < 0)
 		end = (int)max + end + 1;
 	if (start < 0)
 		start = end;
 	if (start < 0 || end < 0 || (size_t)start > max ||
 	    (size_t)end > max || start > end)
 		goto out;
 	for (i = (size_t)start, len = 0; i <= (size_t)end; i++)
 		len += strlen(arr[i]) + 1;
 	len++;
 	result = el_calloc(len, sizeof(*result));
 	if (result == NULL)
 		goto out;
 	for (i = (size_t)start, len = 0; i <= (size_t)end; i++) {
 		(void)strcpy(result + len, arr[i]);
 		len += strlen(arr[i]);
 		if (i < (size_t)end)
 			result[len++] = ' ';
+	}
 	result[len] = '\0';
 out:
 	for (i = 0; arr[i]; i++)
 		el_free(arr[i]);
 	el_free(arr);
 	return result;
+}
 /*
  * Parse the string into individual tokens,
  * similar to how shell would do it.
  */
 char **
 history_tokenize(const char *str)
+{
 	int size = 1, idx = 0, i, start;
 	size_t len;
 	char **result = NULL, *temp, delim = '\0';
 	for (i = 0; str[i];) {
 		while (isspace((unsigned char) str[i]))
 			i++;
 		start = i;
 		for (; str[i];) {
 			if (str[i] == '\\') {
 				if (str[i+1] != '\0')
 					i++;
 			} else if (str[i] == delim)
 				delim = '\0';
 			else if (!delim &&
 				    (isspace((unsigned char) str[i]) ||
 				strchr("()<>;&|$", str[i])))
 				break;
 			else if (!delim && strchr("'`\"", str[i]))
 				delim = str[i];
 			if (str[i])
 				i++;
+		}
 		if (idx + 2 >= size) {
 			char **nresult;
 			size <<= 1;
 			nresult = el_realloc(result, (size_t)size * sizeof(*nresult));
 			if (nresult == NULL) {
 				el_free(result);
 				return NULL;
+			}
 			result = nresult;
+		}
 		len = (size_t)i - (size_t)start;
 		temp = el_calloc(len + 1, sizeof(*temp));
 		if (temp == NULL) {
 			for (i = 0; i < idx; i++)
 				el_free(result[i]);
 			el_free(result);
 			return NULL;
+		}
 		(void)strlcpy(temp, &str[start], len + 1);
 		result[idx++] = temp;
 		result[idx] = NULL;
 		if (str[i])
 			i++;
+	}
 	return result;
+}
 /*
  * limit size of history record to ``max'' events
  */
 void
 stifle_history(int max)
+{
 	HistEvent ev;
 	HIST_ENTRY *he;
 	if (h == NULL || e == NULL)
 		rl_initialize();
 	if (history(h, &ev, H_SETSIZE, max) == 0) {
 		max_input_history = max;
 		if (history_length > max)
 			history_base = history_length - max;
 		while (history_length > max) {
 			he = remove_history(0);
 			el_free(he->data);
 			el_free((void *)(unsigned long)he->line);
 			el_free(he);
+		}
+	}
+}
 /*
  * "unlimit" size of history - set the limit to maximum allowed int value
  */
 int
 unstifle_history(void)
+{
 	HistEvent ev;
 	int omax;
 	history(h, &ev, H_SETSIZE, INT_MAX);
 	omax = max_input_history;
 	max_input_history = INT_MAX;
 	return omax;		/* some value _must_ be returned */
+}
 int
 history_is_stifled(void)
+{
 	/* cannot return true answer */
 	return max_input_history != INT_MAX;
+}
 static const char _history_tmp_template[] = "/tmp/.historyXXXXXX";
 int
 history_truncate_file (const char *filename, int nlines)
+{
 	int ret = 0;
 	FILE *fp, *tp;
 	char template[sizeof(_history_tmp_template)];
 	char buf[4096];
 	int fd;
 	char *cp;
 	off_t off;
 	int count = 0;
 	ssize_t left = 0;
 	if (filename == NULL && (filename = _default_history_file()) == NULL)
 		return errno;
 	if ((fp = fopen(filename, "r+")) == NULL)
 		return errno;
 	strcpy(template, _history_tmp_template);
 	if ((fd = mkstemp(template)) == -1) {
 		ret = errno;
 		goto out1;
+	}
 	if ((tp = fdopen(fd, "r+")) == NULL) {
 		close(fd);
 		ret = errno;
 		goto out2;
+	}
 	for(;;) {
 		if (fread(buf, sizeof(buf), (size_t)1, fp) != 1) {
 			if (ferror(fp)) {
 				ret = errno;
 				break;
+			}
 			if (fseeko(fp, (off_t)sizeof(buf) * count, SEEK_SET) ==
 			    (off_t)-1) {
 				ret = errno;
 				break;
+			}
 			left = (ssize_t)fread(buf, (size_t)1, sizeof(buf), fp);
 			if (ferror(fp)) {
 				ret = errno;
 				break;
+			}
 			if (left == 0) {
 				count--;
 				left = sizeof(buf);
 			} else if (fwrite(buf, (size_t)left, (size_t)1, tp)
 			    != 1) {
 				ret = errno;
 				break;
+			}
 			fflush(tp);
 			break;
+		}
 		if (fwrite(buf, sizeof(buf), (size_t)1, tp) != 1) {
 			ret = errno;
 			break;
+		}
 		count++;
+	}
 	if (ret)
 		goto out3;
 	cp = buf + left - 1;
 	if(*cp != '\n')
 		cp++;
 	for(;;) {
 		while (--cp >= buf) {
 			if (*cp == '\n') {
 				if (--nlines == 0) {
 					if (++cp >= buf + sizeof(buf)) {
 						count++;
 						cp = buf;
+					}
 					break;
+				}
+			}
+		}
 		if (nlines <= 0 || count == 0)
 			break;
 		count--;
 		if (fseeko(tp, (off_t)sizeof(buf) * count, SEEK_SET) < 0) {
 			ret = errno;
 			break;
+		}
 		if (fread(buf, sizeof(buf), (size_t)1, tp) != 1) {
 			if (ferror(tp)) {
 				ret = errno;
 				break;
+			}
 			ret = EAGAIN;
 			break;
+		}
 		cp = buf + sizeof(buf);
+	}
 	if (ret || nlines > 0)
 		goto out3;
 	if (fseeko(fp, (off_t)0, SEEK_SET) == (off_t)-1) {
 		ret = errno;
 		goto out3;
+	}
 	if (fseeko(tp, (off_t)sizeof(buf) * count + (cp - buf), SEEK_SET) ==
 	    (off_t)-1) {
 		ret = errno;
 		goto out3;
+	}
 	for(;;) {
 		if ((left = (ssize_t)fread(buf, (size_t)1, sizeof(buf), tp)) == 0) {
 			if (ferror(fp))
 				ret = errno;
 			break;
+		}
 		if (fwrite(buf, (size_t)left, (size_t)1, fp) != 1) {
 			ret = errno;
 			break;
+		}
+	}
 	fflush(fp);
 	if((off = ftello(fp)) > 0)
 		(void)ftruncate(fileno(fp), off);
 out3:
 	fclose(tp);
 out2:
 	unlink(template);
 out1:
 	fclose(fp);
 	return ret;
+}
 /*
  * read history from a file given
  */
 int
 read_history(const char *filename)
+{
 	HistEvent ev;
 	if (h == NULL || e == NULL)
 		rl_initialize();
 	if (filename == NULL && (filename = _default_history_file()) == NULL)
 		return errno;
 	errno = 0;
 	if (history(h, &ev, H_LOAD, filename) == -1)
 		return errno ? errno : EINVAL;
 	if (history(h, &ev, H_GETSIZE) == 0)
 		history_length = ev.num;
 	if (history_length < 0)
 		return EINVAL;
 	return 0;
+}
 /*
  * write history to a file given
  */
 int
 write_history(const char *filename)
+{
 	HistEvent ev;
 	if (h == NULL || e == NULL)
 		rl_initialize();
 	if (filename == NULL && (filename = _default_history_file()) == NULL)
 		return errno;
 	return history(h, &ev, H_SAVE, filename) == -1 ?
 	    (errno ? errno : EINVAL) : 0;
+}
 int
 append_history(int n, const char *filename)
+{
 	HistEvent ev;
 	FILE *fp;
 	if (h == NULL || e == NULL)
 		rl_initialize();
 	if (filename == NULL && (filename = _default_history_file()) == NULL)
 		return errno;
 	if ((fp = fopen(filename, "a")) == NULL)

 @@ -1,267 +1,267 @@
-/*	$NetBSD: readline.h,v 1.52 2022/02/08 15:05:10 christos Exp $	*/
+/*	$NetBSD: readline.h,v 1.53 2022/02/19 17:45:02 christos Exp $	*/
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jaromir Dolecek.
+ *
  * 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.
  */
 #ifndef _READLINE_H_
 #define _READLINE_H_
 #include <sys/types.h>
 #include <stdio.h>
 /* list of readline stuff supported by editline library's readline wrapper */
 /* typedefs */
 typedef int	  Function(const char *, int);
 typedef char     *CPFunction(const char *, int);
 typedef void	  VFunction(void);
 typedef void	  rl_vcpfunc_t(char *);
 typedef char	**rl_completion_func_t(const char *, int, int);
 typedef char     *rl_compentry_func_t(const char *, int);
 typedef int	  rl_command_func_t(int, int);
 typedef int	  rl_hook_func_t(void);
 typedef int       rl_icppfunc_t(char **);
 /* only supports length */
 typedef struct {
 	int length;
 } HISTORY_STATE;
 typedef void *histdata_t;
 typedef struct _hist_entry {
 	const char	*line;
 	histdata_t	 data;
 } HIST_ENTRY;
 typedef struct _keymap_entry {
 	char type;
 #define ISFUNC	0
 #define ISKMAP	1
 #define ISMACR	2
 	Function *function;
 } KEYMAP_ENTRY;
 #define KEYMAP_SIZE	256
 typedef KEYMAP_ENTRY KEYMAP_ENTRY_ARRAY[KEYMAP_SIZE];
 typedef KEYMAP_ENTRY *Keymap;
 #define control_character_threshold	0x20
 #define control_character_bit		0x40
 #ifndef CTRL
 #include <sys/ioctl.h>
 #if !defined(__sun) && !defined(__hpux) && !defined(_AIX)
 #include <sys/ttydefaults.h>
 #endif
 #ifndef CTRL
 #define CTRL(c)		((c) & 037)
 #endif
 #endif
 #ifndef UNCTRL
 #define UNCTRL(c)	(((c) - 'a' + 'A')|control_character_bit)
 #endif
 #define RUBOUT		0x7f
 #define ABORT_CHAR	CTRL('G')
 #define RL_READLINE_VERSION	0x0402
 #define RL_PROMPT_START_IGNORE	'\1'
 #define RL_PROMPT_END_IGNORE	'\2'
 #define RL_STATE_NONE		0x000000
 #define RL_STATE_DONE		0x000001
 #define RL_SETSTATE(x)		(rl_readline_state |= ((unsigned long) x))
 #define RL_UNSETSTATE(x)	(rl_readline_state &= ~((unsigned long) x))
 #define RL_ISSTATE(x)		(rl_readline_state & ((unsigned long) x))
 /* global variables used by readline enabled applications */
 #ifdef __cplusplus
 extern "C" {
 #endif
 extern const char	*rl_library_version;
 extern int		rl_readline_version;
 extern const char	*rl_readline_name;
 extern FILE		*rl_instream;
 extern FILE		*rl_outstream;
 extern char		*rl_line_buffer;
 extern int		 rl_point, rl_end;
 extern int		 history_base, history_length;
 extern int		 max_input_history;
 extern const char	*rl_basic_quote_characters;
 extern const char	*rl_basic_word_break_characters;
 extern char		*rl_completer_word_break_characters;
 extern const char	*rl_completer_quote_characters;
 extern rl_compentry_func_t *rl_completion_entry_function;
 extern char		*(*rl_completion_word_break_hook)(void);
 extern rl_completion_func_t *rl_attempted_completion_function;
 extern int		 rl_attempted_completion_over;
 extern int		rl_completion_type;
 extern int		rl_completion_query_items;
 extern const char	*rl_special_prefixes;
 extern int		rl_completion_append_character;
 extern int		rl_inhibit_completion;
-extern Function		*rl_pre_input_hook;
+extern rl_hook_func_t		*rl_pre_input_hook;
-extern Function		*rl_startup_hook;
+extern rl_hook_func_t		*rl_startup_hook;
 extern char		*rl_terminal_name;
 extern int		rl_already_prompted;
 extern char		*rl_prompt;
 extern int		rl_done;
 /*
  * The following is not implemented
  */
 extern unsigned long	rl_readline_state;
 extern int		rl_catch_signals;
 extern int		rl_catch_sigwinch;
 extern KEYMAP_ENTRY_ARRAY emacs_standard_keymap,
 			emacs_meta_keymap,
 			emacs_ctlx_keymap;
 extern int		rl_filename_completion_desired;
 extern int		rl_ignore_completion_duplicates;
 extern int		(*rl_getc_function)(FILE *);
 extern VFunction	*rl_redisplay_function;
 extern VFunction	*rl_completion_display_matches_hook;
 extern VFunction	*rl_prep_term_function;
 extern VFunction	*rl_deprep_term_function;
 extern rl_hook_func_t	*rl_event_hook;
 extern int		readline_echoing_p;
 extern int		_rl_print_completions_horizontally;
 extern int		_rl_complete_mark_directories;
 extern rl_icppfunc_t	*rl_directory_completion_hook;
 extern int		rl_completion_suppress_append;
 extern int		rl_sort_completion_matches;
 extern int		_rl_completion_prefix_display_length;
 extern int		_rl_echoing_p;
 extern int		history_max_entries;
 extern char		*rl_display_prompt;
 extern int		rl_erase_empty_line;
 /* supported functions */
 char		*readline(const char *);
 int		 rl_initialize(void);
 void		 using_history(void);
 int		 add_history(const char *);
 void		 clear_history(void);
 int		 append_history(int, const char *);
 void		 stifle_history(int);
 int		 unstifle_history(void);
 int		 history_is_stifled(void);
 int		 where_history(void);
 HIST_ENTRY	*current_history(void);
 HIST_ENTRY	*history_get(int);
 HIST_ENTRY	*remove_history(int);
 HIST_ENTRY	*replace_history_entry(int, const char *, histdata_t);
 int		 history_total_bytes(void);
 int		 history_set_pos(int);
 HIST_ENTRY	*previous_history(void);
 HIST_ENTRY	*next_history(void);
 HIST_ENTRY     **history_list(void);
 int		 history_search(const char *, int);
 int		 history_search_prefix(const char *, int);
 int		 history_search_pos(const char *, int, int);
 int		 read_history(const char *);
 int		 write_history(const char *);
 int		 history_truncate_file(const char *, int);
 int		 history_expand(char *, char **);
 char	       **history_tokenize(const char *);
 const char	*get_history_event(const char *, int *, int);
 char		*history_arg_extract(int, int, const char *);
 char		*tilde_expand(char *);
 char		*filename_completion_function(const char *, int);
 char		*username_completion_function(const char *, int);
 int		 rl_complete(int, int);
 int		 rl_read_key(void);
 char	       **completion_matches(/* const */ char *, rl_compentry_func_t *);
 void		 rl_display_match_list(char **, int, int);
 int		 rl_insert(int, int);
 int		 rl_insert_text(const char *);
 int		 rl_reset_terminal(const char *);
 void		 rl_resize_terminal(void);
 int		 rl_bind_key(int, rl_command_func_t *);
 int		 rl_newline(int, int);
 void		 rl_callback_read_char(void);
 void		 rl_callback_handler_install(const char *, rl_vcpfunc_t *);
 void		 rl_callback_handler_remove(void);
 void		 rl_redisplay(void);
 int		 rl_get_previous_history(int, int);
 void		 rl_prep_terminal(int);
 void		 rl_deprep_terminal(void);
 int		 rl_read_init_file(const char *);
 int		 rl_parse_and_bind(const char *);
 int		 rl_variable_bind(const char *, const char *);
 int		 rl_stuff_char(int);
 int		 rl_add_defun(const char *, rl_command_func_t *, int);
 HISTORY_STATE	*history_get_history_state(void);
 void		 rl_get_screen_size(int *, int *);
 void		 rl_set_screen_size(int, int);
 char		*rl_filename_completion_function(const char *, int);
 int		 _rl_abort_internal(void);
 int		 _rl_qsort_string_compare(char **, char **);
 char	       **rl_completion_matches(const char *, rl_compentry_func_t *);
 void		 rl_forced_update_display(void);
 int		 rl_set_prompt(const char *);
 int		 rl_on_new_line(void);
 void		 rl_reset_after_signal(void);
 void		 rl_echo_signal_char(int);
 int		 rl_crlf(void);
 int		 rl_ding(void);
 char 		*rl_copy_text(int, int);
 void		 rl_replace_line(const char *, int);
 int		 rl_delete_text(int, int);
 void 		 rl_message(const char *format, ...)
     __attribute__((__format__(__printf__, 1, 2)));
 void		 rl_save_prompt(void);
 void		 rl_restore_prompt(void);
 /*
  * The following are not implemented
  */
 int		 rl_kill_text(int, int);
 Keymap		 rl_get_keymap(void);
 void		 rl_set_keymap(Keymap);
 Keymap		 rl_make_bare_keymap(void);
 int		 rl_generic_bind(int, const char *, const char *, Keymap);
 int		 rl_bind_key_in_map(int, rl_command_func_t *, Keymap);
 int		 rl_set_key(const char *, rl_command_func_t *, Keymap);
 void		 rl_cleanup_after_signal(void);
 void		 rl_free_line_state(void);
 int		 rl_set_keyboard_input_timeout(int);
 int		 rl_abort(int, int);
 int	         rl_set_keymap_name(const char *, Keymap);
 histdata_t	 free_history_entry(HIST_ENTRY *);
 void		 _rl_erase_entire_line(void);
 #ifdef __cplusplus
+}
 #endif
 #endif /* _READLINE_H_ */