|
|
| version 1.8.2.2, 2013/10/08 09:18:45 | version 1.8.2.6, 2013/10/08 09:41:20 |
|---|---|
| Line 93 clrscrEOL(linebuffer_t * __restrict buf) | Line 93 clrscrEOL(linebuffer_t * __restrict buf) |
| for (i = 0; i < buf->line_len; i++) | for (i = 0; i < buf->line_len; i++) |
| write(buf->line_out, K_SPACE, 1); | write(buf->line_out, K_SPACE, 1); |
| buf->line_level ^= buf->line_level; | |
| } | } |
| } | } |
| Line 105 printfEOL(linebuffer_t * __restrict buf, int len, int | Line 103 printfEOL(linebuffer_t * __restrict buf, int len, int |
| if (prompt && buf->line_prompt) { | if (prompt && buf->line_prompt) { |
| write(buf->line_out, K_CR, 1); | write(buf->line_out, K_CR, 1); |
| write(buf->line_out, buf->line_prompt, buf->line_bol); | write(buf->line_out, buf->line_prompt, buf->line_bol); |
| buf->line_level ^= buf->line_level; | |
| } | } |
| write(buf->line_out, buf->line_buf, len == -1 ? | write(buf->line_out, buf->line_buf, len == -1 ? |
| Line 128 printfNL(linebuffer_t * __restrict buf, int prompt) | Line 125 printfNL(linebuffer_t * __restrict buf, int prompt) |
| if (buf) { | if (buf) { |
| write(buf->line_out, K_ENTER, 1); | write(buf->line_out, K_ENTER, 1); |
| if (prompt) { | if (prompt) |
| if (prompt && buf->line_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); |
| buf->line_level ^= buf->line_level; | |
| } | |
| } | } |
| } | } |
| Line 440 bufComp(int idx, void * __restrict cli_buffer) | Line 435 bufComp(int idx, void * __restrict cli_buffer) |
| c = cmd; | c = cmd; |
| strlcat(szLine, " ", STRSIZ); | strlcat(szLine, " ", STRSIZ); |
| strlcat(szLine, cmd->cmd_name, STRSIZ); | strlcat(szLine, cmd->cmd_name, STRSIZ); |
| buf->line_level++; | |
| } | } |
| } | } |
| } | } |
| Line 464 bufComp(int idx, void * __restrict cli_buffer) | Line 458 bufComp(int idx, void * __restrict cli_buffer) |
| c = cmd; | c = cmd; |
| strlcat(szLine, " ", STRSIZ); | strlcat(szLine, " ", STRSIZ); |
| strlcat(szLine, cmd->cmd_name, STRSIZ); | strlcat(szLine, cmd->cmd_name, STRSIZ); |
| buf->line_level++; | |
| } | } |
| } | } |
| } | } |
| Line 506 bufHelp(int idx, void * __restrict cli_buffer) | Line 499 bufHelp(int idx, void * __restrict cli_buffer) |
| if (!cli_buffer || idx < 0 || idx > MAX_BINDKEY) | if (!cli_buffer || idx < 0 || idx > MAX_BINDKEY) |
| return RETCODE_ERR; | 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, buf->line_len - 1, 1); |
| printfEOL(buf, -1, 1); | printfEOL(buf, -1, 1); |
| Line 1476 cliLoop(linebuffer_t * __restrict cli_buffer, const ch | Line 1469 cliLoop(linebuffer_t * __restrict cli_buffer, const ch |
| // exec_cmd ... | // exec_cmd ... |
| i = 0; | i = 0; |
| SLIST_FOREACH(cmd, &cli_buffer->line_cmds, cmd_next) { | SLIST_FOREACH(cmd, &cli_buffer->line_cmds, cmd_next) { |
| if (cmd->cmd_level != cli_buffer->line_level) | |
| continue; | |
| if (*items[0] && !strncmp(cmd->cmd_name, items[0], strlen(items[0]))) | if (*items[0] && !strncmp(cmd->cmd_name, items[0], strlen(items[0]))) |
| break; | break; |
| else | else |
| Line 1488 cliLoop(linebuffer_t * __restrict cli_buffer, const ch | Line 1483 cliLoop(linebuffer_t * __restrict cli_buffer, const ch |
| } else | } else |
| if (cmd->cmd_func) { | if (cmd->cmd_func) { |
| cli_Printf(cli_buffer, "\n"); | 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 { | } else { |
| clrscrEOL(cli_buffer); | clrscrEOL(cli_buffer); |
| printfCR(cli_buffer, 1); | printfCR(cli_buffer, 1); |