--- libaitcli/src/aitcli.c	2013/12/03 20:09:14	1.12.2.1
+++ libaitcli/src/aitcli.c	2013/12/03 20:32:45	1.12.2.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitcli.c,v 1.12.2.1 2013/12/03 20:09:14 misho Exp $
+* $Id: aitcli.c,v 1.12.2.2 2013/12/03 20:32:45 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, 
@@ -1517,11 +1518,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 {