--- libaitcli/src/aitcli.c	2013/11/20 16:21:55	1.9.2.3
+++ libaitcli/src/aitcli.c	2013/12/03 20:09:14	1.12.2.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitcli.c,v 1.9.2.3 2013/11/20 16:21:55 misho Exp $
+* $Id: aitcli.c,v 1.12.2.1 2013/12/03 20:09:14 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -1050,7 +1050,7 @@ cliInit(int fin, int fout, const char *prompt)
 			keys[i].key_func = bufEOL;
 		if (cli_buffer->line_prompt && (i == *K_CTRL_H || i == *K_BACKSPACE))
 			keys[i].key_func = bufBS;
-		if (cli_buffer->line_prompt && i == *K_CTRL_C)
+		if (i == *K_CTRL_C)
 			keys[i].key_func = bufCLR;
 		if (cli_buffer->line_prompt && i == *K_CTRL_A)
 			keys[i].key_func = bufBEGIN;
@@ -1058,7 +1058,7 @@ cliInit(int fin, int fout, const char *prompt)
 			keys[i].key_func = bufEND;
 		if (cli_buffer->line_prompt && i == *K_TAB)
 			keys[i].key_func = bufComp;
-		if (cli_buffer->line_prompt && i == *K_CTRL_Z)
+		if (i == *K_CTRL_Z)
 			keys[i].key_func = bufEndNode;
 		if (i >= *K_SPACE && i < *K_BACKSPACE)
 			keys[i].key_func = bufCHAR;
@@ -1267,11 +1267,10 @@ cliInitLine(linebuffer_t * __restrict cli_buffer)
  *
  * @cli_buffer = CLI buffer
  * @timeout = Session timeout (-1 infinit)
- * @cmd_name = If timeout reached, we should call with this cmd_name (default name is "exit")
  * return: NULL if error or !=NULL readed line, must be e_free after use!
 */
 char *
-cliReadLine(linebuffer_t * __restrict cli_buffer, int timeout, const char *cmd_name)
+cliReadLine(linebuffer_t * __restrict cli_buffer, int timeout)
 {
 	int code, readLen, ret;
 	register int i;
@@ -1281,7 +1280,7 @@ cliReadLine(linebuffer_t * __restrict cli_buffer, int 
 	if (!cli_buffer) {
 		cli_SetErr(EINVAL, "Invalid input parameters ...");
 		return NULL;
-	} else
+	} else if (timeout > 0)
 		timeout *= 1000;	/* convert from sec to ms */
 
 	memset(&fds, 0, sizeof fds);
@@ -1292,9 +1291,11 @@ cliReadLine(linebuffer_t * __restrict cli_buffer, int 
 	while (42) {
 		if ((ret = poll(&fds, 1, timeout)) < 1) {
 			if (!ret) {
-				if (str)
+				cli_buffer->line_kill = 1;
+				if (str) {
 					e_free(str);
-				str = e_strdup(cmd_name ? cmd_name : "exit");
+					str = NULL;
+				}
 			} else
 				LOGERR;
 			return str;
@@ -1352,12 +1353,11 @@ recheck:
  * @csHistFile = History file name
  * @sock = client socket
  * @timeout = Session timeout (-1 infinit)
- * @cmd_name = If timeout reached, we should call with this cmd_name (default name is "exit")
  * return: RETCODE_ERR error, RETCODE_OK ok
 */
 int
 cliNetLoop(linebuffer_t * __restrict cli_buffer, const char *csHistFile, 
-		int sock, int timeout, const char *cmd_name)
+		int sock, int timeout)
 {
 	u_char buf[BUFSIZ];
 	int pid, stat, pty, r, s, alen, flg, attrlen = 0, ret = 0;
@@ -1376,7 +1376,7 @@ cliNetLoop(linebuffer_t * __restrict cli_buffer, const
 			} else
 				close(sock);
 
-			ret = cliLoop(cli_buffer, csHistFile, timeout, cmd_name) < 0 ? 1 : 0;
+			ret = cliLoop(cli_buffer, csHistFile, timeout) < 0 ? 1 : 0;
 			cliEnd(cli_buffer);
 
 			_exit(ret);
@@ -1470,12 +1470,10 @@ cliNetLoop(linebuffer_t * __restrict cli_buffer, const
  * @cli_buffer = CLI buffer
  * @csHistFile = History file name
  * @timeout = Session timeout (-1 infinit)
- * @cmd_name = If timeout reached, we should call with this cmd_name (default name is "exit")
  * return: RETCODE_ERR error, RETCODE_OK ok
 */
 int
-cliLoop(linebuffer_t * __restrict cli_buffer, const char *csHistFile, 
-		int timeout, const char *cmd_name)
+cliLoop(linebuffer_t * __restrict cli_buffer, const char *csHistFile, int timeout)
 {
 	char *line, *s, *t, **app, *items[MAX_PROMPT_ITEMS];
 	register int i;
@@ -1489,7 +1487,7 @@ cliLoop(linebuffer_t * __restrict cli_buffer, const ch
 		return RETCODE_ERR;
 
 	do {
-		line = cliReadLine(cli_buffer, timeout, cmd_name);
+		line = cliReadLine(cli_buffer, timeout);
 		if (!line) {
 			printfNL(cli_buffer, 0);
 			break;
@@ -1535,7 +1533,7 @@ cliLoop(linebuffer_t * __restrict cli_buffer, const ch
 		cli_freeLine(cli_buffer);
 		cli_resetHistory(cli_buffer);
 		e_free(line);
-	} while (ret < 1);
+	} while (cli_buffer->line_kill || ret < 1);
 
 	cli_saveHistory(cli_buffer, csHistFile, HISTORY_LINES);
 	return ret;