Diff for /libaitcli/src/cli.c between versions 1.6.4.3 and 1.9.14.1

version 1.6.4.3, 2013/10/08 09:51:02 version 1.9.14.1, 2019/02/04 20:43:17
Line 12  terms: Line 12  terms:
 All of the documentation and software included in the ELWIX and AITNET  All of the documentation and software included in the ELWIX and AITNET
 Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>  Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
   
Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013Copyright 2004 - 2019
         by Michael Pounov <misho@elwix.org>.  All rights reserved.          by Michael Pounov <misho@elwix.org>.  All rights reserved.
   
 Redistribution and use in source and binary forms, with or without  Redistribution and use in source and binary forms, with or without
Line 54  SUCH DAMAGE. Line 54  SUCH DAMAGE.
  * @args = Parsed arguments array   * @args = Parsed arguments array
  * return: RETCODE_EOF exit from Cli!   * 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");          cli_Printf(cli_buffer, "\n");
         return RETCODE_EOF;          return RETCODE_EOF;
Line 68  int cli_Cmd_Exit(void * __restrict cli_buffer, int idx Line 69  int cli_Cmd_Exit(void * __restrict cli_buffer, int idx
  * @args = Parsed arguments array   * @args = Parsed arguments array
  * return: RETCODE_ERR in error or RETCODE_OK   * 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;          linebuffer_t *buf = cli_buffer;
         struct tagCommand *cmd;          struct tagCommand *cmd;
Line 81  int cli_Cmd_Help(void * __restrict cli_buffer, int idx Line 83  int cli_Cmd_Help(void * __restrict cli_buffer, int idx
         cli_Printf(buf, "\n");          cli_Printf(buf, "\n");
         if (!args) {          if (!args) {
                 SLIST_FOREACH(cmd, &buf->line_cmds, cmd_next) {                  SLIST_FOREACH(cmd, &buf->line_cmds, cmd_next) {
                        if (cmd->cmd_level != idx)                        if (!(cmd->cmd_level & (1 << idx)))
                                 continue;                                  continue;
   
                         cli_Printf(buf, "%s\t\t%s\n", cmd->cmd_name, cmd->cmd_help);                          cli_Printf(buf, "%s\t\t%s\n", cmd->cmd_name, cmd->cmd_help);
Line 94  int cli_Cmd_Help(void * __restrict cli_buffer, int idx Line 96  int cli_Cmd_Help(void * __restrict cli_buffer, int idx
                                 return RETCODE_OK;                                  return RETCODE_OK;
   
                 SLIST_FOREACH(cmd, &buf->line_cmds, cmd_next) {                  SLIST_FOREACH(cmd, &buf->line_cmds, cmd_next) {
                        if (cmd->cmd_level != idx)                        if (!(cmd->cmd_level & (1 << idx)))
                                 continue;                                  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;                                  continue;
   
                         cli_Printf(buf, "%s%s\t\t%s\n", args[1] ? "Syntax::\n\t" : "", cmd->cmd_name,                           cli_Printf(buf, "%s%s\t\t%s\n", args[1] ? "Syntax::\n\t" : "", cmd->cmd_name, 
Line 116  int cli_Cmd_Help(void * __restrict cli_buffer, int idx Line 119  int cli_Cmd_Help(void * __restrict cli_buffer, int idx
  * @args = Parsed arguments array   * @args = Parsed arguments array
  * return: RETCODE_OK ok   * 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]);          cli_Printf(cli_buffer, "Command %s not supported in this version ...\n", args[0]);
         return RETCODE_OK;          return RETCODE_OK;
Line 130  int cli_Cmd_Unsupported(void * __restrict cli_buffer,  Line 134  int cli_Cmd_Unsupported(void * __restrict cli_buffer, 
  * @args = Parsed arguments array   * @args = Parsed arguments array
  * return: RETCODE_ERR in error or RETCODE_OK   * return: RETCODE_ERR in error or RETCODE_OK
 */  */
int cli_Cmd_Config(void * __restrict cli_buffer, int idx, char ** __restrict args)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;          return RETCODE_OK;
 }  }
   
Line 141  int cli_Cmd_Config(void * __restrict cli_buffer, int i Line 156  int cli_Cmd_Config(void * __restrict cli_buffer, int i
  * @cli_buffer = CLI buffer   * @cli_buffer = CLI buffer
  * @idx = Config level   * @idx = Config level
  * @args = Parsed arguments array   * @args = Parsed arguments array
 * return: RETCODE_ERR in error or RETCODE_OK * return: RETCODE_EOF in level 0 or RETCODE_OK
 */  */
int cli_Cmd_End(void * __restrict cli_buffer, int idx, char ** __restrict args)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;          return RETCODE_OK;
 }  }

Removed from v.1.6.4.3  
changed lines
  Added in v.1.9.14.1


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>