--- libaitcli/src/aitcli.c 2013/09/02 11:26:36 1.8 +++ libaitcli/src/aitcli.c 2013/10/08 12:04:42 1.9 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitcli.c,v 1.8 2013/09/02 11:26:36 misho Exp $ +* $Id: aitcli.c,v 1.9 2013/10/08 12:04:42 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -88,7 +88,7 @@ clrscrEOL(linebuffer_t * __restrict buf) { register int i; - if (buf) { + if (buf && buf->line_prompt) { write(buf->line_out, K_CR, 1); for (i = 0; i < buf->line_len; i++) @@ -100,24 +100,22 @@ static inline void printfEOL(linebuffer_t * __restrict buf, int len, int prompt) { if (buf) { - write(buf->line_out, K_CR, 1); - - if (prompt && buf->line_prompt) + if (prompt && buf->line_prompt) { + write(buf->line_out, K_CR, 1); write(buf->line_out, buf->line_prompt, buf->line_bol); + } - write(buf->line_out, buf->line_buf, len == -1 ? buf->line_eol - buf->line_bol: len); + write(buf->line_out, buf->line_buf, len == -1 ? + buf->line_eol - buf->line_bol: len); } } static inline void printfCR(linebuffer_t * __restrict buf, int prompt) { - if (buf) { + if (buf && prompt && buf->line_prompt) { write(buf->line_out, K_CR, 1); - - if (prompt) - if (prompt && buf->line_prompt) - write(buf->line_out, buf->line_prompt, buf->line_bol); + write(buf->line_out, buf->line_prompt, buf->line_bol); } } @@ -422,14 +420,17 @@ bufComp(int idx, void * __restrict cli_buffer) 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")); + 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]))) { - if (strncmp(cmd->cmd_name, CLI_CMD_SEP, strlen(CLI_CMD_SEP))) { + if (cmd->cmd_level & (1 << buf->line_level) && + !strncmp(cmd->cmd_name, items[0], + strlen(items[0]))) { + if (strncmp(cmd->cmd_name, CLI_CMD_SEP, + strlen(CLI_CMD_SEP))) { j++; c = cmd; strlcat(szLine, " ", STRSIZ); @@ -451,7 +452,7 @@ bufComp(int idx, void * __restrict cli_buffer) } 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) + if (cmd->cmd_level & (1 << buf->line_level)) if (strncmp(cmd->cmd_name, CLI_CMD_SEP, strlen(CLI_CMD_SEP))) { j++; c = cmd; @@ -498,14 +499,31 @@ bufHelp(int idx, void * __restrict cli_buffer) if (!cli_buffer || idx < 0 || idx > MAX_BINDKEY) return RETCODE_ERR; - cli_Cmd_Help(buf, -1, NULL); + cli_Cmd_Help(buf, buf->line_level, NULL); printfEOL(buf, buf->line_len - 1, 1); printfEOL(buf, -1, 1); return RETCODE_OK; } +static int +bufEndNode(int idx, void * __restrict cli_buffer) +{ + linebuffer_t *buf = cli_buffer; + if (!cli_buffer || idx < 0 || idx > MAX_BINDKEY) + return RETCODE_ERR; + + if (buf->line_level > 0) { + printfNL(cli_buffer, 0); + buf->line_level--; + cli_Printf(buf, "Enter to config level %d\n", buf->line_level); + } + + return bufCLR(idx, cli_buffer); +} + + /* * cli_Printf() - Send message to CLI session * @@ -585,7 +603,7 @@ cli_BindKey(bindkey_t * __restrict key, linebuffer_t * * * @cli_buffer = CLI buffer * @csCmd = Command name - * @cliLevel = Level in CLI, -1 unprivi(view from all), 0 main config, 1 sub config ... + * @cliLevel = Level in CLI, -1 view from all levels, 0 hidden, >0 mask levels * @funcCmd = Callback function when user call command * @csInfo = Inline information for command * @csHelp = Help line when call help @@ -626,7 +644,7 @@ cli_addCommand(linebuffer_t * __restrict cli_buffer, c * * @cli_buffer = CLI buffer * @csCmd = Command name - * @cliLevel = Level in CLI, -1 unprivi(view from all), 0 main config, 1 sub config ... + * @cliLevel = Level in CLI, -1 view from all levels, 0 hidden, >0 mask levels * return: RETCODE_ERR error, RETCODE_OK ok */ int @@ -656,7 +674,7 @@ cli_delCommand(linebuffer_t * __restrict cli_buffer, c * * @cli_buffer = CLI buffer * @csCmd = Command name - * @cliLevel = Level in CLI, -1 unprivi(view from all), 0 main config, 1 sub config ... + * @cliLevel = Level in CLI, -1 view from all levels, 0 hidden, >0 mask levels * @funcCmd = Callback function when user call command * @csInfo = Inline information for command * @csHelp = Help line when call help @@ -675,10 +693,11 @@ cli_updCommand(linebuffer_t * __restrict cli_buffer, c return RETCODE_ERR; } - SLIST_FOREACH(cmd, &cli_buffer->line_cmds, cmd_next) - if (cmd->cmd_level == cliLevel && !strcmp(cmd->cmd_name, csCmd)) { - ret = 1; - + SLIST_FOREACH(cmd, &cli_buffer->line_cmds, cmd_next) + if ((!cmd->cmd_level || cmd->cmd_level == cliLevel) && + !strcmp(cmd->cmd_name, csCmd)) { + if (!cmd->cmd_level) + cmd->cmd_level = cliLevel; if (funcCmd) cmd->cmd_func = funcCmd; if (csInfo) @@ -982,7 +1001,8 @@ cliInit(int fin, int fout, const char *prompt) } else cli_buffer->line_eol = cli_buffer->line_bol = strlen(cli_buffer->line_prompt); - } + } else + cli_buffer->line_mode = LINEMODE_OVER; } cli_buffer->line_buf = e_malloc(BUFSIZ); if (!cli_buffer->line_buf) { @@ -1007,9 +1027,16 @@ cliInit(int fin, int fout, const char *prompt) memset(keys, 0, sizeof(bindkey_t) * (MAX_BINDKEY + 1)); /* add helper functions */ - cli_addCommand(cli_buffer, "exit", 0, cli_Cmd_Exit, "exit ", "Exit from console"); - cli_addCommand(cli_buffer, "help", 0, cli_Cmd_Help, "help [command] ", "Help screen"); - cli_addCommand(cli_buffer, "-------", 0, NULL, "-------------------------", NULL); + cli_addCommand(cli_buffer, "exit", 1, cli_Cmd_Exit, "exit ", "Exit from console"); + cli_addCommand(cli_buffer, "help", -1, cli_Cmd_Help, "help [command] ", "Help screen"); + cli_addCommand(cli_buffer, "-------", -1, NULL, "-------------------------", NULL); + cli_addCommand(cli_buffer, "where", -1, cli_Cmd_WhereAmI, "where ", + "Query current level of console"); + cli_addCommand(cli_buffer, "top", -1, cli_Cmd_Top, "top ", "Top level of console"); + cli_addCommand(cli_buffer, "end", -1, cli_Cmd_End, "end ", "End level of console"); + cli_addCommand(cli_buffer, "config", -1, cli_Cmd_Config, "config ", + "Config next level of console"); + cli_addCommand(cli_buffer, "-------", -1, NULL, "-------------------------", NULL); /* fill key bindings */ /* ascii chars & ctrl+chars */ @@ -1021,21 +1048,23 @@ cliInit(int fin, int fout, const char *prompt) keys[i].key_func = bufEOF; if (i == *K_CTRL_M || i == *K_CTRL_J) keys[i].key_func = bufEOL; - if (i == *K_CTRL_H || i == *K_BACKSPACE) + if (cli_buffer->line_prompt && (i == *K_CTRL_H || i == *K_BACKSPACE)) keys[i].key_func = bufBS; - if (i == *K_CTRL_C) + if (cli_buffer->line_prompt && i == *K_CTRL_C) keys[i].key_func = bufCLR; - if (i == *K_CTRL_A) + if (cli_buffer->line_prompt && i == *K_CTRL_A) keys[i].key_func = bufBEGIN; - if (i == *K_CTRL_E) + if (cli_buffer->line_prompt && i == *K_CTRL_E) keys[i].key_func = bufEND; - if (i == *K_TAB) + if (cli_buffer->line_prompt && i == *K_TAB) keys[i].key_func = bufComp; + if (cli_buffer->line_prompt && i == *K_CTRL_Z) + keys[i].key_func = bufEndNode; if (i >= *K_SPACE && i < *K_BACKSPACE) keys[i].key_func = bufCHAR; if (i > *K_BACKSPACE && i < 0xff) keys[i].key_func = bufCHAR; - if (i == '?') + if (cli_buffer->line_prompt && i == '?') keys[i].key_func = bufHelp; } /* alt+chars */ @@ -1131,40 +1160,49 @@ cliInit(int fin, int fout, const char *prompt) memcpy(keys[i].key_ch, K_CTRL_F12, keys[i].key_len); i++; keys[i].key_len = sizeof K_HOME - 1; - keys[i].key_func = bufBEGIN; + if (cli_buffer->line_prompt) + keys[i].key_func = bufBEGIN; memcpy(keys[i].key_ch, K_HOME, keys[i].key_len); i++; keys[i].key_len = sizeof K_END - 1; - keys[i].key_func = bufEND; + if (cli_buffer->line_prompt) + keys[i].key_func = bufEND; memcpy(keys[i].key_ch, K_END, keys[i].key_len); i++; keys[i].key_len = sizeof K_UP - 1; - keys[i].key_func = bufUP; + if (cli_buffer->line_prompt) + keys[i].key_func = bufUP; memcpy(keys[i].key_ch, K_UP, keys[i].key_len); i++; keys[i].key_len = sizeof K_DOWN - 1; - keys[i].key_func = bufDOWN; + if (cli_buffer->line_prompt) + keys[i].key_func = bufDOWN; memcpy(keys[i].key_ch, K_DOWN, keys[i].key_len); i++; keys[i].key_len = sizeof K_RIGHT - 1; - keys[i].key_func = bufRIGHT; + if (cli_buffer->line_prompt) + keys[i].key_func = bufRIGHT; memcpy(keys[i].key_ch, K_RIGHT, keys[i].key_len); i++; keys[i].key_len = sizeof K_LEFT - 1; - keys[i].key_func = bufLEFT; + if (cli_buffer->line_prompt) + keys[i].key_func = bufLEFT; memcpy(keys[i].key_ch, K_LEFT, keys[i].key_len); i++; keys[i].key_len = sizeof K_BTAB - 1; - keys[i].key_func = bufBTAB; + if (cli_buffer->line_prompt) + keys[i].key_func = bufBTAB; memcpy(keys[i].key_ch, K_BTAB, keys[i].key_len); i++; /* 4 bytes */ keys[i].key_len = sizeof K_INS - 1; - keys[i].key_func = bufMODE; + if (cli_buffer->line_prompt) + keys[i].key_func = bufMODE; memcpy(keys[i].key_ch, K_INS, keys[i].key_len); i++; keys[i].key_len = sizeof K_DEL - 1; - keys[i].key_func = bufDEL; + if (cli_buffer->line_prompt) + keys[i].key_func = bufDEL; memcpy(keys[i].key_ch, K_DEL, keys[i].key_len); i++; keys[i].key_len = sizeof K_PGUP - 1; @@ -1216,7 +1254,8 @@ cliInitLine(linebuffer_t * __restrict cli_buffer) memset(&t, 0, sizeof t); tcgetattr(cli_buffer->line_in, &t); - t.c_lflag &= ~(ICANON | ISIG | IEXTEN | ECHO | ECHOCTL | ECHOE | ECHOK | ECHOKE | ECHONL | ECHOPRT); + 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; @@ -1451,12 +1490,14 @@ cliLoop(linebuffer_t * __restrict cli_buffer, const ch if (*s) { memset(items, 0, sizeof(char*) * MAX_PROMPT_ITEMS); - for (app = items; app < items + MAX_PROMPT_ITEMS - 1 && (*app = strsep(&s, " \t")); - *app ? app++ : app); + for (app = items; app < items + MAX_PROMPT_ITEMS - 1 && + (*app = strsep(&s, " \t")); *app ? app++ : app); // exec_cmd ... i = 0; SLIST_FOREACH(cmd, &cli_buffer->line_cmds, cmd_next) { + if (!(cmd->cmd_level & (1 << cli_buffer->line_level))) + continue; if (*items[0] && !strncmp(cmd->cmd_name, items[0], strlen(items[0]))) break; else @@ -1469,7 +1510,8 @@ cliLoop(linebuffer_t * __restrict cli_buffer, const ch } else if (cmd->cmd_func) { cli_Printf(cli_buffer, "\n"); - ret = cmd->cmd_func(cli_buffer, i, items); + ret = cmd->cmd_func(cli_buffer, + cli_buffer->line_level, items); } else { clrscrEOL(cli_buffer); printfCR(cli_buffer, 1);