--- libaitcli/src/aitcli.c	2010/12/07 15:09:02	1.2.2.18
+++ libaitcli/src/aitcli.c	2011/03/16 17:43:07	1.3.2.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitcli.c,v 1.2.2.18 2010/12/07 15:09:02 misho Exp $
+* $Id: aitcli.c,v 1.3.2.1 2011/03/16 17:43:07 misho Exp $
 *
 *************************************************************************/
 #include "global.h"
@@ -507,9 +507,10 @@ cli_Printf(linebuffer_t * __restrict buffer, char *fmt
 inline void
 cli_PrintHelp(linebuffer_t * __restrict buffer)
 {
-	if (buffer)
+	if (buffer) {
 		bufHelp(0, buffer);
-	else
+		clrscrEOL(buffer);
+	} else
 		cli_SetErr(EINVAL, "Error:: invalid input parameters ...");
 }
 
@@ -1254,12 +1255,12 @@ int
 cliNetLoop(linebuffer_t * __restrict buffer, const char *csHistFile, int sock)
 {
 	u_char buf[BUFSIZ];
-	int pty, r, s, alen, flg, attrlen = 0, ret = 0;
+	int pid, stat, pty, r, s, alen, flg, attrlen = 0, ret = 0;
 	fd_set fds;
 	struct timeval tv = { DEFAULT_SOCK_TIMEOUT, 0 };
 	struct telnetAttrs *a, Attr[10];
 
-	switch (forkpty(&pty, NULL, NULL, NULL)) {
+	switch ((pid = forkpty(&pty, NULL, NULL, NULL))) {
 		case -1:
 			LOGERR;
 			return -1;
@@ -1270,25 +1271,25 @@ cliNetLoop(linebuffer_t * __restrict buffer, const cha
 			} else
 				close(sock);
 
-			cliInitLine(buffer);
 			ret = cliLoop(buffer, csHistFile) < 0 ? 1 : 0;
 			cliEnd(buffer);
 
 			exit(ret);
 		default:
-			telnet_SetCmd(Attr + 0, DO, TELOPT_TTYPE);
-			telnet_SetCmd(Attr + 1, WILL, TELOPT_ECHO);
-			telnet_Set_SubOpt(Attr + 2, TELOPT_LFLOW, LFLOW_OFF, NULL, 0);
-			telnet_Set_SubOpt(Attr + 3, TELOPT_LFLOW, LFLOW_RESTART_XON, NULL, 0);
-			telnet_SetCmd(Attr + 4, DO, TELOPT_LINEMODE);
-			if ((ret = telnetSend(sock, Attr, 5, NULL, 0, 0)) == -1) {
-				cli_Errno = telnet_GetErrno();
-				strlcpy(cli_Error, telnet_GetError(), STRSIZ);
+			cli_telnet_SetCmd(Attr + 0, DO, TELOPT_TTYPE);
+			cli_telnet_SetCmd(Attr + 1, WILL, TELOPT_ECHO);
+			cli_telnet_Set_SubOpt(Attr + 2, TELOPT_LFLOW, LFLOW_OFF, NULL, 0);
+			cli_telnet_Set_SubOpt(Attr + 3, TELOPT_LFLOW, LFLOW_RESTART_XON, NULL, 0);
+			cli_telnet_SetCmd(Attr + 4, DO, TELOPT_LINEMODE);
+			if ((ret = cli_telnetSend(sock, Attr, 5, NULL, 0, 0)) == -1)
 				return -1;
-			} else
+			else
 				flg = 0;
 
 			while (42) {
+				if (waitpid(pid, &stat, WNOHANG))
+					break;
+
 				FD_ZERO(&fds);
 				FD_SET(sock, &fds);
 				FD_SET(pty, &fds);
@@ -1304,7 +1305,7 @@ cliNetLoop(linebuffer_t * __restrict buffer, const cha
 
 				if (FD_ISSET(sock, &fds)) {
 					memset(buf, 0, BUFSIZ);
-					if ((ret = telnetRecv(sock, &a, &alen, buf, BUFSIZ)) < 0) {
+					if ((ret = cli_telnetRecv(sock, &a, &alen, buf, BUFSIZ)) < 0) {
 						if (a)
 							free(a);
 
@@ -1313,24 +1314,20 @@ cliNetLoop(linebuffer_t * __restrict buffer, const cha
 						// EOF
 						if (-3 == ret)
 							shutdown(sock, SHUT_RD);
-						else {
-							cli_Errno = telnet_GetErrno();
-							strlcpy(cli_Error, telnet_GetError(), STRSIZ);
-						}
 						break;
 					}
 					attrlen = 0;
 					if (1 == flg && alen) {
-						telnet_SetCmd(&Attr[attrlen++], DONT, TELOPT_SGA);
-						telnet_SetCmd(&Attr[attrlen++], DO, TELOPT_ECHO);
+						cli_telnet_SetCmd(&Attr[attrlen++], DONT, TELOPT_SGA);
+						cli_telnet_SetCmd(&Attr[attrlen++], DO, TELOPT_ECHO);
 					}
 					if (2 == flg && alen) {
-						telnet_SetCmd(&Attr[attrlen++], WILL, TELOPT_ECHO);
-						telnet_Set_SubOpt(&Attr[attrlen++], TELOPT_LFLOW, 
+						cli_telnet_SetCmd(&Attr[attrlen++], WILL, TELOPT_ECHO);
+						cli_telnet_Set_SubOpt(&Attr[attrlen++], TELOPT_LFLOW, 
 								LFLOW_OFF, NULL, 0);
-						telnet_Set_SubOpt(&Attr[attrlen++], TELOPT_LFLOW, 
+						cli_telnet_Set_SubOpt(&Attr[attrlen++], TELOPT_LFLOW, 
 								LFLOW_RESTART_XON, NULL, 0);
-						telnet_SetCmd(&Attr[attrlen++], DONT, TELOPT_LINEMODE);
+						cli_telnet_SetCmd(&Attr[attrlen++], DONT, TELOPT_LINEMODE);
 					}
 					if (a)
 						free(a);
@@ -1348,11 +1345,10 @@ cliNetLoop(linebuffer_t * __restrict buffer, const cha
 						break;
 					}
 
-					if ((ret = telnetSend(sock, Attr, pty == s ? 0 : attrlen, buf, ret, 0)) == -1) {
-						cli_Errno = telnet_GetErrno();
-						strlcpy(cli_Error, telnet_GetError(), STRSIZ);
+					if ((ret = cli_telnetSend(sock, Attr, pty == s ? 0 : attrlen, 
+									buf, ret, 0)) == -1)
 						break;
-					} else
+					else
 						flg++;
 				}
 			}
@@ -1378,6 +1374,7 @@ cliLoop(linebuffer_t * __restrict buffer, const char *
 	struct tagCommand *cmd;
 
 	/* --- main body of CLI --- */
+	cliInitLine(buffer);
 
 	if (cli_loadHistory(buffer, csHistFile) == RETCODE_ERR)
 		return RETCODE_ERR;
@@ -1414,9 +1411,10 @@ cliLoop(linebuffer_t * __restrict buffer, const char *
 				cli_Printf(buffer, "\nCommand '%s' not found!\n", items[0]);
 				ret = -1;
 			} else
-				if (cmd->cmd_func)
+				if (cmd->cmd_func) {
+					cli_Printf(buffer, "\n");
 					ret = cmd->cmd_func(buffer, i, items);
-				else {
+				} else {
 					clrscrEOL(buffer);
 					printfCR(buffer, 1);
 				}