libaitcli/src/aitcli.c - diff

Return to aitcli.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / libaitcli / src

Diff for /libaitcli/src/aitcli.c between versions 1.2.2.15 and 1.3.2.3

version 1.2.2.15, 2010/06/08 08:43:47	version 1.3.2.3, 2011/05/29 22:48:23
Line 5	Line 5
* $Author$	* $Author$
* $Id$	* $Id$
*	*
*************************************************************************/	**************************************************************************
	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 <info@elwix.org>

	Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
	by Michael Pounov <misho@elwix.org>. 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 <misho@elwix.org>
	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 "global.h"
#include "cli.h"	#include "cli.h"

Line 507 cli_Printf(linebuffer_t * __restrict buffer, char *fmt	Line 544 cli_Printf(linebuffer_t * __restrict buffer, char *fmt
inline void	inline void
cli_PrintHelp(linebuffer_t * __restrict buffer)	cli_PrintHelp(linebuffer_t * __restrict buffer)
{	{
if (buffer)	if (buffer) {
bufHelp(0, buffer);	bufHelp(0, buffer);
else	clrscrEOL(buffer);
	} else
cli_SetErr(EINVAL, "Error:: invalid input parameters ...");	cli_SetErr(EINVAL, "Error:: invalid input parameters ...");
}	}

Line 906 cliInit(int fin, int fout, const char *prompt)	Line 944 cliInit(int fin, int fout, const char *prompt)
linebuffer_t *buffer;	linebuffer_t *buffer;
bindkey_t *keys;	bindkey_t *keys;
register int i;	register int i;
struct termios t;

memset(&t, 0, sizeof t);
/* init buffer */	/* init buffer */
buffer = malloc(sizeof (linebuffer_t));	buffer = malloc(sizeof(linebuffer_t));
if (!buffer) {	if (!buffer) {
LOGERR;	LOGERR;
return NULL;	return NULL;
Line 1148 cliInit(int fin, int fout, const char *prompt)	Line 1184 cliInit(int fin, int fout, const char *prompt)
memcpy(keys[i].key_ch, K_F12, keys[i].key_len);	memcpy(keys[i].key_ch, K_F12, keys[i].key_len);
i++;	i++;

	buffer->line_keys = keys;
	return buffer;
	}

	/*
	* cliInitLine() Init CLI input line terminal
	* @buffer = CLI buffer
	* return: none
	*/
	int
	cliInitLine(linebuffer_t * __restrict buffer)
	{
	struct termios t;

	memset(&t, 0, sizeof t);
tcgetattr(buffer->line_in, &t);	tcgetattr(buffer->line_in, &t);
t.c_lflag &= ~(ICANON \| ISIG \| IEXTEN \| ECHO \| ECHOCTL \| ECHOE \| ECHOK \| ECHOKE \| ECHONL \| ECHOPRT);	t.c_lflag &= ~(ICANON \| ISIG \| IEXTEN \| ECHO \| ECHOCTL \| ECHOE \| ECHOK \| ECHOKE \| ECHONL \| ECHOPRT);
t.c_iflag \|= IGNBRK;	t.c_iflag \|= IGNBRK;
t.c_cc[VMIN] = 1;	t.c_cc[VMIN] = 1;
t.c_cc[VTIME] = 0;	t.c_cc[VTIME] = 0;
tcsetattr(buffer->line_in, TCSANOW, &t);	return tcsetattr(buffer->line_in, TCSANOW, &t);

buffer->line_keys = keys;
return buffer;
}	}

/*	/*
Line 1238 recheck:	Line 1286 recheck:
* @buffer = CLI buffer	* @buffer = CLI buffer
* @csHistFile = History file name	* @csHistFile = History file name
* @sock = client socket	* @sock = client socket
* @term = stdin termios
* @win = window size of tty
* return: RETCODE_ERR error, RETCODE_OK ok	* return: RETCODE_ERR error, RETCODE_OK ok
*/	*/
int	int
cliNetLoop(linebuffer_t * __restrict buffer, const char *csHistFile, int sock,	cliNetLoop(linebuffer_t * __restrict buffer, const char *csHistFile, int sock)
struct termios term, struct winsize win)
{	{
u_char buf[BUFSIZ];	u_char buf[BUFSIZ];
int pty, r, s, alen, attrlen, flg, ret = 0;	int pid, stat, pty, r, s, alen, flg, attrlen = 0, ret = 0;
fd_set fds;	fd_set fds;
struct timeval tv = { DEFAULT_SOCK_TIMEOUT, 0 };	struct timeval tv = { DEFAULT_SOCK_TIMEOUT, 0 };
struct telnetAttrs *a, Attr[10];	struct telnetAttrs *a, Attr[10];

switch (forkpty(&pty, NULL, term, win)) {	switch ((pid = forkpty(&pty, NULL, NULL, NULL))) {
case -1:	case -1:
LOGERR;	LOGERR;
return -1;	return -1;
case 0:	case 0:
close(sock);	if (!buffer) {

if (buffer)
ret = cliLoop(buffer, csHistFile) < 0 ? 1 : 0;
else
cli_SetErr(EINVAL, "Error:: invalid input parameters ...");	cli_SetErr(EINVAL, "Error:: invalid input parameters ...");
	return -1;
	} else
	close(sock);

/* spawn Shell mode */	ret = cliLoop(buffer, csHistFile) < 0 ? 1 : 0;
/*	cliEnd(buffer);
execl("/bin/tcsh", "tcsh", NULL);
*/

_exit(ret);	exit(ret);
default:	default:
/* spawn Shell mode */	cli_telnet_SetCmd(Attr + 0, DO, TELOPT_TTYPE);
telnet_SetCmd(Attr + 0, DO, TELOPT_TTYPE);	cli_telnet_SetCmd(Attr + 1, WILL, TELOPT_ECHO);
telnet_SetCmd(Attr + 1, WILL, TELOPT_ECHO);	cli_telnet_Set_SubOpt(Attr + 2, TELOPT_LFLOW, LFLOW_OFF, NULL, 0);
telnet_Set_SubOpt(Attr + 2, TELOPT_LFLOW, LFLOW_OFF, NULL, 0);	cli_telnet_Set_SubOpt(Attr + 3, TELOPT_LFLOW, LFLOW_RESTART_XON, NULL, 0);
telnet_Set_SubOpt(Attr + 3, TELOPT_LFLOW, LFLOW_RESTART_XON, NULL, 0);	cli_telnet_SetCmd(Attr + 4, DO, TELOPT_LINEMODE);
telnet_SetCmd(Attr + 4, DO, TELOPT_LINEMODE);	if ((ret = cli_telnetSend(sock, Attr, 5, NULL, 0, 0)) == -1)
if ((ret = telnetSend(sock, Attr, 5, NULL, 0, 0)) == -1) {
cli_Errno = telnet_GetErrno();
strlcpy(cli_Error, telnet_GetError(), STRSIZ);
return -1;	return -1;
} else	else
flg = 0;	flg = 0;

while (42) {	while (42) {
	if (waitpid(pid, &stat, WNOHANG))
	break;

FD_ZERO(&fds);	FD_ZERO(&fds);
FD_SET(sock, &fds);	FD_SET(sock, &fds);
FD_SET(pty, &fds);	FD_SET(pty, &fds);
Line 1298 cliNetLoop(linebuffer_t * __restrict buffer, const cha	Line 1340 cliNetLoop(linebuffer_t * __restrict buffer, const cha
r = FD_ISSET(sock, &fds) ? sock : pty;	r = FD_ISSET(sock, &fds) ? sock : pty;
s = FD_ISSET(sock, &fds) ? pty : sock;	s = FD_ISSET(sock, &fds) ? pty : sock;

if ((ret = telnetRecv(r, &a, &alen, buf, BUFSIZ)) < 0) {	if (FD_ISSET(sock, &fds)) {
	memset(buf, 0, BUFSIZ);
	if ((ret = cli_telnetRecv(sock, &a, &alen, buf, BUFSIZ)) < 0) {
	if (a)
	free(a);

	if (-2 == ret)
	continue;
	// EOF
	if (-3 == ret)
	shutdown(sock, SHUT_RD);
	break;
	}
	attrlen = 0;
	if (1 == flg && alen) {
	cli_telnet_SetCmd(&Attr[attrlen++], DONT, TELOPT_SGA);
	cli_telnet_SetCmd(&Attr[attrlen++], DO, TELOPT_ECHO);
	}
	if (2 == flg && alen) {
	cli_telnet_SetCmd(&Attr[attrlen++], WILL, TELOPT_ECHO);
	cli_telnet_Set_SubOpt(&Attr[attrlen++], TELOPT_LFLOW,
	LFLOW_OFF, NULL, 0);
	cli_telnet_Set_SubOpt(&Attr[attrlen++], TELOPT_LFLOW,
	LFLOW_RESTART_XON, NULL, 0);
	cli_telnet_SetCmd(&Attr[attrlen++], DONT, TELOPT_LINEMODE);
	}
if (a)	if (a)
free(a);	free(a);

if (-2 == ret)	if ((ret = write(pty, buf, ret)) == -1) {
continue;	LOGERR;
// EOF	break;
if (-3 == ret)
shutdown(r, 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);
}
if (2 == flg && alen) {
telnet_SetCmd(&Attr[attrlen++], WILL, TELOPT_ECHO);
telnet_Set_SubOpt(&Attr[attrlen++], TELOPT_LFLOW,
LFLOW_OFF, NULL, 0);
telnet_Set_SubOpt(&Attr[attrlen++], TELOPT_LFLOW,
LFLOW_RESTART_XON, NULL, 0);
telnet_SetCmd(&Attr[attrlen++], DONT, TELOPT_LINEMODE);
}
if (a)
free(a);

if ((ret = telnetSend(s, Attr, pty == s ? 0 : attrlen, buf, ret, 0)) == -1) {	if (FD_ISSET(pty, &fds)) {
cli_Errno = telnet_GetErrno();	memset(buf, 0, BUFSIZ);
strlcpy(cli_Error, telnet_GetError(), STRSIZ);	if ((ret = read(pty, buf, BUFSIZ)) == -1) {
break;	LOGERR;
} else	break;
flg++;	}

	if ((ret = cli_telnetSend(sock, Attr, pty == s ? 0 : attrlen,
	buf, ret, 0)) == -1)
	break;
	else
	flg++;
	}
}	}

close(pty);	close(pty);
Line 1358 cliLoop(linebuffer_t * __restrict buffer, const char *	Line 1411 cliLoop(linebuffer_t * __restrict buffer, const char *
struct tagCommand *cmd;	struct tagCommand *cmd;

/* --- main body of CLI --- */	/* --- main body of CLI --- */
	cliInitLine(buffer);

if (cli_loadHistory(buffer, csHistFile) == RETCODE_ERR)	if (cli_loadHistory(buffer, csHistFile) == RETCODE_ERR)
return RETCODE_ERR;	return RETCODE_ERR;
Line 1370 cliLoop(linebuffer_t * __restrict buffer, const char *	Line 1424 cliLoop(linebuffer_t * __restrict buffer, const char *
} else	} else
cli_addHistory(buffer, NULL);	cli_addHistory(buffer, NULL);
// clear whitespaces	// clear whitespaces
for (s = line; isspace(*s); s++);	for (s = line; isspace((int) *s); s++);
if (*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;	*++t = 0;
}	}

Line 1394 cliLoop(linebuffer_t * __restrict buffer, const char *	Line 1448 cliLoop(linebuffer_t * __restrict buffer, const char *
cli_Printf(buffer, "\nCommand '%s' not found!\n", items[0]);	cli_Printf(buffer, "\nCommand '%s' not found!\n", items[0]);
ret = -1;	ret = -1;
} else	} else
if (cmd->cmd_func)	if (cmd->cmd_func) {
	cli_Printf(buffer, "\n");
ret = cmd->cmd_func(buffer, i, items);	ret = cmd->cmd_func(buffer, i, items);
else {	} else {
clrscrEOL(buffer);	clrscrEOL(buffer);
printfCR(buffer, 1);	printfCR(buffer, 1);
}	}

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.2.2.15
changed lines
	Added in v.1.3.2.3