--- libaitcli/src/aitcli.c	2013/11/22 15:17:22	1.12
+++ libaitcli/src/aitcli.c	2014/04/29 01:22:30	1.14
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitcli.c,v 1.12 2013/11/22 15:17:22 misho Exp $
+* $Id: aitcli.c,v 1.14 2014/04/29 01:22:30 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -106,7 +106,7 @@ printfEOL(linebuffer_t * __restrict buf, int len, int 
 		}
 
 		write(buf->line_out, buf->line_buf, len == -1 ? 
-				buf->line_eol - buf->line_bol: len);
+				buf->line_eol - buf->line_bol : len);
 	}
 }
 
@@ -154,7 +154,8 @@ bufCHAR(int idx, void * __restrict cli_buffer)
 	memcpy(buf->line_buf + pos, buf->line_keys[idx].key_ch, buf->line_keys[idx].key_len);
 	buf->line_buf[buf->line_len - 1] = 0;
 
-	write(buf->line_out, buf->line_keys[idx].key_ch, buf->line_keys[idx].key_len);
+	if (buf->line_prompt)
+		write(buf->line_out, buf->line_keys[idx].key_ch, buf->line_keys[idx].key_len);
 
 	if (buf->line_mode == LINEMODE_INS) {
 		write(buf->line_out, (const u_char*) buf->line_buf + pos + buf->line_keys[idx].key_len, 
@@ -1050,7 +1051,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 +1059,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;
@@ -1303,17 +1304,11 @@ cliReadLine(linebuffer_t * __restrict cli_buffer, int 
 
 		memset(buf, 0, sizeof buf);
 		readLen = read(cli_buffer->line_in, buf, BUFSIZ);
-		if (readLen == -1) {
-			LOGERR;
-			return str;
+		if (readLen < 1) {
+			if (readLen)
+				LOGERR;
+			return NULL;
 		}
-		if (!readLen) {
-			if (cli_buffer->line_buf)
-				str = e_strdup(cli_buffer->line_buf);
-			else
-				cli_SetErr(EPIPE, "Unknown state ...");
-			return str;
-		}
 
 recheck:
 		for (code = RETCODE_OK, i = MAX_BINDKEY - 1; i > -1; i--)
@@ -1445,8 +1440,9 @@ cliNetLoop(linebuffer_t * __restrict cli_buffer, const
 
 				if (FD_ISSET(pty, &fds)) {
 					memset(buf, 0, BUFSIZ);
-					if ((ret = read(pty, buf, BUFSIZ)) == -1) {
-						LOGERR;
+					if ((ret = read(pty, buf, BUFSIZ)) < 1) {
+						if (ret)
+							LOGERR;
 						break;
 					}
 
@@ -1517,11 +1513,13 @@ cliLoop(linebuffer_t * __restrict cli_buffer, const ch
 			}
 
 			if (!cmd) {
-				cli_Printf(cli_buffer, "\nCommand '%s' not found!\n", items[0]);
+				cli_Printf(cli_buffer, "%sCommand '%s' not found!\n", 
+						cli_buffer->line_prompt ? "\n" : "", items[0]);
 				ret = -1;
 			} else
 				if (cmd->cmd_func) {
-					cli_Printf(cli_buffer, "\n");
+					if (cli_buffer->line_prompt)
+						cli_Printf(cli_buffer, "\n");
 					ret = cmd->cmd_func(cli_buffer, 
 							cli_buffer->line_level, items);
 				} else {