[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 and 1.7

version 1.6, 2013/08/12 09:50:29 version 1.7, 2013/10/08 12:04:42
Line 50  SUCH DAMAGE. Line 50  SUCH DAMAGE.
  * cli_Cmd_Exit() - Builtin helper function for Exit from Cli   * cli_Cmd_Exit() - Builtin helper function for Exit from Cli
  *   *
  * @cli_buffer = CLI buffer   * @cli_buffer = CLI buffer
 * @idx = Selected command ID * @idx = Config level
  * @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 64  int cli_Cmd_Exit(void * __restrict cli_buffer, int idx Line 65  int cli_Cmd_Exit(void * __restrict cli_buffer, int idx
  * cli_Cmd_Help() - Builtin helper function for Help screen   * cli_Cmd_Help() - Builtin helper function for Help screen
  *   *
  * @cli_buffer = CLI buffer   * @cli_buffer = CLI buffer
 * @idx = Selected command ID * @idx = Config level
  * @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 80  int cli_Cmd_Help(void * __restrict cli_buffer, int idx Line 82  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 & (1 << idx)))
                                 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);
                   }
         } else {          } else {
                 if (!args[1])                  if (!args[1])
                         cli_Printf(buf, "Help screen::\n");                          cli_Printf(buf, "Help screen::\n");
Line 90  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 (args[1] && (cmd->cmd_level != buf->line_level || strcmp(args[1], cmd->cmd_name)))                        if (!(cmd->cmd_level & (1 << idx)))
                                 continue;                                  continue;
                           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,                           cli_Printf(buf, "%s%s\t\t%s\n", args[1] ? "Syntax::\n\t" : "", cmd->cmd_name, 
                                         args[1] ? cmd->cmd_info: cmd->cmd_help);                                          args[1] ? cmd->cmd_info: cmd->cmd_help);
Line 106  int cli_Cmd_Help(void * __restrict cli_buffer, int idx Line 115  int cli_Cmd_Help(void * __restrict cli_buffer, int idx
  * cli_Cmd_Unsupported() - Builtin helper function for unsupported commands   * cli_Cmd_Unsupported() - Builtin helper function for unsupported commands
  *   *
  * @cli_buffer = CLI buffer   * @cli_buffer = CLI buffer
 * @idx = Selected command ID * @idx = Config level
  * @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;
   }
   
   /*
    * 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;
   
           if (idx == sizeof idx * 8)
                   return RETCODE_ERR;
   
           buf->line_level++;
           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;
   
           if (!idx)
                   return cli_Cmd_Exit(cli_buffer, idx, args);
   
           buf->line_level--;
           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;
   
           buf->line_level ^= buf->line_level;
           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  
changed lines
  Added in v.1.7

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