Add ability to use system libedit and update bundled libedit.

The version of libedit that is bundled with asterisk is old and has some bugs.
This patch updates the bundled version of libedit within asterisk, and also
updates asterisk to use the system libedit instead if one is available (and
pkg-config is available).  This review integrates several patches from other
users specifically kkm and tzafrir.

(closes issue #15929)
Reported by: kkm
Patches:
      015929-astcli-editrc-trunk.240324.diff uploaded by kkm (license 888)

(issue #16858)
Reported by: jw-asterisk

(closes issue #17039)
Reported by: tzafrir
Patches:
      0001-allow-using-system-copy-of-libedit.patch uploaded by tzafrir (license 46)

Review: https://reviewboard.asterisk.org/r/807/


git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@280019 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 47 insertions, 52 deletions

diff --git a/main/asterisk.c b/main/asterisk.c
index d8d3aebdf..4cc02499a 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -107,6 +107,8 @@ int daemon(int, int);  /* defined in libresolv of all places */
 #endif /* HAVE_CAP */
 #endif /* linux */
 
+#include <histedit.h>
+
 #include "asterisk/paths.h"	/* we define here the variables so better agree on the prototype */
 #include "asterisk/network.h"
 #include "asterisk/cli.h"
@@ -130,7 +132,6 @@ int daemon(int, int);  /* defined in libresolv of all places */
 #include "asterisk/utils.h"
 #include "asterisk/file.h"
 #include "asterisk/io.h"
-#include "editline/histedit.h"
 #include "asterisk/config.h"
 #include "asterisk/ast_version.h"
 #include "asterisk/linkedlists.h"
@@ -1669,7 +1670,7 @@ static void quit_handler(int num, int niceness, int safeshutdown, int restart)
 		close(ast_consock);
 	if (!ast_opt_remote)
 		unlink(ast_config_AST_PID);
-	printf("%s", term_quit());
+	printf("%s", ast_term_quit());
 	if (restart) {
 		if (option_verbose || ast_opt_console)
 			ast_verbose("Preparing for Asterisk restart...\n");
@@ -1772,7 +1773,7 @@ static int ast_all_zeros(char *s)
 
 static void consolehandler(char *s)
 {
-	printf("%s", term_end());
+	printf("%s", ast_term_end());
 	fflush(stdout);
 
 	/* Called when readline data is available */
@@ -2157,7 +2158,7 @@ static int ast_el_read_char(EditLine *editline, char *cp)
 					for (tries = 0; tries < 30 * reconnects_per_second; tries++) {
 						if (ast_tryconnect()) {
 							fprintf(stderr, "Reconnect succeeded after %.3f seconds\n", 1.0 / reconnects_per_second * tries);
-							printf("%s", term_quit());
+							printf("%s", ast_term_quit());
 							WELCOME_MESSAGE;
 							if (!ast_opt_mute)
 								fdsend(ast_consock, "logger mute silent");
@@ -2473,7 +2474,7 @@ static char *cli_complete(EditLine *editline, int ch)
 			int mlen = 0, maxmbuf = 2048;
 			/* Start with a 2048 byte buffer */			
 			if (!(mbuf = ast_malloc(maxmbuf))) {
-				lf->cursor[0] = savechr;
+				((char *) lf->cursor)[0] = savechr;
 				return (char *)(CC_ERROR);
 			}
 			snprintf(buf, sizeof(buf), "_COMMAND MATCHESARRAY \"%s\" \"%s\"", lf->buffer, ptr); 
@@ -2485,7 +2486,7 @@ static char *cli_complete(EditLine *editline, int ch)
 					/* Every step increment buffer 1024 bytes */
 					maxmbuf += 1024;					
 					if (!(mbuf = ast_realloc(mbuf, maxmbuf))) {
-						lf->cursor[0] = savechr;
+						((char *) lf->cursor)[0] = savechr;
 						return (char *)(CC_ERROR);
 					}
 				}
@@ -2547,7 +2548,7 @@ static char *cli_complete(EditLine *editline, int ch)
 		ast_free(matches);
 	}
 
-	lf->cursor[0] = savechr;
+	((char *) lf->cursor)[0] = savechr;
 
 	return (char *)(long)retval;
 }
@@ -2555,7 +2556,7 @@ static char *cli_complete(EditLine *editline, int ch)
 static int ast_el_initialize(void)
 {
 	HistEvent ev;
-	char *editor = getenv("AST_EDITOR");
+	char *editor = getenv("AST_EDITMODE");
 
 	if (el != NULL)
 		el_end(el);
@@ -2583,6 +2584,17 @@ static int ast_el_initialize(void)
 	el_set(el, EL_BIND, "?", "ed-complete", NULL);
 	/* Bind ^D to redisplay */
 	el_set(el, EL_BIND, "^D", "ed-redisplay", NULL);
+	/* Bind Delete to delete char left */
+	el_set(el, EL_BIND, "\\e[3~", "ed-delete-next-char", NULL);
+	/* Bind Home and End to move to line start and end */
+	el_set(el, EL_BIND, "\\e[1~", "ed-move-to-beg", NULL);
+	el_set(el, EL_BIND, "\\e[4~", "ed-move-to-end", NULL);
+	/* Bind C-left and C-right to move by word (not all terminals) */
+	el_set(el, EL_BIND, "\\eOC", "vi-next-word", NULL);
+	el_set(el, EL_BIND, "\\eOD", "vi-prev-word", NULL);
+
+	/* Allow ~/.editrc or a file specified by EDITRC env to override */
+	el_source(el, NULL);
 
 	return 0;
 }
@@ -2612,29 +2624,12 @@ static int ast_el_write_history(char *filename)
 
 static int ast_el_read_history(char *filename)
 {
-	char buf[MAX_HISTORY_COMMAND_LENGTH];
-	FILE *f;
-	int ret = -1;
+	HistEvent ev;
 
 	if (el_hist == NULL || el == NULL)
 		ast_el_initialize();
 
-	if ((f = fopen(filename, "r")) == NULL)
-		return ret;
-
-	while (!feof(f)) {
-		if (!fgets(buf, sizeof(buf), f))
-			break;
-		if (!strcmp(buf, "_HiStOrY_V2_\n"))
-			continue;
-		if (ast_all_zeros(buf))
-			continue;
-		if ((ret = ast_el_add_history(buf)) == -1)
-			break;
-	}
-	fclose(f);
-
-	return ret;
+	return history(el_hist, &ev, H_LOAD, filename);
 }
 
 static void ast_remotecontrol(char *data)
@@ -3498,7 +3493,7 @@ int main(int argc, char *argv[])
 	}
 
 	ast_term_init();
-	printf("%s", term_end());
+	printf("%s", ast_term_end());
 	fflush(stdout);
 
 	if (ast_opt_console && !option_verbose) 
@@ -3523,18 +3518,18 @@ int main(int argc, char *argv[])
 				quit_handler(0, 0, 0, 0);
 				exit(0);
 			}
-			printf("%s", term_quit());
+			printf("%s", ast_term_quit());
 			ast_remotecontrol(NULL);
 			quit_handler(0, 0, 0, 0);
 			exit(0);
 		} else {
 			ast_log(LOG_ERROR, "Asterisk already running on %s.  Use 'asterisk -r' to connect.\n", ast_config_AST_SOCKET);
-			printf("%s", term_quit());
+			printf("%s", ast_term_quit());
 			exit(1);
 		}
 	} else if (ast_opt_remote || ast_opt_exec) {
 		ast_log(LOG_ERROR, "Unable to connect to remote asterisk (does %s exist?)\n", ast_config_AST_SOCKET);
-		printf("%s", term_quit());
+		printf("%s", ast_term_quit());
 		exit(1);
 	}
 	/* Blindly write pid file since we couldn't connect */
@@ -3607,13 +3602,13 @@ int main(int argc, char *argv[])
 	}
 
 	if (ast_event_init()) {
-		printf("%s", term_quit());
+		printf("%s", ast_term_quit());
 		exit(1);
 	}
 
 #ifdef TEST_FRAMEWORK
 	if (ast_test_init()) {
-		printf("%s", term_quit());
+		printf("%s", ast_term_quit());
 		exit(1);
 	}
 #endif
@@ -3641,7 +3636,7 @@ int main(int argc, char *argv[])
 	initstate((unsigned int) getpid() * 65536 + (unsigned int) time(NULL), randompool, sizeof(randompool));
 
 	if (init_logger()) {		/* Start logging subsystem */
-		printf("%s", term_quit());
+		printf("%s", ast_term_quit());
 		exit(1);
 	}
 
@@ -3652,12 +3647,12 @@ int main(int argc, char *argv[])
 	ast_autoservice_init();
 
 	if (ast_timing_init()) {
-		printf("%s", term_quit());
+		printf("%s", ast_term_quit());
 		exit(1);
 	}
 
 	if (ast_ssl_init()) {
-		printf("%s", term_quit());
+		printf("%s", ast_term_quit());
 		exit(1);
 	}
 
@@ -3668,41 +3663,41 @@ int main(int argc, char *argv[])
 
 	/* initialize the data retrieval API */
 	if (ast_data_init()) {
-		printf ("%s", term_quit());
+		printf ("%s", ast_term_quit());
 		exit(1);
 	}
 
 	ast_channels_init();
 
 	if ((moduleresult = load_modules(1))) {		/* Load modules, pre-load only */
-		printf("%s", term_quit());
+		printf("%s", ast_term_quit());
 		exit(moduleresult == -2 ? 2 : 1);
 	}
 
 	if (dnsmgr_init()) {		/* Initialize the DNS manager */
-		printf("%s", term_quit());
+		printf("%s", ast_term_quit());
 		exit(1);
 	}
 
 	ast_http_init();		/* Start the HTTP server, if needed */
 
 	if (init_manager()) {
-		printf("%s", term_quit());
+		printf("%s", ast_term_quit());
 		exit(1);
 	}
 
 	if (ast_cdr_engine_init()) {
-		printf("%s", term_quit());
+		printf("%s", ast_term_quit());
 		exit(1);
 	}
 
 	if (ast_cel_engine_init()) {
-		printf("%s", term_quit());
+		printf("%s", ast_term_quit());
 		exit(1);
 	}
 
 	if (ast_device_state_engine_init()) {
-		printf("%s", term_quit());
+		printf("%s", ast_term_quit());
 		exit(1);
 	}
 
@@ -3710,49 +3705,49 @@ int main(int argc, char *argv[])
 	ast_udptl_init();
 
 	if (ast_image_init()) {
-		printf("%s", term_quit());
+		printf("%s", ast_term_quit());
 		exit(1);
 	}
 
 	if (ast_file_init()) {
-		printf("%s", term_quit());
+		printf("%s", ast_term_quit());
 		exit(1);
 	}
 
 	if (load_pbx()) {
-		printf("%s", term_quit());
+		printf("%s", ast_term_quit());
 		exit(1);
 	}
 
 	if (ast_indications_init()) {
-		printf("%s", term_quit());
+		printf("%s", ast_term_quit());
 		exit(1);
 	}
 
 	ast_features_init();
 
 	if (init_framer()) {
-		printf("%s", term_quit());
+		printf("%s", ast_term_quit());
 		exit(1);
 	}
 
 	if (astdb_init()) {
-		printf("%s", term_quit());
+		printf("%s", ast_term_quit());
 		exit(1);
 	}
 
 	if (ast_enum_init()) {
-		printf("%s", term_quit());
+		printf("%s", ast_term_quit());
 		exit(1);
 	}
 
 	if (ast_cc_init()) {
-		printf("%s", term_quit());
+		printf("%s", ast_term_quit());
 		exit(1);
 	}
 
 	if ((moduleresult = load_modules(0))) {		/* Load modules */
-		printf("%s", term_quit());
+		printf("%s", ast_term_quit());
 		exit(moduleresult == -2 ? 2 : 1);
 	}