--- libaitcli/src/aitcli.c 2010/06/07 16:16:12 1.2.2.12 +++ libaitcli/src/aitcli.c 2010/12/07 15:15:34 1.2.2.19 @@ -3,7 +3,7 @@ * 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.2.2.19 2010/12/07 15:15:34 misho Exp $ * *************************************************************************/ #include "global.h" @@ -391,20 +391,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 +417,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 +431,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); @@ -458,7 +464,9 @@ 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; } @@ -492,6 +500,21 @@ cli_Printf(linebuffer_t * __restrict buffer, char *fmt } /* + * cli_PrintHelp() Print help screen + * @buffer = CLI buffer + * return: none +*/ +inline void +cli_PrintHelp(linebuffer_t * __restrict buffer) +{ + if (buffer) + bufHelp(0, buffer); + else + cli_SetErr(EINVAL, "Error:: invalid input parameters ..."); +} + + +/* * cli_BindKey() Bind function to key * @key = key structure * @buffer = CLI buffer @@ -526,16 +549,15 @@ cli_BindKey(bindkey_t * __restrict key, linebuffer_t * * @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) { + if (!buffer || !csCmd) { cli_SetErr(EINVAL, "Error:: invalid input parameters ..."); return RETCODE_ERR; } @@ -549,7 +571,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); @@ -596,13 +617,11 @@ cli_delCommand(linebuffer_t * __restrict buffer, const * @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; @@ -616,10 +635,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) @@ -889,11 +906,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 = malloc(sizeof(linebuffer_t)); if (!buffer) { LOGERR; return NULL; @@ -939,9 +954,9 @@ cliInit(int fin, int fout, const char *prompt) 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 @@ -1131,15 +1146,27 @@ 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); } /* @@ -1221,41 +1248,33 @@ recheck: * @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 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 (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); - } else + if (!buffer) { cli_SetErr(EINVAL, "Error:: invalid input parameters ..."); + return -1; + } else + 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); @@ -1282,43 +1301,59 @@ 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 = telnetRecv(sock, &a, &alen, buf, BUFSIZ)) < 0) { + if (a) + free(a); + + if (-2 == ret) + continue; + // 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); + } + 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 (-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 = telnetSend(sock, Attr, pty == s ? 0 : attrlen, buf, ret, 0)) == -1) { + cli_Errno = telnet_GetErrno(); + strlcpy(cli_Error, telnet_GetError(), STRSIZ); + break; + } else + flg++; + } } close(pty); @@ -1341,43 +1376,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; @@ -1414,7 +1414,12 @@ 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) + ret = cmd->cmd_func(buffer, i, items); + else { + clrscrEOL(buffer); + printfCR(buffer, 1); + } } cli_freeLine(buffer);