--- libaitcli/src/aitcli.c	2010/05/03 08:28:35	1.1.1.1.2.14
+++ libaitcli/src/aitcli.c	2010/05/20 08:18:41	1.1.1.1.2.15
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitcli.c,v 1.1.1.1.2.14 2010/05/03 08:28:35 misho Exp $
+* $Id: aitcli.c,v 1.1.1.1.2.15 2010/05/20 08:18:41 misho Exp $
 *
 *************************************************************************/
 #include "global.h"
@@ -24,15 +24,87 @@ cliCommands_t cli_stdCmds[] = {
 int cli_Errno;
 char cli_Error[STRSIZ];
 
+char cli_pending_special_char;
+
 #pragma GCC visibility pop
 
 
-#ifdef NULL_PREP_TERM
-
 static void cli_Null_Prep_Term(int meta)
 {
 }
 
+#include <syslog.h>
+static int cli_Net_rl_GetCh(FILE *s)
+{
+	int ch = rl_getc(s);
+
+	if (!cli_pending_special_char && 0x1b == ch) {
+		cli_pending_special_char = ch;
+		return ch;
+	}
+	if (cli_pending_special_char && 0x5b == ch) {
+		cli_pending_special_char = ch;
+		return ch;
+	}
+	if (0x5b == cli_pending_special_char) {
+		cli_pending_special_char = 0;
+		return ch;
+	}
+
+	syslog(LOG_CRIT, "+++++ getc=%0x\n", ch);
+	cli_pending_special_char = 0;
+	fputc(ch, rl_outstream);
+	fflush(rl_outstream);
+	return ch;
+}
+
+#if 0
+static void cli_Line_Handler(char *line)
+{
+	int len;
+	static char cli_Buffer[BUFSIZ];
+	static int cli_BufferLen, cli_BufferPos;
+
+	if (!line) {	// EOF
+		fwrite("\x4", 1, 1, rl_outstream);	// ctrl+D
+		goto end;
+	} else
+		len = strlen(line);
+	if (BUFSIZ - 2 < len)
+		cli_BufferPos = cli_BufferLen = 0;
+	else {
+		if (BUFSIZ - 2 < len + cli_BufferLen) {
+			if (BUFSIZ - 2 >= cli_BufferLen - cli_BufferPos + len) {
+				cli_BufferLen -= cli_BufferPos;
+				memmove(cli_Buffer, cli_Buffer + cli_BufferPos, cli_BufferLen);
+			} else
+				cli_BufferLen = 0;
+
+			cli_BufferPos = 0;
+		}
+
+		memcpy(cli_Buffer + cli_BufferLen, line, len);
+		cli_BufferLen += len;
+		cli_Buffer[cli_BufferLen++] = '\r';
+		cli_Buffer[cli_BufferLen++] = '\n';
+	}
+
+	fwrite(cli_Buffer, 1, cli_BufferLen, rl_outstream);
+	if (!cli_pending_special_char) {
+		fwrite("\r", 1, 1, rl_outstream);
+		if (*line)
+			add_history(line);
+	}
+
+	free(line);
+end:
+	rl_callback_handler_remove();
+	if (cli_pending_special_char) {
+		fwrite(&cli_pending_special_char, 1, 1, rl_outstream);
+		cli_pending_special_char = 0;
+	}
+	fflush(rl_outstream);
+}
 #endif
 
 
@@ -171,13 +243,14 @@ void cliNetInit(const char *csProg, int pty, struct te
 		t.c_lflag = TTYDEF_LFLAG;
 		t.c_iflag = TTYDEF_IFLAG;
 		t.c_oflag = TTYDEF_OFLAG;
+		t.c_cflag = TTYDEF_CFLAG;
 		cfsetspeed(&t, B9600);
 	}
 
 	t.c_lflag &= ~(ICANON | ISIG | IEXTEN | ECHO | ECHOCTL | ECHOE | ECHOK | ECHOKE | ECHONL | ECHOPRT);
-	t.c_iflag &= ~(ICRNL | BRKINT | INPCK | ISTRIP | IXON);
-	t.c_oflag &= ~OPOST;
-	t.c_cflag &= ~PARENB;
+//	t.c_iflag &= ~(ICRNL | BRKINT | INPCK | ISTRIP | IXON);
+	t.c_iflag &= ~ICRNL;
+	t.c_iflag |= IGNBRK;
 	t.c_cc[VMIN] = 1;
 	t.c_cc[VTIME] = 0;
 	tcsetattr(pty, TCSANOW, &t);
@@ -187,9 +260,8 @@ void cliNetInit(const char *csProg, int pty, struct te
 	rl_readline_name = csProg;
 	rl_variable_bind("editing-mode", "emacs");
 
-#ifdef NULL_PREP_TERM
 	rl_instream = fdopen(pty, "r");
-#endif
+	rl_outstream = NULL;
 }
 
 /*
@@ -216,21 +288,34 @@ int cliNetExec(cliCommands_t *cmdList, const char *csP
 		case 0:
 			close(sock);
 
-#ifdef NULL_PREP_TERM
-			rl_prep_term_function = cli_Null_Prep_Term;
-#endif
+//			rl_prep_term_function = cli_Null_Prep_Term;
+			rl_getc_function = cli_Net_rl_GetCh;
 
 			cliNetInit(getprogname(), STDIN_FILENO, term);
-			cliTTY(NULL, NULL, NULL, win);
-//			ret = cliExec(cmdList, csPrompt) < 0 ? 1 : 0;
+			ret = cliExec(cmdList, csPrompt) < 0 ? 1 : 0;
+			/* spawn Shell mode */
+			/*
 			execl("/bin/tcsh", "tcsh", NULL);
+			*/
 			_exit(ret);
 		default:
+			rl_prep_term_function = cli_Null_Prep_Term;
+
+			cliNetInit(getprogname(), pty, term);
+
+			/* spawn Shell mode */
+			/*
 			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);
+			*/
+			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);
@@ -283,27 +368,12 @@ int cliNetExec(cliCommands_t *cmdList, const char *csP
 				if (a)
 					free(a);
 
-				/*
-				if (s == pty && ret > 2 && 0x1b == buf[0] && 0x5b == buf[1]) {
-					memmove(buf, buf + 3, ret);
-					ret -= 3;
-				}*/
-				if ((ret = telnetSend(s, Attr, attrlen, buf, ret, 0)) == -1) {
+				if ((ret = telnetSend(s, Attr, pty == s ? 0 : attrlen, buf, ret, 0)) == -1) {
 					cli_Errno = telnet_GetErrno();
 					strlcpy(cli_Error, telnet_GetError(), STRSIZ);
 					break;
 				} else
 					flg++;
-
-				/*
-				if ((ret = read(r, &ch, 1)) < 1) {
-					if (!ret)
-						shutdown(r, SHUT_RD);
-					break;
-				}
-				if (write(s, &ch, 1) == -1) 
-					break;
-				*/
 			}
 
 			close(pty);