[BACK]Return to cli.c CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / libaitcli / src

Diff for /libaitcli/src/cli.c between versions 1.6.4.4 and 1.12

version 1.6.4.4, 2013/10/08 10:45:08 version 1.12, 2022/12/05 22:23:38
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 - 2022
         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 58  int Line 58  int
 cli_Cmd_Exit(void * __restrict cli_buffer, int idx, char ** __restrict args)  cli_Cmd_Exit(void * __restrict cli_buffer, int idx, char ** __restrict args)
 {  {
         cli_Printf(cli_buffer, "\n");          cli_Printf(cli_buffer, "\n");
           ((linebuffer_t*) cli_buffer)->line_kill = 42;
         return RETCODE_EOF;          return RETCODE_EOF;
 }  }
   
Line 83  cli_Cmd_Help(void * __restrict cli_buffer, int idx, ch Line 84  cli_Cmd_Help(void * __restrict cli_buffer, int idx, ch
         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 96  cli_Cmd_Help(void * __restrict cli_buffer, int idx, ch Line 97  cli_Cmd_Help(void * __restrict cli_buffer, int idx, ch
                                 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 137  int Line 139  int
 cli_Cmd_Config(void * __restrict cli_buffer, int idx, char ** __restrict args)  cli_Cmd_Config(void * __restrict cli_buffer, int idx, char ** __restrict args)
 {  {
         linebuffer_t *buf = cli_buffer;          linebuffer_t *buf = cli_buffer;
           char szPrompt[STRSIZ + 16] = {[0 ... STRSIZ + 15] = 0};
   
        if (idx == sizeof idx * 8)        if (idx == sizeof idx * 8 - 1)
                 return RETCODE_ERR;                  return RETCODE_ERR;
   
         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 config level %d\n", buf->line_level);
         return RETCODE_OK;          return RETCODE_OK;
 }  }
   
Line 157  int Line 163  int
 cli_Cmd_End(void * __restrict cli_buffer, int idx, char ** __restrict args)  cli_Cmd_End(void * __restrict cli_buffer, int idx, char ** __restrict args)
 {  {
         linebuffer_t *buf = cli_buffer;          linebuffer_t *buf = cli_buffer;
           char szPrompt[STRSIZ + 16] = {[0 ... STRSIZ + 15] = 0};
   
         if (!idx)          if (!idx)
                cli_Cmd_Exit(cli_buffer, idx, args);                return cli_Cmd_Exit(cli_buffer, idx, args);
   
         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 config level %d\n", buf->line_level);
         return RETCODE_OK;          return RETCODE_OK;
 }  }
   
Line 177  int Line 187  int
 cli_Cmd_Top(void * __restrict cli_buffer, int idx, char ** __restrict args)  cli_Cmd_Top(void * __restrict cli_buffer, int idx, char ** __restrict args)
 {  {
         linebuffer_t *buf = cli_buffer;          linebuffer_t *buf = cli_buffer;
           char szPrompt[STRSIZ + 16] = {[0 ... STRSIZ + 15] = 0};
   
         buf->line_level ^= buf->line_level;          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.4  
changed lines
  Added in v.1.12

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