WL#5945 : Improve libedit library

Updated libedit library.

1 files changed, 107 insertions, 108 deletions

diff --git a/cmd-line-utils/libedit/map.c b/cmd-line-utils/libedit/map.c
index 693b56c82ba..946bc185437 100644
--- a/cmd-line-utils/libedit/map.c
+++ b/cmd-line-utils/libedit/map.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: map.c,v 1.24 2006/04/09 01:36:51 christos Exp $	*/
+/*	$NetBSD: map.c,v 1.30 2011/08/16 16:25:15 christos Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -46,10 +46,8 @@ static char sccsid[] = "@(#)map.c	8.1 (Berkeley) 6/4/93";
 #include <stdlib.h>
 #include "el.h"
 
-#define	N_KEYS 256
-
-private void	map_print_key(EditLine *, el_action_t *, const char *);
-private void	map_print_some_keys(EditLine *, el_action_t *, int, int);
+private void	map_print_key(EditLine *, el_action_t *, const Char *);
+private void	map_print_some_keys(EditLine *, el_action_t *, Int, Int);
 private void	map_print_all_keys(EditLine *);
 private void	map_init_nls(EditLine *);
 private void	map_init_meta(EditLine *);
@@ -904,26 +902,25 @@ map_init(EditLine *el)
 		EL_ABORT((el->errfile, "Vi insert map incorrect\n"));
 #endif
 
-	el->el_map.alt = (el_action_t *)el_malloc(sizeof(el_action_t) * N_KEYS);
+	el->el_map.alt = el_malloc(sizeof(*el->el_map.alt) * N_KEYS);
 	if (el->el_map.alt == NULL)
-		return (-1);
-	el->el_map.key = (el_action_t *)el_malloc(sizeof(el_action_t) * N_KEYS);
+		return -1;
+	el->el_map.key = el_malloc(sizeof(*el->el_map.key) * N_KEYS);
 	if (el->el_map.key == NULL)
-		return (-1);
+		return -1;
 	el->el_map.emacs = el_map_emacs;
 	el->el_map.vic = el_map_vi_command;
 	el->el_map.vii = el_map_vi_insert;
-	el->el_map.help = (el_bindings_t *) el_malloc(sizeof(el_bindings_t) *
-	    EL_NUM_FCNS);
+	el->el_map.help = el_malloc(sizeof(*el->el_map.help) * EL_NUM_FCNS);
 	if (el->el_map.help == NULL)
-		return (-1);
+		return -1;
 	(void) memcpy(el->el_map.help, help__get(),
-	    sizeof(el_bindings_t) * EL_NUM_FCNS);
-	el->el_map.func = (el_func_t *)el_malloc(sizeof(el_func_t) *
-	    EL_NUM_FCNS);
+	    sizeof(*el->el_map.help) * EL_NUM_FCNS);
+	el->el_map.func = el_malloc(sizeof(*el->el_map.func) * EL_NUM_FCNS);
 	if (el->el_map.func == NULL)
-		return (-1);
-	memcpy(el->el_map.func, func__get(), sizeof(el_func_t) * EL_NUM_FCNS);
+		return -1;
+	memcpy(el->el_map.func, func__get(), sizeof(*el->el_map.func)
+	    * EL_NUM_FCNS);
 	el->el_map.nfunc = EL_NUM_FCNS;
 
 #ifdef VIDEFAULT
@@ -931,7 +928,7 @@ map_init(EditLine *el)
 #else
 	map_init_emacs(el);
 #endif /* VIDEFAULT */
-	return (0);
+	return 0;
 }
 
 
@@ -942,16 +939,16 @@ protected void
 map_end(EditLine *el)
 {
 
-	el_free((ptr_t) el->el_map.alt);
+	el_free(el->el_map.alt);
 	el->el_map.alt = NULL;
-	el_free((ptr_t) el->el_map.key);
+	el_free(el->el_map.key);
 	el->el_map.key = NULL;
 	el->el_map.emacs = NULL;
 	el->el_map.vic = NULL;
 	el->el_map.vii = NULL;
-	el_free((ptr_t) el->el_map.help);
+	el_free(el->el_map.help);
 	el->el_map.help = NULL;
-	el_free((ptr_t) el->el_map.func);
+	el_free(el->el_map.func);
 	el->el_map.func = NULL;
 }
 
@@ -967,7 +964,7 @@ map_init_nls(EditLine *el)
 	el_action_t *map = el->el_map.key;
 
 	for (i = 0200; i <= 0377; i++)
-		if (el_isprint(i))
+		if (Isprint(i))
 			map[i] = ED_INSERT;
 }
 
@@ -978,7 +975,7 @@ map_init_nls(EditLine *el)
 private void
 map_init_meta(EditLine *el)
 {
-	char buf[3];
+	Char buf[3];
 	int i;
 	el_action_t *map = el->el_map.key;
 	el_action_t *alt = el->el_map.alt;
@@ -996,7 +993,7 @@ map_init_meta(EditLine *el)
 		} else
 			map = alt;
 	}
-	buf[0] = (char) i;
+	buf[0] = (Char) i;
 	buf[2] = 0;
 	for (i = 0200; i <= 0377; i++)
 		switch (map[i]) {
@@ -1006,7 +1003,7 @@ map_init_meta(EditLine *el)
 			break;
 		default:
 			buf[1] = i & 0177;
-			key_add(el, buf, key_map_cmd(el, (int) map[i]), XK_CMD);
+			keymacro_add(el, buf, keymacro_map_cmd(el, (int) map[i]), XK_CMD);
 			break;
 		}
 	map[(int) buf[0]] = ED_SEQUENCE_LEAD_IN;
@@ -1028,7 +1025,7 @@ map_init_vi(EditLine *el)
 	el->el_map.type = MAP_VI;
 	el->el_map.current = el->el_map.key;
 
-	key_reset(el);
+	keymacro_reset(el);
 
 	for (i = 0; i < N_KEYS; i++) {
 		key[i] = vii[i];
@@ -1039,7 +1036,7 @@ map_init_vi(EditLine *el)
 	map_init_nls(el);
 
 	tty_bind_char(el, 1);
-	term_bind_arrow(el);
+	terminal_bind_arrow(el);
 }
 
 
@@ -1050,14 +1047,14 @@ protected void
 map_init_emacs(EditLine *el)
 {
 	int i;
-	char buf[3];
+	Char buf[3];
 	el_action_t *key = el->el_map.key;
 	el_action_t *alt = el->el_map.alt;
 	const el_action_t *emacs = el->el_map.emacs;
 
 	el->el_map.type = MAP_EMACS;
 	el->el_map.current = el->el_map.key;
-	key_reset(el);
+	keymacro_reset(el);
 
 	for (i = 0; i < N_KEYS; i++) {
 		key[i] = emacs[i];
@@ -1070,10 +1067,10 @@ map_init_emacs(EditLine *el)
 	buf[0] = CONTROL('X');
 	buf[1] = CONTROL('X');
 	buf[2] = 0;
-	key_add(el, buf, key_map_cmd(el, EM_EXCHANGE_MARK), XK_CMD);
+	keymacro_add(el, buf, keymacro_map_cmd(el, EM_EXCHANGE_MARK), XK_CMD);
 
 	tty_bind_char(el, 1);
-	term_bind_arrow(el);
+	terminal_bind_arrow(el);
 }
 
 
@@ -1081,18 +1078,18 @@ map_init_emacs(EditLine *el)
  *	Set the editor
  */
 protected int
-map_set_editor(EditLine *el, char *editor)
+map_set_editor(EditLine *el, Char *editor)
 {
 
-	if (strcmp(editor, "emacs") == 0) {
+	if (Strcmp(editor, STR("emacs")) == 0) {
 		map_init_emacs(el);
-		return (0);
+		return 0;
 	}
-	if (strcmp(editor, "vi") == 0) {
+	if (Strcmp(editor, STR("vi")) == 0) {
 		map_init_vi(el);
-		return (0);
+		return 0;
 	}
-	return (-1);
+	return -1;
 }
 
 
@@ -1100,20 +1097,20 @@ map_set_editor(EditLine *el, char *editor)
  *	Retrieve the editor
  */
 protected int
-map_get_editor(EditLine *el, const char **editor)
+map_get_editor(EditLine *el, const Char **editor)
 {
 
 	if (editor == NULL)
-		return (-1);
+		return -1;
 	switch (el->el_map.type) {
 	case MAP_EMACS:
-		*editor = "emacs";
-		return (0);
+		*editor = STR("emacs");
+		return 0;
 	case MAP_VI:
-		*editor = "vi";
-		return (0);
+		*editor = STR("vi");
+		return 0;
 	}
-	return (-1);
+	return -1;
 }
 
 
@@ -1121,22 +1118,22 @@ map_get_editor(EditLine *el, const char **editor)
  *	Print the function description for 1 key
  */
 private void
-map_print_key(EditLine *el, el_action_t *map, const char *in)
+map_print_key(EditLine *el, el_action_t *map, const Char *in)
 {
 	char outbuf[EL_BUFSIZ];
 	el_bindings_t *bp, *ep;
 
 	if (in[0] == '\0' || in[1] == '\0') {
-		(void) key__decode_str(in, outbuf, sizeof(outbuf), "");
+		(void) keymacro__decode_str(in, outbuf, sizeof(outbuf), "");
 		ep = &el->el_map.help[el->el_map.nfunc];
 		for (bp = el->el_map.help; bp < ep; bp++)
 			if (bp->func == map[(unsigned char) *in]) {
 				(void) fprintf(el->el_outfile,
-				    "%s\t->\t%s\n", outbuf, bp->name);
+				    "%s\t->\t" FSTR "\n", outbuf, bp->name);
 				return;
 			}
 	} else
-		key_print(el, in);
+		keymacro_print(el, in);
 }
 
 
@@ -1144,10 +1141,10 @@ map_print_key(EditLine *el, el_action_t *map, const char *in)
  *	Print keys from first to last
  */
 private void
-map_print_some_keys(EditLine *el, el_action_t *map, int first, int last)
+map_print_some_keys(EditLine *el, el_action_t *map, Int first, Int last)
 {
 	el_bindings_t *bp, *ep;
-	char firstbuf[2], lastbuf[2];
+	Char firstbuf[2], lastbuf[2];
 	char unparsbuf[EL_BUFSIZ], extrabuf[EL_BUFSIZ];
 
 	firstbuf[0] = first;
@@ -1156,7 +1153,7 @@ map_print_some_keys(EditLine *el, el_action_t *map, int first, int last)
 	lastbuf[1] = 0;
 	if (map[first] == ED_UNASSIGNED) {
 		if (first == last) {
-			(void) key__decode_str(firstbuf, unparsbuf, 
+			(void) keymacro__decode_str(firstbuf, unparsbuf, 
 			    sizeof(unparsbuf), STRQQ);
 			(void) fprintf(el->el_outfile,
 			    "%-15s->  is undefined\n", unparsbuf);
@@ -1167,17 +1164,17 @@ map_print_some_keys(EditLine *el, el_action_t *map, int first, int last)
 	for (bp = el->el_map.help; bp < ep; bp++) {
 		if (bp->func == map[first]) {
 			if (first == last) {
-				(void) key__decode_str(firstbuf, unparsbuf, 
+				(void) keymacro__decode_str(firstbuf, unparsbuf, 
 				    sizeof(unparsbuf), STRQQ);
-				(void) fprintf(el->el_outfile, "%-15s->  %s\n",
+				(void) fprintf(el->el_outfile, "%-15s->  " FSTR "\n",
 				    unparsbuf, bp->name);
 			} else {
-				(void) key__decode_str(firstbuf, unparsbuf, 
+				(void) keymacro__decode_str(firstbuf, unparsbuf, 
 				    sizeof(unparsbuf), STRQQ);
-				(void) key__decode_str(lastbuf, extrabuf, 
+				(void) keymacro__decode_str(lastbuf, extrabuf, 
 				    sizeof(extrabuf), STRQQ);
 				(void) fprintf(el->el_outfile,
-				    "%-4s to %-7s->  %s\n",
+				    "%-4s to %-7s->  " FSTR "\n",
 				    unparsbuf, extrabuf, bp->name);
 			}
 			return;
@@ -1185,14 +1182,14 @@ map_print_some_keys(EditLine *el, el_action_t *map, int first, int last)
 	}
 #ifdef MAP_DEBUG
 	if (map == el->el_map.key) {
-		(void) key__decode_str(firstbuf, unparsbuf, 
+		(void) keymacro__decode_str(firstbuf, unparsbuf, 
 		    sizeof(unparsbuf), STRQQ);
 		(void) fprintf(el->el_outfile,
 		    "BUG!!! %s isn't bound to anything.\n", unparsbuf);
 		(void) fprintf(el->el_outfile, "el->el_map.key[%d] == %d\n",
 		    first, el->el_map.key[first]);
 	} else {
-		(void) key__decode_str(firstbuf, unparsbuf, 
+		(void) keymacro__decode_str(firstbuf, unparsbuf, 
 		    sizeof(unparsbuf), STRQQ);
 		(void) fprintf(el->el_outfile,
 		    "BUG!!! %s isn't bound to anything.\n", unparsbuf);
@@ -1233,9 +1230,9 @@ map_print_all_keys(EditLine *el)
 	map_print_some_keys(el, el->el_map.alt, prev, i - 1);
 
 	(void) fprintf(el->el_outfile, "Multi-character bindings\n");
-	key_print(el, "");
+	keymacro_print(el, STR(""));
 	(void) fprintf(el->el_outfile, "Arrow key bindings\n");
-	term_print_arrow(el, "");
+	terminal_print_arrow(el, STR(""));
 }
 
 
@@ -1243,21 +1240,21 @@ map_print_all_keys(EditLine *el)
  *	Add/remove/change bindings
  */
 protected int
-map_bind(EditLine *el, int argc, const char **argv)
+map_bind(EditLine *el, int argc, const Char **argv)
 {
 	el_action_t *map;
 	int ntype, rem;
-	const char *p;
-	char inbuf[EL_BUFSIZ];
-	char outbuf[EL_BUFSIZ];
-	const char *in = NULL;
-	char *out = NULL;
+	const Char *p;
+	Char inbuf[EL_BUFSIZ];
+	Char outbuf[EL_BUFSIZ];
+	const Char *in = NULL;
+	Char *out = NULL;
 	el_bindings_t *bp, *ep;
 	int cmd;
 	int key;
 
 	if (argv == NULL)
-		return (-1);
+		return -1;
 
 	map = el->el_map.key;
 	ntype = XK_CMD;
@@ -1287,22 +1284,22 @@ map_bind(EditLine *el, int argc, const char **argv)
 
 			case 'v':
 				map_init_vi(el);
-				return (0);
+				return 0;
 
 			case 'e':
 				map_init_emacs(el);
-				return (0);
+				return 0;
 
 			case 'l':
 				ep = &el->el_map.help[el->el_map.nfunc];
 				for (bp = el->el_map.help; bp < ep; bp++)
 					(void) fprintf(el->el_outfile,
-					    "%s\n\t%s\n",
+					    "" FSTR "\n\t" FSTR "\n",
 					    bp->name, bp->description);
-				return (0);
+				return 0;
 			default:
 				(void) fprintf(el->el_errfile,
-				    "%s: Invalid switch `%c'.\n",
+				    "" FSTR ": Invalid switch `%c'.\n",
 				    argv[0], p[1]);
 			}
 		else
@@ -1310,40 +1307,40 @@ map_bind(EditLine *el, int argc, const char **argv)
 
 	if (argv[argc] == NULL) {
 		map_print_all_keys(el);
-		return (0);
+		return 0;
 	}
 	if (key)
 		in = argv[argc++];
 	else if ((in = parse__string(inbuf, argv[argc++])) == NULL) {
 		(void) fprintf(el->el_errfile,
-		    "%s: Invalid \\ or ^ in instring.\n",
+		    "" FSTR ": Invalid \\ or ^ in instring.\n",
 		    argv[0]);
-		return (-1);
+		return -1;
 	}
 	if (rem) {
 		if (key) {
-			(void) term_clear_arrow(el, in);
-			return (-1);
+			(void) terminal_clear_arrow(el, in);
+			return -1;
 		}
 		if (in[1])
-			(void) key_delete(el, in);
+			(void) keymacro_delete(el, in);
 		else if (map[(unsigned char) *in] == ED_SEQUENCE_LEAD_IN)
-			(void) key_delete(el, in);
+			(void) keymacro_delete(el, in);
 		else
 			map[(unsigned char) *in] = ED_UNASSIGNED;
-		return (0);
+		return 0;
 	}
 	if (argv[argc] == NULL) {
 		if (key)
-			term_print_arrow(el, in);
+			terminal_print_arrow(el, in);
 		else
 			map_print_key(el, map, in);
-		return (0);
+		return 0;
 	}
 #ifdef notyet
 	if (argv[argc + 1] != NULL) {
-		bindkey_usage();
-		return (-1);
+		bindkeymacro_usage();
+		return -1;
 	}
 #endif
 
@@ -1352,31 +1349,32 @@ map_bind(EditLine *el, int argc, const char **argv)
 	case XK_EXE:
 		if ((out = parse__string(outbuf, argv[argc])) == NULL) {
 			(void) fprintf(el->el_errfile,
-			    "%s: Invalid \\ or ^ in outstring.\n", argv[0]);
-			return (-1);
+			    "" FSTR ": Invalid \\ or ^ in outstring.\n", argv[0]);
+			return -1;
 		}
 		if (key)
-			term_set_arrow(el, in, key_map_str(el, out), ntype);
+			terminal_set_arrow(el, in, keymacro_map_str(el, out), ntype);
 		else
-			key_add(el, in, key_map_str(el, out), ntype);
+			keymacro_add(el, in, keymacro_map_str(el, out), ntype);
 		map[(unsigned char) *in] = ED_SEQUENCE_LEAD_IN;
 		break;
 
 	case XK_CMD:
 		if ((cmd = parse_cmd(el, argv[argc])) == -1) {
 			(void) fprintf(el->el_errfile,
-			    "%s: Invalid command `%s'.\n", argv[0], argv[argc]);
-			return (-1);
+			    "" FSTR ": Invalid command `" FSTR "'.\n",
+			    argv[0], argv[argc]);
+			return -1;
 		}
 		if (key)
-			term_set_arrow(el, in, key_map_str(el, out), ntype);
+			terminal_set_arrow(el, in, keymacro_map_str(el, out), ntype);
 		else {
 			if (in[1]) {
-				key_add(el, in, key_map_cmd(el, cmd), ntype);
+				keymacro_add(el, in, keymacro_map_cmd(el, cmd), ntype);
 				map[(unsigned char) *in] = ED_SEQUENCE_LEAD_IN;
 			} else {
-				key_clear(el, map, in);
-				map[(unsigned char) *in] = cmd;
+				keymacro_clear(el, map, in);
+				map[(unsigned char) *in] = (el_action_t)cmd;
 			}
 		}
 		break;
@@ -1385,7 +1383,7 @@ map_bind(EditLine *el, int argc, const char **argv)
 		EL_ABORT((el->el_errfile, "Bad XK_ type %d\n", ntype));
 		break;
 	}
-	return (0);
+	return 0;
 }
 
 
@@ -1393,29 +1391,30 @@ map_bind(EditLine *el, int argc, const char **argv)
  *	add a user defined function
  */
 protected int
-map_addfunc(EditLine *el, const char *name, const char *help, el_func_t func)
+map_addfunc(EditLine *el, const Char *name, const Char *help, el_func_t func)
 {
 	void *p;
-	int nf = el->el_map.nfunc + 1;
+	size_t nf = (size_t)el->el_map.nfunc + 1;
 
 	if (name == NULL || help == NULL || func == NULL)
-		return (-1);
+		return -1;
 
-	if ((p = el_realloc(el->el_map.func, nf * sizeof(el_func_t))) == NULL)
-		return (-1);
-	el->el_map.func = (el_func_t *) p;
-	if ((p = el_realloc(el->el_map.help, nf * sizeof(el_bindings_t)))
+	if ((p = el_realloc(el->el_map.func, nf *
+	    sizeof(*el->el_map.func))) == NULL)
+		return -1;
+	el->el_map.func = p;
+	if ((p = el_realloc(el->el_map.help, nf * sizeof(*el->el_map.help)))
 	    == NULL)
-		return (-1);
-	el->el_map.help = (el_bindings_t *) p;
+		return -1;
+	el->el_map.help = p;
 
-	nf = el->el_map.nfunc;
+	nf = (size_t)el->el_map.nfunc;
 	el->el_map.func[nf] = func;
 
 	el->el_map.help[nf].name = name;
-	el->el_map.help[nf].func = nf;
+	el->el_map.help[nf].func = (int)nf;
 	el->el_map.help[nf].description = help;
 	el->el_map.nfunc++;
 
-	return (0);
+	return 0;
 }