--- libaitcli/src/aitcli.c 2011/03/16 17:24:03 1.3 +++ libaitcli/src/aitcli.c 2011/05/29 22:49:25 1.4 @@ -3,9 +3,46 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitcli.c,v 1.3 2011/03/16 17:24:03 misho Exp $ +* $Id: aitcli.c,v 1.4 2011/05/29 22:49:25 misho Exp $ * -*************************************************************************/ +************************************************************************** +The ELWIX and AITNET software is distributed under the following +terms: + +All of the documentation and software included in the ELWIX and AITNET +Releases is copyrighted by ELWIX - Sofia/Bulgaria + +Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 + by Michael Pounov . All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3. All advertising materials mentioning features or use of this software + must display the following acknowledgement: +This product includes software developed by Michael Pounov +ELWIX - Embedded LightWeight unIX and its contributors. +4. Neither the name of AITNET nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY AITNET AND CONTRIBUTORS ``AS IS'' AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. +*/ #include "global.h" #include "cli.h" @@ -1276,16 +1313,14 @@ cliNetLoop(linebuffer_t * __restrict buffer, const cha 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) { @@ -1307,7 +1342,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); @@ -1316,24 +1351,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); @@ -1351,11 +1382,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++; } } @@ -1394,9 +1424,9 @@ cliLoop(linebuffer_t * __restrict buffer, const char * } else cli_addHistory(buffer, NULL); // clear whitespaces - for (s = line; isspace(*s); s++); + for (s = line; isspace((int) *s); s++); if (*s) { - for (t = s + strlen(s) - 1; t > s && isspace(*t); t--); + for (t = s + strlen(s) - 1; t > s && isspace((int) *t); t--); *++t = 0; }