--- libaitcli/src/aitcli.c 2010/06/07 16:16:12 1.2.2.12 +++ libaitcli/src/aitcli.c 2013/05/26 20:36:41 1.5.4.3 @@ -3,46 +3,81 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitcli.c,v 1.2.2.12 2010/06/07 16:16:12 misho Exp $ +* $Id: aitcli.c,v 1.5.4.3 2013/05/26 20:36:41 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, 2012, 2013 + 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" #pragma GCC visibility push(hidden) -// ------------------------------------------------ - int cli_Errno; char cli_Error[STRSIZ]; #pragma GCC visibility pop // cli_GetErrno() Get error code of last operation -inline int +int cli_GetErrno() { return cli_Errno; } -// io_GetError() Get error text of last operation -inline const char * +// cli_GetError() Get error text of last operation +const char * cli_GetError() { return cli_Error; } // cli_SetErr() Set error to variables for internal use!!! -inline void +void cli_SetErr(int eno, char *estr, ...) { va_list lst; cli_Errno = eno; - memset(cli_Error, 0, STRSIZ); + memset(cli_Error, 0, sizeof cli_Error); va_start(lst, estr); - vsnprintf(cli_Error, STRSIZ, estr, lst); + vsnprintf(cli_Error, sizeof cli_Error, estr, lst); va_end(lst); } @@ -374,12 +409,12 @@ bufComp(int idx, void * __restrict buffer) if (!buffer || idx < 0 || idx > MAX_BINDKEY) return RETCODE_ERR; - str = strdup(buf->line_buf); + str = e_strdup(buf->line_buf); if (!str) return RETCODE_ERR; else { s = str; - io_TrimStr((u_char*) s); + str_Trim(s); } i = j = 0; @@ -391,20 +426,22 @@ bufComp(int idx, void * __restrict buffer) *app ? i++ : i, *app ? app++ : app); if (i) { - SLIST_FOREACH(cmd, &buf->line_cmds, cmd_next) + SLIST_FOREACH(cmd, &buf->line_cmds, cmd_next) { if (cmd->cmd_level == buf->line_level && !strncmp(cmd->cmd_name, items[0], strlen(items[0]))) { - j++; - c = cmd; - strlcat(szLine, " ", STRSIZ); - strlcat(szLine, cmd->cmd_name, STRSIZ); + if (strncmp(cmd->cmd_name, CLI_CMD_SEP, strlen(CLI_CMD_SEP))) { + j++; + c = cmd; + strlcat(szLine, " ", STRSIZ); + strlcat(szLine, cmd->cmd_name, STRSIZ); + } } + } - printf("i=%d j=%d c=%p name=%s comp=%p\n", i, j, c, c->cmd_name, c->cmd_comp); - if (i > 1 && j == 1 && c && c->cmd_comp) { - /* we are on argument of command and has complition callback */ - printf("ima comp!\n"); - goto endcomp; + if (i > 1 && c) { + /* we are on argument of command and has complition info */ + j++; // always must be j > 1 ;) for arguments + strlcpy(szLine, c->cmd_info, STRSIZ); } } else { /* we have valid char but i == 0, this case is illegal */ @@ -415,10 +452,12 @@ bufComp(int idx, void * __restrict buffer) /* we on 0 position of prompt, show commands for this level */ SLIST_FOREACH(cmd, &buf->line_cmds, cmd_next) { if (cmd->cmd_level == buf->line_level) - j++; - c = cmd; - strlcat(szLine, " ", STRSIZ); - strlcat(szLine, cmd->cmd_name, STRSIZ); + if (strncmp(cmd->cmd_name, CLI_CMD_SEP, strlen(CLI_CMD_SEP))) { + j++; + c = cmd; + strlcat(szLine, " ", STRSIZ); + strlcat(szLine, cmd->cmd_name, STRSIZ); + } } } @@ -427,6 +466,8 @@ bufComp(int idx, void * __restrict buffer) printfNL(buf, 0); write(buf->line_out, szLine, strlen(szLine)); printfNL(buf, 1); + printfEOL(buf, buf->line_len - 1, 1); + printfEOL(buf, -1, 1); } if (j == 1 && c) { clrscrEOL(buf); @@ -445,7 +486,7 @@ bufComp(int idx, void * __restrict buffer) } endcomp: - free(str); + e_free(str); return ret; } @@ -458,20 +499,22 @@ bufHelp(int idx, void * __restrict buffer) return RETCODE_ERR; cli_Cmd_Help(buf, -1, NULL); - printfCR(buf, 1); + + printfEOL(buf, buf->line_len - 1, 1); + printfEOL(buf, -1, 1); return RETCODE_OK; } -// --------------------------------------------------------------- /* - * cli_Printf() Send message to CLI session + * cli_Printf() - Send message to CLI session + * * @buffer = CLI buffer * @fmt = printf format string * @... = arguments defined in fmt * return: none */ -inline void +void cli_Printf(linebuffer_t * __restrict buffer, char *fmt, ...) { va_list lst; @@ -488,11 +531,29 @@ cli_Printf(linebuffer_t * __restrict buffer, char *fmt vfprintf(f, fmt, lst); va_end(lst); } else - cli_SetErr(EINVAL, "Error:: invalid input parameters ..."); + cli_SetErr(EINVAL, "Invalid input parameters ..."); } /* - * cli_BindKey() Bind function to key + * cli_PrintHelp() - Print help screen + * + * @buffer = CLI buffer + * return: none +*/ +void +cli_PrintHelp(linebuffer_t * __restrict buffer) +{ + if (buffer) { + bufHelp(0, buffer); + clrscrEOL(buffer); + } else + cli_SetErr(EINVAL, "Invalid input parameters ..."); +} + + +/* + * cli_BindKey() - Bind function to key + * * @key = key structure * @buffer = CLI buffer * return: RETCODE_ERR error, RETCODE_OK ok, >0 bind at position @@ -503,7 +564,7 @@ cli_BindKey(bindkey_t * __restrict key, linebuffer_t * register int i; if (!key || !buffer) { - cli_SetErr(EINVAL, "Error:: invalid input parameters ..."); + cli_SetErr(EINVAL, "Invalid input parameters ..."); return RETCODE_ERR; } @@ -519,28 +580,28 @@ cli_BindKey(bindkey_t * __restrict key, linebuffer_t * /* - * cli_addCommand() Add command to CLI session + * cli_addCommand() - Add command to CLI session + * * @buffer = CLI buffer * @csCmd = Command name * @cliLevel = Level in CLI, -1 unprivi(view from all), 0 main config, 1 sub config ... * @funcCmd = Callback function when user call command * @csInfo = Inline information for command * @csHelp = Help line when call help - * @anComp = Completion array terminated with NULL element, -1 complete commands, NULL nothing * return: RETCODE_ERR error, RETCODE_OK ok */ int cli_addCommand(linebuffer_t * __restrict buffer, const char *csCmd, int cliLevel, cmd_func_t funcCmd, - const char *csInfo, const char *csHelp, const char **anComp) + const char *csInfo, const char *csHelp) { struct tagCommand *cmd; - if (!buffer || !csCmd || !funcCmd) { - cli_SetErr(EINVAL, "Error:: invalid input parameters ..."); + if (!buffer || !csCmd) { + cli_SetErr(EINVAL, "Invalid input parameters ..."); return RETCODE_ERR; } - cmd = malloc(sizeof(struct tagCommand)); + cmd = e_malloc(sizeof(struct tagCommand)); if (!cmd) { LOGERR; return RETCODE_ERR; @@ -549,7 +610,6 @@ cli_addCommand(linebuffer_t * __restrict buffer, const cmd->cmd_level = cliLevel; cmd->cmd_func = funcCmd; - cmd->cmd_comp = (char**) anComp; cmd->cmd_len = strlcpy(cmd->cmd_name, csCmd, STRSIZ); if (csInfo) strlcpy(cmd->cmd_info, csInfo, STRSIZ); @@ -560,7 +620,8 @@ cli_addCommand(linebuffer_t * __restrict buffer, const } /* - * cli_delCommand() Delete command from CLI session + * cli_delCommand() - Delete command from CLI session + * * @buffer = CLI buffer * @csCmd = Command name * @cliLevel = Level in CLI, -1 unprivi(view from all), 0 main config, 1 sub config ... @@ -573,7 +634,7 @@ cli_delCommand(linebuffer_t * __restrict buffer, const int ret = RETCODE_OK; if (!buffer || !csCmd) { - cli_SetErr(EINVAL, "Error:: invalid input parameters ..."); + cli_SetErr(EINVAL, "Invalid input parameters ..."); return RETCODE_ERR; } @@ -581,7 +642,7 @@ cli_delCommand(linebuffer_t * __restrict buffer, const if (cmd->cmd_level == cliLevel && !strcmp(cmd->cmd_name, csCmd)) { ret = 1; SLIST_REMOVE(&buffer->line_cmds, cmd, tagCommand, cmd_next); - free(cmd); + e_free(cmd); break; } @@ -589,26 +650,25 @@ cli_delCommand(linebuffer_t * __restrict buffer, const } /* - * cli_updCommand() Update command in CLI session + * cli_updCommand() - Update command in CLI session + * * @buffer = CLI buffer * @csCmd = Command name * @cliLevel = Level in CLI, -1 unprivi(view from all), 0 main config, 1 sub config ... * @funcCmd = Callback function when user call command * @csInfo = Inline information for command * @csHelp = Help line when call help - * @anComp = Completion array terminated with NULL element, -1 complete commands, NULL nothing, - * update only if funcCmd is not NULL * return: RETCODE_ERR error, RETCODE_OK ok */ int cli_updCommand(linebuffer_t * __restrict buffer, const char *csCmd, int cliLevel, cmd_func_t funcCmd, - const char *csInfo, const char *csHelp, const char **anComp) + const char *csInfo, const char *csHelp) { struct tagCommand *cmd; int ret = RETCODE_OK; if (!buffer || !csCmd) { - cli_SetErr(EINVAL, "Error:: invalid input parameters ..."); + cli_SetErr(EINVAL, "Invalid input parameters ..."); return RETCODE_ERR; } @@ -616,10 +676,8 @@ cli_updCommand(linebuffer_t * __restrict buffer, const if (cmd->cmd_level == cliLevel && !strcmp(cmd->cmd_name, csCmd)) { ret = 1; - if (funcCmd) { + if (funcCmd) cmd->cmd_func = funcCmd; - cmd->cmd_comp = (char**) anComp; - } if (csInfo) strlcpy(cmd->cmd_info, csInfo, STRSIZ); if (csHelp) @@ -633,7 +691,8 @@ cli_updCommand(linebuffer_t * __restrict buffer, const /* - * cli_addHistory() Add line to history + * cli_addHistory() - Add line to history + * * @buffer = CLI buffer * @str = Add custom text or if NULL use readed line from CLI buffer * return: RETCODE_ERR error, RETCODE_OK ok @@ -644,11 +703,11 @@ cli_addHistory(linebuffer_t * __restrict buffer, const struct tagHistory *h; if (!buffer) { - cli_SetErr(EINVAL, "Error:: invalid input parameters ..."); + cli_SetErr(EINVAL, "Invalid input parameters ..."); return RETCODE_ERR; } - if (!(h = malloc(sizeof(struct tagHistory)))) { + if (!(h = e_malloc(sizeof(struct tagHistory)))) { LOGERR; return RETCODE_ERR; } else @@ -656,19 +715,19 @@ cli_addHistory(linebuffer_t * __restrict buffer, const if (str) { if (!*str) { - free(h); + e_free(h); return RETCODE_OK; } h->hist_len = strlcpy(h->hist_line, str, BUFSIZ); } else { if (!*buffer->line_buf || buffer->line_len < 2) { - free(h); + e_free(h); return RETCODE_OK; } memcpy(h->hist_line, buffer->line_buf, (h->hist_len = buffer->line_len)); - io_TrimStr((u_char*) h->hist_line); + str_Trim(h->hist_line); h->hist_len = strlen(h->hist_line); } @@ -677,7 +736,8 @@ cli_addHistory(linebuffer_t * __restrict buffer, const } /* - * cli_saveHistory() Save history to file + * cli_saveHistory() - Save history to file + * * @buffer = CLI buffer * @histfile = History filename, if NULL will be use default name * @lines = Maximum history lines to save @@ -692,7 +752,7 @@ cli_saveHistory(linebuffer_t * __restrict buffer, cons struct tagHistory *h; if (!buffer) { - cli_SetErr(EINVAL, "Error:: invalid input parameters ..."); + cli_SetErr(EINVAL, "Invalid input parameters ..."); return RETCODE_ERR; } if (!histfile) @@ -723,7 +783,8 @@ cli_saveHistory(linebuffer_t * __restrict buffer, cons } /* - * cli_loadHistory() Load history from file + * cli_loadHistory() - Load history from file + * * @buffer = CLI buffer * @histfile = History filename, if NULL will be use default name * return: RETCODE_ERR error, RETCODE_OK ok @@ -736,7 +797,7 @@ cli_loadHistory(linebuffer_t * __restrict buffer, cons struct tagHistory *h; if (!buffer) { - cli_SetErr(EINVAL, "Error:: invalid input parameters ..."); + cli_SetErr(EINVAL, "Invalid input parameters ..."); return RETCODE_ERR; } if (!histfile) @@ -752,9 +813,9 @@ cli_loadHistory(linebuffer_t * __restrict buffer, cons if (!*buf || *buf == '#') continue; else - io_TrimStr((u_char*) buf); + str_Trim(buf); - if (!(h = malloc(sizeof(struct tagHistory)))) { + if (!(h = e_malloc(sizeof(struct tagHistory)))) { LOGERR; fclose(f); return RETCODE_ERR; @@ -771,11 +832,12 @@ cli_loadHistory(linebuffer_t * __restrict buffer, cons } /* - * cli_resetHistory() Reset history search in CLI session + * cli_resetHistory() - Reset history search in CLI session + * * @buffer = CLI buffer * return: none */ -inline void +void cli_resetHistory(linebuffer_t * __restrict buffer) { buffer->line_h = NULL; @@ -783,20 +845,21 @@ cli_resetHistory(linebuffer_t * __restrict buffer) /* - * cli_freeLine() Clear entire line + * cli_freeLine() - Clear entire line + * * @buffer = CLI buffer * return: RETCODE_ERR error, RETCODE_OK ok */ -inline int +int cli_freeLine(linebuffer_t * __restrict buffer) { int code = RETCODE_ERR; if (buffer) { if (buffer->line_buf) - free(buffer->line_buf); + e_free(buffer->line_buf); - buffer->line_buf = malloc(BUFSIZ); + buffer->line_buf = e_malloc(BUFSIZ); if (buffer->line_buf) { memset(buffer->line_buf, 0, BUFSIZ); buffer->line_eol = buffer->line_bol; @@ -806,29 +869,30 @@ cli_freeLine(linebuffer_t * __restrict buffer) } else LOGERR; } else - cli_SetErr(EINVAL, "Error:: invalid input parameters ..."); + cli_SetErr(EINVAL, "Invalid input parameters ..."); return code; } /* - * cli_setPrompt() Set new prompt for CLI session + * cli_setPrompt() - Set new prompt for CLI session + * * @buffer = CLI buffer * @prompt = new text for prompt or if NULL disable prompt * return: none */ -inline void +void cli_setPrompt(linebuffer_t * __restrict buffer, const char *prompt) { if (buffer) { if (buffer->line_prompt) { - free(buffer->line_prompt); + e_free(buffer->line_prompt); buffer->line_prompt = NULL; buffer->line_bol = 0; } if (prompt) { - buffer->line_prompt = strdup(prompt); + buffer->line_prompt = e_strdup(prompt); if (buffer->line_prompt) { buffer->line_bol = strlen(buffer->line_prompt); buffer->line_eol = buffer->line_bol; @@ -837,12 +901,13 @@ cli_setPrompt(linebuffer_t * __restrict buffer, const LOGERR; } } else - cli_SetErr(EINVAL, "Error:: invalid input parameters ..."); + cli_SetErr(EINVAL, "Invalid input parameters ..."); } /* - * cliEnd() Clear data, Free resources and close CLI session + * cliEnd() - Clear data, Free resources and close CLI session + * * @buffer = CLI buffer * return: RETCODE_ERR error, RETCODE_OK ok */ @@ -855,29 +920,30 @@ cliEnd(linebuffer_t * __restrict buffer) if (buffer) { while ((c = SLIST_FIRST(&buffer->line_cmds))) { SLIST_REMOVE_HEAD(&buffer->line_cmds, cmd_next); - free(c); + e_free(c); } while ((h = TAILQ_FIRST(&buffer->line_history))) { TAILQ_REMOVE(&buffer->line_history, h, hist_next); - free(h); + e_free(h); } if (buffer->line_prompt) - free(buffer->line_prompt); + e_free(buffer->line_prompt); if (buffer->line_keys) - free(buffer->line_keys); + e_free(buffer->line_keys); if (buffer->line_buf) - free(buffer->line_buf); + e_free(buffer->line_buf); - free(buffer); + e_free(buffer); buffer = NULL; } else - cli_SetErr(EINVAL, "Error:: invalid input parameters ..."); + cli_SetErr(EINVAL, "Invalid input parameters ..."); } /* - * cliInit() Start CLI session, allocate memory for resources and bind keys + * cliInit() - Start CLI session, allocate memory for resources and bind keys + * * @fin = Input device handle * @fout = Output device handle * @prompt = text for prompt, if NULL disable prompt @@ -889,11 +955,9 @@ cliInit(int fin, int fout, const char *prompt) linebuffer_t *buffer; bindkey_t *keys; register int i; - struct termios t; - memset(&t, 0, sizeof t); /* init buffer */ - buffer = malloc(sizeof (linebuffer_t)); + buffer = e_malloc(sizeof(linebuffer_t)); if (!buffer) { LOGERR; return NULL; @@ -907,44 +971,44 @@ cliInit(int fin, int fout, const char *prompt) SLIST_INIT(&buffer->line_cmds); if (prompt) { - buffer->line_prompt = strdup(prompt); + buffer->line_prompt = e_strdup(prompt); if (!buffer->line_prompt) { LOGERR; - free(buffer); + e_free(buffer); return NULL; } else buffer->line_eol = buffer->line_bol = strlen(buffer->line_prompt); } } - buffer->line_buf = malloc(BUFSIZ); + buffer->line_buf = e_malloc(BUFSIZ); if (!buffer->line_buf) { LOGERR; if (buffer->line_prompt) - free(buffer->line_prompt); - free(buffer); + e_free(buffer->line_prompt); + e_free(buffer); return NULL; } else { memset(buffer->line_buf, 0, BUFSIZ); buffer->line_len = 1 + buffer->line_eol; } - keys = calloc(MAX_BINDKEY + 1, sizeof(bindkey_t)); + keys = e_calloc(MAX_BINDKEY + 1, sizeof(bindkey_t)); if (!keys) { LOGERR; if (buffer->line_prompt) - free(buffer->line_prompt); - free(buffer->line_buf); - free(buffer); + e_free(buffer->line_prompt); + e_free(buffer->line_buf); + e_free(buffer); return NULL; } else memset(keys, 0, sizeof(bindkey_t) * (MAX_BINDKEY + 1)); /* add helper functions */ - cli_addCommand(buffer, "exit", 0, cli_Cmd_Exit, "exit ", "Exit from console", NULL); - cli_addCommand(buffer, "help", 0, cli_Cmd_Help, "help [command] ", "Help screen", - (const char**) -1); + cli_addCommand(buffer, "exit", 0, cli_Cmd_Exit, "exit ", "Exit from console"); + cli_addCommand(buffer, "help", 0, cli_Cmd_Help, "help [command] ", "Help screen"); + cli_addCommand(buffer, "-------", 0, NULL, "-------------------------", NULL); /* fill key bindings */ - // ascii chars & ctrl+chars + /* ascii chars & ctrl+chars */ for (i = 0; i < 256; i++) { *keys[i].key_ch = (u_char) i; keys[i].key_len = 1; @@ -970,14 +1034,14 @@ cliInit(int fin, int fout, const char *prompt) if (i == '?') keys[i].key_func = bufHelp; } - // alt+chars + /* alt+chars */ for (i = 256; i < 512; i++) { keys[i].key_ch[0] = 0x1b; keys[i].key_ch[1] = (u_char) i - 256; keys[i].key_len = 2; } - // 3 bytes + /* 3 bytes */ keys[i].key_len = sizeof K_F1 - 1; memcpy(keys[i].key_ch, K_F1, keys[i].key_len); i++; @@ -1090,7 +1154,7 @@ cliInit(int fin, int fout, const char *prompt) keys[i].key_func = bufBTAB; memcpy(keys[i].key_ch, K_BTAB, keys[i].key_len); i++; - // 4 bytes + /* 4 bytes */ keys[i].key_len = sizeof K_INS - 1; keys[i].key_func = bufMODE; memcpy(keys[i].key_ch, K_INS, keys[i].key_len); @@ -1105,7 +1169,7 @@ cliInit(int fin, int fout, const char *prompt) keys[i].key_len = sizeof K_PGDN - 1; memcpy(keys[i].key_ch, K_PGDN, keys[i].key_len); i++; - // 5 bytes + /* 5 bytes */ keys[i].key_len = sizeof K_F5 - 1; memcpy(keys[i].key_ch, K_F5, keys[i].key_len); i++; @@ -1131,21 +1195,35 @@ cliInit(int fin, int fout, const char *prompt) memcpy(keys[i].key_ch, K_F12, keys[i].key_len); 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); t.c_lflag &= ~(ICANON | ISIG | IEXTEN | ECHO | ECHOCTL | ECHOE | ECHOK | ECHOKE | ECHONL | ECHOPRT); t.c_iflag |= IGNBRK; t.c_cc[VMIN] = 1; t.c_cc[VTIME] = 0; - tcsetattr(buffer->line_in, TCSANOW, &t); - - buffer->line_keys = keys; - return buffer; + return tcsetattr(buffer->line_in, TCSANOW, &t); } /* - * cliReadLine() Read line from opened CLI session + * cliReadLine() - Read line from opened CLI session + * * @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 e_free after use! */ char * cliReadLine(linebuffer_t * __restrict buffer) @@ -1156,7 +1234,7 @@ cliReadLine(linebuffer_t * __restrict buffer) char buf[BUFSIZ], *str = NULL; if (!buffer) { - cli_SetErr(EINVAL, "Error:: invalid input parameters ..."); + cli_SetErr(EINVAL, "Invalid input parameters ..."); return NULL; } @@ -1179,9 +1257,9 @@ cliReadLine(linebuffer_t * __restrict buffer) } if (!readLen) { if (buffer->line_buf) - str = strdup(buffer->line_buf); + str = e_strdup(buffer->line_buf); else - cli_SetErr(EPIPE, "Error:: unknown state ..."); + cli_SetErr(EPIPE, "Unknown state ..."); return str; } @@ -1211,64 +1289,58 @@ recheck: } if (code != RETCODE_ERR && code != RETCODE_EOF && buffer->line_buf) - str = strdup(buffer->line_buf); + str = e_strdup(buffer->line_buf); return str; } /* - * cliNetLoop() CLI network main loop binded to socket + * cliNetLoop() - CLI network main loop binded to socket + * * @buffer = CLI buffer * @csHistFile = History file name * @sock = client socket - * @term = stdin termios - * @win = window size of tty * return: RETCODE_ERR error, RETCODE_OK ok */ int -cliNetLoop(linebuffer_t * __restrict buffer, const char *csHistFile, int sock, - struct termios *term, struct winsize *win) +cliNetLoop(linebuffer_t * __restrict buffer, const char *csHistFile, int sock) { 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; struct timeval tv = { DEFAULT_SOCK_TIMEOUT, 0 }; struct telnetAttrs *a, Attr[10]; - switch (forkpty(&pty, NULL, term, win)) { + switch ((pid = forkpty(&pty, NULL, NULL, NULL))) { case -1: LOGERR; return -1; case 0: - close(sock); - - if (buffer) { - ret = cliLoop(buffer, csHistFile) < 0 ? 1 : 0; - cliEnd(buffer); + if (!buffer) { + cli_SetErr(EINVAL, "Invalid input parameters ..."); + return -1; } else - cli_SetErr(EINVAL, "Error:: invalid input parameters ..."); + close(sock); - /* spawn Shell mode */ - /* - execl("/bin/tcsh", "tcsh", NULL); - */ + ret = cliLoop(buffer, csHistFile) < 0 ? 1 : 0; + cliEnd(buffer); - _exit(ret); + exit(ret); default: - /* 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); - 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) { + if (waitpid(pid, &stat, WNOHANG)) + break; + FD_ZERO(&fds); FD_SET(sock, &fds); FD_SET(pty, &fds); @@ -1282,43 +1354,54 @@ cliNetLoop(linebuffer_t * __restrict buffer, const cha r = FD_ISSET(sock, &fds) ? sock : pty; 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) + e_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) - free(a); + e_free(a); - if (-2 == ret) - continue; - // EOF - if (-3 == ret) - shutdown(r, SHUT_RD); - else { - cli_Errno = telnet_GetErrno(); - strlcpy(cli_Error, telnet_GetError(), STRSIZ); + if ((ret = write(pty, buf, ret)) == -1) { + LOGERR; + break; } - 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) { - cli_Errno = telnet_GetErrno(); - strlcpy(cli_Error, telnet_GetError(), STRSIZ); - break; - } else - flg++; + if (FD_ISSET(pty, &fds)) { + memset(buf, 0, BUFSIZ); + if ((ret = read(pty, buf, BUFSIZ)) == -1) { + LOGERR; + break; + } + + if ((ret = cli_telnetSend(sock, Attr, pty == s ? 0 : attrlen, + buf, ret, 0)) == -1) + break; + else + flg++; + } } close(pty); @@ -1328,7 +1411,8 @@ cliNetLoop(linebuffer_t * __restrict buffer, const cha } /* - * cliLoop() CLI main loop + * cliLoop() - CLI main loop + * * @buffer = CLI buffer * @csHistFile = History file name * return: RETCODE_ERR error, RETCODE_OK ok @@ -1341,43 +1425,8 @@ cliLoop(linebuffer_t * __restrict buffer, const char * int ret = RETCODE_OK; struct tagCommand *cmd; - /* - - char **cli_stdCompletion(const char *text, int start, int end) - { - register int i; - char **matches = NULL; - - char *cmdCompGet(const char *text, int state) - { - int len = strlen(text); - - for (i = state; cmdList[i].cmd_name; i++) { - if (strncmp(cmdList[i].cmd_name, "---", 3) && - !strncmp(cmdList[i].cmd_name, text, len)) - return strdup(cmdList[i].cmd_name); - } - - return NULL; - } - - if (!start) - matches = rl_completion_matches(text, cmdCompGet); - else - for (i = 0; cmdList[i].cmd_name; i++) { - if (!cmdList[i].cmd_comp) - continue; - if (!strncmp(rl_line_buffer, cmdList[i].cmd_name, strlen(cmdList[i].cmd_name))) - matches = rl_completion_matches(text, cmdList[i].cmd_comp); - } - - return matches; - } - - - */ - /* --- main body of CLI --- */ + cliInitLine(buffer); if (cli_loadHistory(buffer, csHistFile) == RETCODE_ERR) return RETCODE_ERR; @@ -1390,9 +1439,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; } @@ -1414,12 +1463,18 @@ cliLoop(linebuffer_t * __restrict buffer, const char * cli_Printf(buffer, "\nCommand '%s' not found!\n", items[0]); ret = -1; } else - ret = cmd->cmd_func(buffer, i, items); + if (cmd->cmd_func) { + cli_Printf(buffer, "\n"); + ret = cmd->cmd_func(buffer, i, items); + } else { + clrscrEOL(buffer); + printfCR(buffer, 1); + } } cli_freeLine(buffer); cli_resetHistory(buffer); - free(line); + e_free(line); } while (ret < 1); cli_saveHistory(buffer, csHistFile, HISTORY_LINES);