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.1.1.1.2.8 and 1.2.2.2

version 1.1.1.1.2.8, 2010/04/24 10:05:26	version 1.2.2.2, 2010/06/04 12:46:27
Line 11	Line 11

#pragma GCC visibility push(hidden)	#pragma GCC visibility push(hidden)

cliCommands_t cli_stdCmds[] = {	/*
	commands_t cli_stdCmds[] = {
{ "test", cli_Cmd_Unsupported, "Test - Don`t use default command structure!", "test <cr>", cli_Comp_Filename },	{ "test", cli_Cmd_Unsupported, "Test - Don`t use default command structure!", "test <cr>", cli_Comp_Filename },
{ "-------", NULL, "---------------------", NULL, NULL },	{ "-------", NULL, "---------------------", NULL, NULL },
{ "help", cli_Cmd_Help, "Help screen", "help [command] <cr>", NULL },	{ "help", cli_Cmd_Help, "Help screen", "help [command] <cr>", NULL },
{ "exit", cli_Cmd_Exit, "Exit from console", "exit <cr>", NULL },	{ "exit", cli_Cmd_Exit, "Exit from console", "exit <cr>", NULL },
{ NULL, NULL, NULL, NULL }	{ NULL, NULL, NULL, NULL }
};	};
	*/

// ------------------------------------------------	// ------------------------------------------------

Line 26 char cli_Error[STRSIZ];	Line 28 char cli_Error[STRSIZ];

#pragma GCC visibility pop	#pragma GCC visibility pop


static void cli_Null_Prep_Term(int meta)
{
}

static void cli_Null_Deprep_Term()
{
}

static int cli_Pre_Input_Change_Mode()
{
return 0;
}

static int cli_GetC(FILE *dummy)
{
int ch = rl_getc(stdin);

/*
if (is_special_char(ch)) {
pending_special_char = ch;
return '\r';
}
*/

return ch;
}


// cli_GetErrno() Get error code of last operation	// cli_GetErrno() Get error code of last operation
inline int cli_GetErrno()	inline int
	cli_GetErrno()
{	{
return cli_Errno;	return cli_Errno;
}	}

// io_GetError() Get error text of last operation	// io_GetError() Get error text of last operation
inline const char *cli_GetError()	inline const char *
	cli_GetError()
{	{
return cli_Error;	return cli_Error;
}	}

// cli_SetErr() Set error to variables for internal use!!!	// cli_SetErr() Set error to variables for internal use!!!
inline void cli_SetErr(int eno, char *estr, ...)	inline void
	cli_SetErr(int eno, char *estr, ...)
{	{
va_list lst;	va_list lst;

Line 81 inline void cli_SetErr(int eno, char *estr, ...)	Line 57 inline void cli_SetErr(int eno, char *estr, ...)

// ------------------------------------------------------------	// ------------------------------------------------------------

/*	static inline void
* cli_Printf() Printf CLI features	clrscrEOL(linebuffer_t * __restrict buf)
* @out = Output stream
* @csFormat = Printf format string
* return: -1 error, != -1 printed chars
*/
inline int cli_Printf(FILE out, const char csFormat, ...)
{	{
va_list lst;	register int i;
int ret;

va_start(lst, csFormat);	if (buf) {
	write(buf->line_out, K_CR, 1);

ret = vfprintf(out, csFormat, lst);	for (i = 0; i < buf->line_len; i++)
if (-1 == ret)	write(buf->line_out, K_SPACE, 1);
LOGERR;	}

va_end(lst);
return ret;
}	}

	static inline void
/*	printfEOL(linebuffer_t * __restrict buf, int len, int prompt)
* cliComp() Initialize completion CLI features
* @cmdComplete = Completion function
* @cmdEntry = Compentry function
* return: none
*/
inline void cliComp(cli_Completion_t cmdComplete, cli_CompEntry_t cmdEntry)
{	{
// command completon	if (buf) {
rl_attempted_completion_function = cmdComplete;	write(buf->line_out, K_CR, 1);
rl_completion_entry_function = cmdEntry;
}

/*	if (prompt && buf->line_prompt)
* cliTTY() Initialize I/O TTY CLI features	write(buf->line_out, buf->line_prompt, buf->line_bol);
* @term = terminal name
* @inp = input handle
* @out = output handle
* @win = window size
* return: -1 error, != -1 ok
*/
inline int cliTTY(const char term, FILE inp, FILE out, struct winsize win)
{
if (term)
rl_terminal_name = term;

if (inp)	write(buf->line_out, buf->line_buf, len == -1 ? buf->line_eol - buf->line_bol: len);
rl_instream = inp;	}
if (out)
rl_outstream = out;

if (win)
if (ioctl(!rl_outstream ? STDOUT_FILENO : fileno(rl_outstream), TIOCSWINSZ, win) == -1) {
LOGERR;
return -1;
}

return 0;
}	}

/*	static inline void
* cli_ReadHistory() Read CLI History from file	printfCR(linebuffer_t * __restrict buf, int prompt)
* @csFile = history file name, if NULL default history name is ".aitcli.history"
* return: -1 error; != -1 readed ok
*/
inline int cli_ReadHistory(const char *csFile)
{	{
return read_history(!csFile ? ".aitcli.history" : csFile);	if (buf) {
}	write(buf->line_out, K_CR, 1);

/*	if (prompt)
* cli_WriteHistory() Write CLI History to file	if (prompt && buf->line_prompt)
* @csFile = history file name, if NULL default history name is ".aitcli.history"	write(buf->line_out, buf->line_prompt, buf->line_bol);
* @lineNum = save number of history entry lines, if -1 all lines saved without limit	}
* return: -1 error; != -1 readed ok
*/
inline int cli_WriteHistory(const char *csFile, int lineNum)
{
int ret;
const char *psFile = !csFile ? ".aitcli.history" : csFile;

ret = write_history(psFile);
if (-1 != ret && -1 != lineNum)
history_truncate_file(psFile, lineNum);

return ret;
}	}

/*	static inline void
* cliInit() Initialize Readline	printfCLI(linebuffer_t * __restrict buf, const unsigned char *text, int textlen, int prompt)
* @csProg = program name
* return: none
*/
inline void cliInit(const char *csProg)
{	{
rl_readline_name = csProg;	if (buf && text && textlen) {
	if (prompt && buf->line_prompt)
	write(buf->line_out, buf->line_prompt, buf->line_bol);

rl_variable_bind("editing-mode", "emacs");	write(buf->line_out, text, textlen);
	}
}	}

	// ------------------------------------------------------------

/*	/*
* cliNetInit() Initialize Readline if CLI bind to socket	* cliNetInit() Initialize Readline if CLI bind to socket
* @csProg = program name	* @csProg = program name
Line 190 inline void cliInit(const char *csProg)	Line 115 inline void cliInit(const char *csProg)
* @term = stdin termios	* @term = stdin termios
* return: none	* return: none
*/	*/
	/*
void cliNetInit(const char csProg, int pty, struct termios term)	void cliNetInit(const char csProg, int pty, struct termios term)
{	{
struct termios t;	struct termios t;
	int on = 1;

if (term) {	memset(&t, 0, sizeof t);
	if (term)
t = *term;	t = *term;
// Don`t uncomment this because input chars on CLI socket console will be hidden!!!	else {
// t.c_lflag &= ~(ICANON \| ISIG \| ECHO \| ECHOCTL \| ECHOE \| ECHOK \| ECHOKE \| ECHONL \| ECHOPRT);	t.c_lflag = TTYDEF_LFLAG;
t.c_iflag &= ~ICRNL;	t.c_iflag = TTYDEF_IFLAG;
t.c_iflag \|= IGNBRK;	t.c_oflag = TTYDEF_OFLAG;
t.c_cc[VMIN] = 1;	t.c_cflag = TTYDEF_CFLAG;
t.c_cc[VTIME] = 0;	cfsetspeed(&t, B9600);
tcsetattr(pty, TCSANOW, &t);
}	}

cliInit(csProg);	t.c_lflag &= ~(ICANON \| ISIG \| IEXTEN \| ECHO \| ECHOCTL \| ECHOE \| ECHOK \| ECHOKE \| ECHONL \| ECHOPRT);
	// 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);

rl_instream = fdopen(pty, "r");	ioctl(pty, TIOCPKT, &on);

rl_prep_term_function = cli_Null_Prep_Term;	rl_readline_name = csProg;
rl_deprep_term_function = cli_Null_Deprep_Term;	rl_variable_bind("editing-mode", "emacs");
rl_pre_input_hook = cli_Pre_Input_Change_Mode;

rl_getc_function = cli_GetC;	rl_instream = fdopen(pty, "r");
	rl_outstream = NULL;
}	}
	*/
/*	/*
* cliNetExec() Execute net CLI main loop	* cliNetExec() Execute net CLI main loop
* @cmdList = Commands list	* @cmdList = Commands list
Line 226 void cliNetInit(const char *csProg, int pty, struct te	Line 158 void cliNetInit(const char *csProg, int pty, struct te
* @win = window size of tty	* @win = window size of tty
* return: -1 error, 0 = exit w/^+D, 1 done.	* return: -1 error, 0 = exit w/^+D, 1 done.
*/	*/
int cliNetExec(cliCommands_t cmdList, const char csPrompt, int sock, struct termios term, struct winsize win)	int
	cliNetExec(commands_t cmdList, const char csPrompt, int sock, struct termios term, struct winsize win)
{	{
int pty, ret = 0, r, s, alen;	int pty, ret = 0, r, s, alen, attrlen, flg;
fd_set fds;	fd_set fds;
struct timeval tv = { DEFAULT_SOCK_TIMEOUT, 0 };	struct timeval tv = { DEFAULT_SOCK_TIMEOUT, 0 };
u_char buf[BUFSIZ];	u_char buf[BUFSIZ];
struct telnetAttrs *a, Attr[3];	struct telnetAttrs *a, Attr[10];

switch (forkpty(&pty, NULL, term, win)) {	switch (forkpty(&pty, NULL, term, win)) {
case -1:	case -1:
Line 241 int cliNetExec(cliCommands_t cmdList, const char csP	Line 174 int cliNetExec(cliCommands_t cmdList, const char csP
case 0:	case 0:
close(sock);	close(sock);

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);	_exit(ret);
default:	default:
cliNetInit(getprogname(), pty, term);	/* spawn Shell mode */
	telnet_SetCmd(Attr + 0, DO, TELOPT_TTYPE);
telnet_SetCmd(Attr, DO, TELOPT_TTYPE);	telnet_SetCmd(Attr + 1, WILL, TELOPT_ECHO);
telnet_SetCmd(Attr + 1, DO, TELOPT_LINEMODE);	telnet_Set_SubOpt(Attr + 2, TELOPT_LFLOW, LFLOW_OFF, NULL, 0);
telnet_SetCmd(Attr + 2, GA, 0);	telnet_Set_SubOpt(Attr + 3, TELOPT_LFLOW, LFLOW_RESTART_XON, NULL, 0);
if ((ret = telnetSend(sock, Attr, 3, NULL, 0, 0)) == -1) {	telnet_SetCmd(Attr + 4, DO, TELOPT_LINEMODE);
	if ((ret = telnetSend(sock, Attr, 5, NULL, 0, 0)) == -1) {
cli_Errno = telnet_GetErrno();	cli_Errno = telnet_GetErrno();
strlcpy(cli_Error, telnet_GetError(), STRSIZ);	strlcpy(cli_Error, telnet_GetError(), STRSIZ);
return -1;	return -1;
}	} else
	flg = 0;

while (42) {	while (42) {
FD_ZERO(&fds);	FD_ZERO(&fds);
FD_SET(sock, &fds);	FD_SET(sock, &fds);
FD_SET(pty, &fds);	FD_SET(pty, &fds);
if (select(FD_SETSIZE, &fds, NULL, NULL, &tv) < 1)	if ((ret = select(FD_SETSIZE, &fds, NULL, NULL, &tv)) < 1) {
	if (!ret)
	cli_SetErr(ETIMEDOUT, "Client session timeout ...");

break;	break;
	}

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 ((ret = telnetRecv(r, &a, &alen, buf, BUFSIZ)) < 0) {
	if (a)
	free(a);

if (-2 == ret)	if (-2 == ret)
continue;	continue;
// EOF	// EOF
Line 278 int cliNetExec(cliCommands_t cmdList, const char csP	Line 223 int cliNetExec(cliCommands_t cmdList, const char csP
}	}
break;	break;
}	}
if ((ret = telnetSend(s, NULL, 0, buf, ret, 0)) == -1) {	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) {
cli_Errno = telnet_GetErrno();	cli_Errno = telnet_GetErrno();
strlcpy(cli_Error, telnet_GetError(), STRSIZ);	strlcpy(cli_Error, telnet_GetError(), STRSIZ);
break;	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);	close(pty);
Line 307 int cliNetExec(cliCommands_t cmdList, const char csP	Line 259 int cliNetExec(cliCommands_t cmdList, const char csP
* @csPrompt = Prompt text	* @csPrompt = Prompt text
* return: -1 error, 0 = exit w/^+D, 1 done.	* return: -1 error, 0 = exit w/^+D, 1 done.
*/	*/
	/*
int cliExec(cliCommands_t cmdList, const char csPrompt)	int cliExec(cliCommands_t cmdList, const char csPrompt)
{	{
char line, s, t, app, items[MAX_PROMPT_ITEMS];	char line, s, t, app, items[MAX_PROMPT_ITEMS];
Line 356 int cliExec(cliCommands_t cmdList, const char csProm	Line 309 int cliExec(cliCommands_t cmdList, const char csProm
{	{
return NULL;	return NULL;
}	}
	*/
/* --- main body of CLI --- */	/* --- main body of CLI --- */
	/*
out = rl_outstream;	out = rl_outstream;
if (!out)	if (!out)
out = stdout;	out = stdout;
Line 387 int cliExec(cliCommands_t cmdList, const char csProm	Line 340 int cliExec(cliCommands_t cmdList, const char csProm
for (app = items; app < items + MAX_PROMPT_ITEMS - 1 && (*app = strsep(&s, " \t"));	for (app = items; app < items + MAX_PROMPT_ITEMS - 1 && (*app = strsep(&s, " \t"));
*app ? app++ : app);	*app ? app++ : app);

/*
for (i = 0; i < MAX_PROMPT_ITEMS; i++)
cli_Printf(out, "i=%d %s\n", i, items[i]);
*/

// exec_cmd ...	// exec_cmd ...
for (cmd = NULL, i = 0; cmdList[i].cmd_name; i++)	for (cmd = NULL, i = 0; cmdList[i].cmd_name; i++)
if (*items[0] && !strncmp(cmdList[i].cmd_name, items[0], strlen(items[0]))) {	if (*items[0] && !strncmp(cmdList[i].cmd_name, items[0], strlen(items[0]))) {
Line 410 int cliExec(cliCommands_t cmdList, const char csProm	Line 358 int cliExec(cliCommands_t cmdList, const char csProm

return ret;	return ret;
}	}
	*/

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

Removed from v.1.1.1.1.2.8
changed lines
	Added in v.1.2.2.2