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.19 and 1.4.2.2

version 1.2.2.19, 2010/12/07 15:15:34	version 1.4.2.2, 2012/07/22 22:36:21
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, 2012
	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 374 bufComp(int idx, void * __restrict buffer)	Line 411 bufComp(int idx, void * __restrict buffer)
if (!buffer \|\| idx < 0 \|\| idx > MAX_BINDKEY)	if (!buffer \|\| idx < 0 \|\| idx > MAX_BINDKEY)
return RETCODE_ERR;	return RETCODE_ERR;

str = strdup(buf->line_buf);	str = io_strdup(buf->line_buf);
if (!str)	if (!str)
return RETCODE_ERR;	return RETCODE_ERR;
else {	else {
s = str;	s = str;
io_TrimStr((u_char*) s);	io_TrimStr(s);
}	}

i = j = 0;	i = j = 0;
Line 451 bufComp(int idx, void * __restrict buffer)	Line 488 bufComp(int idx, void * __restrict buffer)
}	}

endcomp:	endcomp:
free(str);	io_free(str);
return ret;	return ret;
}	}

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 562 cli_addCommand(linebuffer_t * __restrict buffer, const	Line 600 cli_addCommand(linebuffer_t * __restrict buffer, const
return RETCODE_ERR;	return RETCODE_ERR;
}	}

cmd = malloc(sizeof(struct tagCommand));	cmd = io_malloc(sizeof(struct tagCommand));
if (!cmd) {	if (!cmd) {
LOGERR;	LOGERR;
return RETCODE_ERR;	return RETCODE_ERR;
Line 602 cli_delCommand(linebuffer_t * __restrict buffer, const	Line 640 cli_delCommand(linebuffer_t * __restrict buffer, const
if (cmd->cmd_level == cliLevel && !strcmp(cmd->cmd_name, csCmd)) {	if (cmd->cmd_level == cliLevel && !strcmp(cmd->cmd_name, csCmd)) {
ret = 1;	ret = 1;
SLIST_REMOVE(&buffer->line_cmds, cmd, tagCommand, cmd_next);	SLIST_REMOVE(&buffer->line_cmds, cmd, tagCommand, cmd_next);
free(cmd);	io_free(cmd);
break;	break;
}	}

Line 665 cli_addHistory(linebuffer_t * __restrict buffer, const	Line 703 cli_addHistory(linebuffer_t * __restrict buffer, const
return RETCODE_ERR;	return RETCODE_ERR;
}	}

if (!(h = malloc(sizeof(struct tagHistory)))) {	if (!(h = io_malloc(sizeof(struct tagHistory)))) {
LOGERR;	LOGERR;
return RETCODE_ERR;	return RETCODE_ERR;
} else	} else
Line 673 cli_addHistory(linebuffer_t * __restrict buffer, const	Line 711 cli_addHistory(linebuffer_t * __restrict buffer, const

if (str) {	if (str) {
if (!*str) {	if (!*str) {
free(h);	io_free(h);
return RETCODE_OK;	return RETCODE_OK;
}	}

h->hist_len = strlcpy(h->hist_line, str, BUFSIZ);	h->hist_len = strlcpy(h->hist_line, str, BUFSIZ);
} else {	} else {
if (!*buffer->line_buf \|\| buffer->line_len < 2) {	if (!*buffer->line_buf \|\| buffer->line_len < 2) {
free(h);	io_free(h);
return RETCODE_OK;	return RETCODE_OK;
}	}

memcpy(h->hist_line, buffer->line_buf, (h->hist_len = buffer->line_len));	memcpy(h->hist_line, buffer->line_buf, (h->hist_len = buffer->line_len));
io_TrimStr((u_char*) h->hist_line);	io_TrimStr(h->hist_line);
h->hist_len = strlen(h->hist_line);	h->hist_len = strlen(h->hist_line);
}	}

Line 769 cli_loadHistory(linebuffer_t * __restrict buffer, cons	Line 807 cli_loadHistory(linebuffer_t * __restrict buffer, cons
if (!buf \|\| buf == '#')	if (!buf \|\| buf == '#')
continue;	continue;
else	else
io_TrimStr((u_char*) buf);	io_TrimStr(buf);

if (!(h = malloc(sizeof(struct tagHistory)))) {	if (!(h = io_malloc(sizeof(struct tagHistory)))) {
LOGERR;	LOGERR;
fclose(f);	fclose(f);
return RETCODE_ERR;	return RETCODE_ERR;
Line 811 cli_freeLine(linebuffer_t * __restrict buffer)	Line 849 cli_freeLine(linebuffer_t * __restrict buffer)

if (buffer) {	if (buffer) {
if (buffer->line_buf)	if (buffer->line_buf)
free(buffer->line_buf);	io_free(buffer->line_buf);

buffer->line_buf = malloc(BUFSIZ);	buffer->line_buf = io_malloc(BUFSIZ);
if (buffer->line_buf) {	if (buffer->line_buf) {
memset(buffer->line_buf, 0, BUFSIZ);	memset(buffer->line_buf, 0, BUFSIZ);
buffer->line_eol = buffer->line_bol;	buffer->line_eol = buffer->line_bol;
Line 839 cli_setPrompt(linebuffer_t * __restrict buffer, const	Line 877 cli_setPrompt(linebuffer_t * __restrict buffer, const
{	{
if (buffer) {	if (buffer) {
if (buffer->line_prompt) {	if (buffer->line_prompt) {
free(buffer->line_prompt);	io_free(buffer->line_prompt);
buffer->line_prompt = NULL;	buffer->line_prompt = NULL;
buffer->line_bol = 0;	buffer->line_bol = 0;
}	}

if (prompt) {	if (prompt) {
buffer->line_prompt = strdup(prompt);	buffer->line_prompt = io_strdup(prompt);
if (buffer->line_prompt) {	if (buffer->line_prompt) {
buffer->line_bol = strlen(buffer->line_prompt);	buffer->line_bol = strlen(buffer->line_prompt);
buffer->line_eol = buffer->line_bol;	buffer->line_eol = buffer->line_bol;
Line 872 cliEnd(linebuffer_t * __restrict buffer)	Line 910 cliEnd(linebuffer_t * __restrict buffer)
if (buffer) {	if (buffer) {
while ((c = SLIST_FIRST(&buffer->line_cmds))) {	while ((c = SLIST_FIRST(&buffer->line_cmds))) {
SLIST_REMOVE_HEAD(&buffer->line_cmds, cmd_next);	SLIST_REMOVE_HEAD(&buffer->line_cmds, cmd_next);
free(c);	io_free(c);
}	}
while ((h = TAILQ_FIRST(&buffer->line_history))) {	while ((h = TAILQ_FIRST(&buffer->line_history))) {
TAILQ_REMOVE(&buffer->line_history, h, hist_next);	TAILQ_REMOVE(&buffer->line_history, h, hist_next);
free(h);	io_free(h);
}	}

if (buffer->line_prompt)	if (buffer->line_prompt)
free(buffer->line_prompt);	io_free(buffer->line_prompt);

if (buffer->line_keys)	if (buffer->line_keys)
free(buffer->line_keys);	io_free(buffer->line_keys);
if (buffer->line_buf)	if (buffer->line_buf)
free(buffer->line_buf);	io_free(buffer->line_buf);

free(buffer);	io_free(buffer);
buffer = NULL;	buffer = NULL;
} else	} else
cli_SetErr(EINVAL, "Error:: invalid input parameters ...");	cli_SetErr(EINVAL, "Error:: invalid input parameters ...");
Line 908 cliInit(int fin, int fout, const char *prompt)	Line 946 cliInit(int fin, int fout, const char *prompt)
register int i;	register int i;

/* init buffer */	/* init buffer */
buffer = malloc(sizeof(linebuffer_t));	buffer = io_malloc(sizeof(linebuffer_t));
if (!buffer) {	if (!buffer) {
LOGERR;	LOGERR;
return NULL;	return NULL;
Line 922 cliInit(int fin, int fout, const char *prompt)	Line 960 cliInit(int fin, int fout, const char *prompt)
SLIST_INIT(&buffer->line_cmds);	SLIST_INIT(&buffer->line_cmds);

if (prompt) {	if (prompt) {
buffer->line_prompt = strdup(prompt);	buffer->line_prompt = io_strdup(prompt);
if (!buffer->line_prompt) {	if (!buffer->line_prompt) {
LOGERR;	LOGERR;
free(buffer);	io_free(buffer);
return NULL;	return NULL;
} else	} else
buffer->line_eol = buffer->line_bol = strlen(buffer->line_prompt);	buffer->line_eol = buffer->line_bol = strlen(buffer->line_prompt);
}	}
}	}
buffer->line_buf = malloc(BUFSIZ);	buffer->line_buf = io_malloc(BUFSIZ);
if (!buffer->line_buf) {	if (!buffer->line_buf) {
LOGERR;	LOGERR;
if (buffer->line_prompt)	if (buffer->line_prompt)
free(buffer->line_prompt);	io_free(buffer->line_prompt);
free(buffer);	io_free(buffer);
return NULL;	return NULL;
} else {	} else {
memset(buffer->line_buf, 0, BUFSIZ);	memset(buffer->line_buf, 0, BUFSIZ);
buffer->line_len = 1 + buffer->line_eol;	buffer->line_len = 1 + buffer->line_eol;
}	}
keys = calloc(MAX_BINDKEY + 1, sizeof(bindkey_t));	keys = io_calloc(MAX_BINDKEY + 1, sizeof(bindkey_t));
if (!keys) {	if (!keys) {
LOGERR;	LOGERR;
if (buffer->line_prompt)	if (buffer->line_prompt)
free(buffer->line_prompt);	io_free(buffer->line_prompt);
free(buffer->line_buf);	io_free(buffer->line_buf);
free(buffer);	io_free(buffer);
return NULL;	return NULL;
} else	} else
memset(keys, 0, sizeof(bindkey_t) * (MAX_BINDKEY + 1));	memset(keys, 0, sizeof(bindkey_t) * (MAX_BINDKEY + 1));
Line 1172 cliInitLine(linebuffer_t * __restrict buffer)	Line 1210 cliInitLine(linebuffer_t * __restrict buffer)
/*	/*
* cliReadLine() Read line from opened CLI session	* cliReadLine() Read line from opened CLI session
* @buffer = CLI buffer	* @buffer = CLI buffer
* return: NULL if error or !=NULL readed line, must be free after use!	* return: NULL if error or !=NULL readed line, must be io_free after use!
*/	*/
char *	char *
cliReadLine(linebuffer_t * __restrict buffer)	cliReadLine(linebuffer_t * __restrict buffer)
Line 1206 cliReadLine(linebuffer_t * __restrict buffer)	Line 1244 cliReadLine(linebuffer_t * __restrict buffer)
}	}
if (!readLen) {	if (!readLen) {
if (buffer->line_buf)	if (buffer->line_buf)
str = strdup(buffer->line_buf);	str = io_strdup(buffer->line_buf);
else	else
cli_SetErr(EPIPE, "Error:: unknown state ...");	cli_SetErr(EPIPE, "Error:: unknown state ...");
return str;	return str;
Line 1238 recheck:	Line 1276 recheck:
}	}

if (code != RETCODE_ERR && code != RETCODE_EOF && buffer->line_buf)	if (code != RETCODE_ERR && code != RETCODE_EOF && buffer->line_buf)
str = strdup(buffer->line_buf);	str = io_strdup(buffer->line_buf);
return str;	return str;
}	}

Line 1254 int	Line 1292 int
cliNetLoop(linebuffer_t * __restrict buffer, const char *csHistFile, int sock)	cliNetLoop(linebuffer_t * __restrict buffer, const char *csHistFile, int sock)
{	{
u_char buf[BUFSIZ];	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;	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, NULL, NULL)) {	switch ((pid = forkpty(&pty, NULL, NULL, NULL))) {
case -1:	case -1:
LOGERR;	LOGERR;
return -1;	return -1;
Line 1275 cliNetLoop(linebuffer_t * __restrict buffer, const cha	Line 1313 cliNetLoop(linebuffer_t * __restrict buffer, const cha

exit(ret);	exit(ret);
default:	default:
telnet_SetCmd(Attr + 0, DO, TELOPT_TTYPE);	cli_telnet_SetCmd(Attr + 0, DO, TELOPT_TTYPE);
telnet_SetCmd(Attr + 1, WILL, TELOPT_ECHO);	cli_telnet_SetCmd(Attr + 1, WILL, TELOPT_ECHO);
telnet_Set_SubOpt(Attr + 2, TELOPT_LFLOW, LFLOW_OFF, NULL, 0);	cli_telnet_Set_SubOpt(Attr + 2, TELOPT_LFLOW, LFLOW_OFF, NULL, 0);
telnet_Set_SubOpt(Attr + 3, TELOPT_LFLOW, LFLOW_RESTART_XON, NULL, 0);	cli_telnet_Set_SubOpt(Attr + 3, TELOPT_LFLOW, LFLOW_RESTART_XON, NULL, 0);
telnet_SetCmd(Attr + 4, DO, TELOPT_LINEMODE);	cli_telnet_SetCmd(Attr + 4, DO, TELOPT_LINEMODE);
if ((ret = telnetSend(sock, Attr, 5, NULL, 0, 0)) == -1) {	if ((ret = cli_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 1303 cliNetLoop(linebuffer_t * __restrict buffer, const cha	Line 1342 cliNetLoop(linebuffer_t * __restrict buffer, const cha

if (FD_ISSET(sock, &fds)) {	if (FD_ISSET(sock, &fds)) {
memset(buf, 0, BUFSIZ);	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)	if (a)
free(a);	io_free(a);

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

if ((ret = write(pty, buf, ret)) == -1) {	if ((ret = write(pty, buf, ret)) == -1) {
LOGERR;	LOGERR;
Line 1347 cliNetLoop(linebuffer_t * __restrict buffer, const cha	Line 1382 cliNetLoop(linebuffer_t * __restrict buffer, const cha
break;	break;
}	}

if ((ret = telnetSend(sock, Attr, pty == s ? 0 : attrlen, buf, ret, 0)) == -1) {	if ((ret = cli_telnetSend(sock, Attr, pty == s ? 0 : attrlen,
cli_Errno = telnet_GetErrno();	buf, ret, 0)) == -1)
strlcpy(cli_Error, telnet_GetError(), STRSIZ);
break;	break;
} else	else
flg++;	flg++;
}	}
}	}
Line 1390 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 1414 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);
}	}
Line 1424 cliLoop(linebuffer_t * __restrict buffer, const char *	Line 1459 cliLoop(linebuffer_t * __restrict buffer, const char *

cli_freeLine(buffer);	cli_freeLine(buffer);
cli_resetHistory(buffer);	cli_resetHistory(buffer);
free(line);	io_free(line);
} while (ret < 1);	} while (ret < 1);

cli_saveHistory(buffer, csHistFile, HISTORY_LINES);	cli_saveHistory(buffer, csHistFile, HISTORY_LINES);

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

Removed from v.1.2.2.19
changed lines
	Added in v.1.4.2.2