--- libaitcli/src/cli.c 2013/10/08 09:38:55 1.6.4.2 +++ libaitcli/src/cli.c 2019/02/04 20:43:17 1.9.14.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: cli.c,v 1.6.4.2 2013/10/08 09:38:55 misho Exp $ +* $Id: cli.c,v 1.9.14.1 2019/02/04 20:43:17 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -12,7 +12,7 @@ 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 +Copyright 2004 - 2019 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -50,11 +50,12 @@ SUCH DAMAGE. * cli_Cmd_Exit() - Builtin helper function for Exit from Cli * * @cli_buffer = CLI buffer - * @idx = Selected command ID + * @idx = Config level * @args = Parsed arguments array * return: RETCODE_EOF exit from Cli! */ -int cli_Cmd_Exit(void * __restrict cli_buffer, int idx, char ** __restrict args) +int +cli_Cmd_Exit(void * __restrict cli_buffer, int idx, char ** __restrict args) { cli_Printf(cli_buffer, "\n"); return RETCODE_EOF; @@ -64,11 +65,12 @@ int cli_Cmd_Exit(void * __restrict cli_buffer, int idx * cli_Cmd_Help() - Builtin helper function for Help screen * * @cli_buffer = CLI buffer - * @idx = Selected command ID + * @idx = Config level * @args = Parsed arguments array * return: RETCODE_ERR in error or RETCODE_OK */ -int cli_Cmd_Help(void * __restrict cli_buffer, int idx, char ** __restrict args) +int +cli_Cmd_Help(void * __restrict cli_buffer, int idx, char ** __restrict args) { linebuffer_t *buf = cli_buffer; struct tagCommand *cmd; @@ -81,7 +83,7 @@ int cli_Cmd_Help(void * __restrict cli_buffer, int idx cli_Printf(buf, "\n"); if (!args) { SLIST_FOREACH(cmd, &buf->line_cmds, cmd_next) { - if (cmd->cmd_level != idx) + if (!(cmd->cmd_level & (1 << idx))) continue; cli_Printf(buf, "%s\t\t%s\n", cmd->cmd_name, cmd->cmd_help); @@ -94,9 +96,10 @@ int cli_Cmd_Help(void * __restrict cli_buffer, int idx return RETCODE_OK; SLIST_FOREACH(cmd, &buf->line_cmds, cmd_next) { - if (cmd->cmd_level != idx) + if (!(cmd->cmd_level & (1 << idx))) continue; - if (args[1] && (cmd->cmd_level != idx || strcmp(args[1], cmd->cmd_name))) + if (args[1] && (!(cmd->cmd_level & (1 << idx)) || + strcmp(args[1], cmd->cmd_name))) continue; cli_Printf(buf, "%s%s\t\t%s\n", args[1] ? "Syntax::\n\t" : "", cmd->cmd_name, @@ -112,12 +115,99 @@ int cli_Cmd_Help(void * __restrict cli_buffer, int idx * cli_Cmd_Unsupported() - Builtin helper function for unsupported commands * * @cli_buffer = CLI buffer - * @idx = Selected command ID + * @idx = Config level * @args = Parsed arguments array * return: RETCODE_OK ok */ -int cli_Cmd_Unsupported(void * __restrict cli_buffer, int idx, char ** __restrict args) +int +cli_Cmd_Unsupported(void * __restrict cli_buffer, int idx, char ** __restrict args) { cli_Printf(cli_buffer, "Command %s not supported in this version ...\n", args[0]); + return RETCODE_OK; +} + +/* + * cli_Cmd_Config() - Builtin helper function for enter into config level from Cli + * + * @cli_buffer = CLI buffer + * @idx = Config level + * @args = Parsed arguments array + * return: RETCODE_ERR in error or RETCODE_OK +*/ +int +cli_Cmd_Config(void * __restrict cli_buffer, int idx, char ** __restrict args) +{ + linebuffer_t *buf = cli_buffer; + char szPrompt[STRSIZ] = {[0 ... STRSIZ - 1] = 0}; + + if (idx == sizeof idx * 8 - 1) + return RETCODE_ERR; + + buf->line_level++; + snprintf(szPrompt, sizeof szPrompt, "%s{%d}> ", buf->line_porigin, buf->line_level); + cli_setPrompt(buf, szPrompt); + cli_Printf(buf, "Enter to config level %d\n", buf->line_level); + return RETCODE_OK; +} + +/* + * cli_Cmd_End() - Builtin helper function for end config level from Cli + * + * @cli_buffer = CLI buffer + * @idx = Config level + * @args = Parsed arguments array + * return: RETCODE_EOF in level 0 or RETCODE_OK +*/ +int +cli_Cmd_End(void * __restrict cli_buffer, int idx, char ** __restrict args) +{ + linebuffer_t *buf = cli_buffer; + char szPrompt[STRSIZ] = {[0 ... STRSIZ - 1] = 0}; + + if (!idx) + return cli_Cmd_Exit(cli_buffer, idx, args); + + buf->line_level--; + snprintf(szPrompt, sizeof szPrompt, "%s{%d}> ", buf->line_porigin, buf->line_level); + cli_setPrompt(buf, szPrompt); + cli_Printf(buf, "Enter to config level %d\n", buf->line_level); + return RETCODE_OK; +} + +/* + * cli_Cmd_Top() - Builtin helper function for top level of Cli + * + * @cli_buffer = CLI buffer + * @idx = Config level + * @args = Parsed arguments array + * return: RETCODE_OK ok +*/ +int +cli_Cmd_Top(void * __restrict cli_buffer, int idx, char ** __restrict args) +{ + linebuffer_t *buf = cli_buffer; + char szPrompt[STRSIZ] = {[0 ... STRSIZ - 1] = 0}; + + buf->line_level ^= buf->line_level; + snprintf(szPrompt, sizeof szPrompt, "%s{%d}> ", buf->line_porigin, buf->line_level); + cli_setPrompt(buf, szPrompt); + cli_Printf(buf, "Enter to top config level %d\n", buf->line_level); + return RETCODE_OK; +} + +/* + * cli_Cmd_WhereAmI() - Builtin helper function for query level of Cli + * + * @cli_buffer = CLI buffer + * @idx = Config level + * @args = Parsed arguments array + * return: RETCODE_OK ok +*/ +int +cli_Cmd_WhereAmI(void * __restrict cli_buffer, int idx, char ** __restrict args) +{ + linebuffer_t *buf = cli_buffer; + + cli_Printf(buf, "Current config level is %d\n", buf->line_level); return RETCODE_OK; }