--- libaitcli/src/aitcli.c 2010/06/07 12:30:28 1.2.2.8 +++ libaitcli/src/aitcli.c 2010/06/08 08:05:12 1.2.2.14 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitcli.c,v 1.2.2.8 2010/06/07 12:30:28 misho Exp $ +* $Id: aitcli.c,v 1.2.2.14 2010/06/08 08:05:12 misho Exp $ * *************************************************************************/ #include "global.h" @@ -12,16 +12,6 @@ #pragma GCC visibility push(hidden) -/* -commands_t cli_stdCmds[] = { - { "test", cli_Cmd_Unsupported, "Test - Don`t use default command structure!", "test ", cli_Comp_Filename }, - { "-------", NULL, "---------------------", NULL, NULL }, - { "help", cli_Cmd_Help, "Help screen", "help [command] ", NULL }, - { "exit", cli_Cmd_Exit, "Exit from console", "exit ", NULL }, - { NULL, NULL, NULL, NULL } -}; -*/ - // ------------------------------------------------ int cli_Errno; @@ -108,17 +98,6 @@ printfNL(linebuffer_t * __restrict buf, int prompt) } } -static inline void -printfCLI(linebuffer_t * __restrict buf, const unsigned char *text, int textlen, int prompt) -{ - if (buf && text && textlen) { - if (prompt && buf->line_prompt) - write(buf->line_out, buf->line_prompt, buf->line_bol); - - write(buf->line_out, text, textlen); - } -} - // ------------------------------------------------------------ static int @@ -145,8 +124,8 @@ bufCHAR(int idx, void * __restrict buffer) write(buf->line_out, buf->line_keys[idx].key_ch, buf->line_keys[idx].key_len); if (buf->line_mode == LINEMODE_INS) { - printfCLI(buf, (const u_char*) buf->line_buf + pos + buf->line_keys[idx].key_len, - buf->line_len - buf->line_eol, 0); + write(buf->line_out, (const u_char*) buf->line_buf + pos + buf->line_keys[idx].key_len, + buf->line_len - buf->line_eol); printfEOL(buf, -1, 1); } return RETCODE_OK; @@ -165,12 +144,11 @@ bufEOL(int idx, void * __restrict buffer) static int bufEOF(int idx, void * __restrict buffer) { - linebuffer_t *buf = buffer; - + /* if (!buffer || idx < 0 || idx > MAX_BINDKEY) return RETCODE_ERR; + */ - write(buf->line_out, buf->line_keys[idx].key_ch, buf->line_keys[idx].key_len); return RETCODE_EOF; } @@ -388,11 +366,88 @@ static int bufComp(int idx, void * __restrict buffer) { linebuffer_t *buf = buffer; + char *str, *s, **app, *items[MAX_PROMPT_ITEMS], szLine[STRSIZ]; + register int i, j; + struct tagCommand *cmd, *c; + int pos, ret = RETCODE_OK; if (!buffer || idx < 0 || idx > MAX_BINDKEY) return RETCODE_ERR; - return RETCODE_OK; + str = strdup(buf->line_buf); + if (!str) + return RETCODE_ERR; + else { + s = str; + io_TrimStr((u_char*) s); + } + + i = j = 0; + c = NULL; + memset(szLine, 0, STRSIZ); + if (*s) { + memset(items, 0, sizeof(char*) * MAX_PROMPT_ITEMS); + for (app = items, i = 0; app < items + MAX_PROMPT_ITEMS - 1 && (*app = strsep(&s, " \t")); + *app ? i++ : i, *app ? app++ : app); + + if (i) { + 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 (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 */ + ret = RETCODE_ERR; + goto endcomp; + } + } else { + /* 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); + } + } + + /* completion show actions ... */ + if (j > 1 && c) { + 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); + cli_freeLine(buf); + + pos = buf->line_eol - buf->line_bol; + + buf->line_len += c->cmd_len + 1; + buf->line_eol += c->cmd_len + 1; + + memcpy(buf->line_buf + pos, c->cmd_name, c->cmd_len); + buf->line_buf[pos + c->cmd_len] = (u_char) *K_SPACE; + buf->line_buf[buf->line_len - 1] = 0; + + printfEOL(buf, -1, 1); + } + +endcomp: + free(str); + return ret; } static int @@ -404,7 +459,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; } @@ -438,6 +495,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 @@ -480,7 +552,7 @@ cli_addCommand(linebuffer_t * __restrict buffer, const { struct tagCommand *cmd; - if (!buffer || !csCmd || !funcCmd) { + if (!buffer || !csCmd) { cli_SetErr(EINVAL, "Error:: invalid input parameters ..."); return RETCODE_ERR; } @@ -1181,10 +1253,9 @@ cliNetLoop(linebuffer_t * __restrict buffer, const cha case 0: close(sock); - if (buffer) { + if (buffer) ret = cliLoop(buffer, csHistFile) < 0 ? 1 : 0; - cliEnd(buffer); - } else + else cli_SetErr(EINVAL, "Error:: invalid input parameters ..."); /* spawn Shell mode */ @@ -1279,42 +1350,6 @@ cliLoop(linebuffer_t * __restrict buffer, const char * register int i; 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 --- */