Diff for /libaitcli/src/cli.c between versions 1.2 and 1.7

version 1.2, 2011/03/16 17:24:03 version 1.7, 2013/10/08 12:04:42
Line 5 Line 5
 * $Author$  * $Author$
 * $Id$  * $Id$
 *  *
*************************************************************************/**************************************************************************
 The ELWIX and AITNET software is distributed under the following
 terms:
 
 All of the documentation and software included in the ELWIX and AITNET
 Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
 
 Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
         by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 are met:
 1. Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
 2. Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
 3. All advertising materials mentioning features or use of this software
    must display the following acknowledgement:
 This product includes software developed by Michael Pounov <misho@elwix.org>
 ELWIX - Embedded LightWeight unIX and its contributors.
 4. Neither the name of AITNET nor the names of its contributors
    may be used to endorse or promote products derived from this software
    without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY AITNET AND CONTRIBUTORS ``AS IS'' AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
 FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGE.
 */
 #include "global.h"  #include "global.h"
   
   
 /*  /*
 * cli_Cmd_Exit() Builtin helper function for Exit from Cli * cli_Cmd_Exit() - Builtin helper function for Exit from Cli
 * @buffer = CLI buffer *
 * @idx = Selected command ID * @cli_buffer = CLI buffer
  * @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 buffer, int idx, char ** __restrict args)int
 cli_Cmd_Exit(void * __restrict cli_buffer, int idx, char ** __restrict args)
 {  {
        cli_Printf(buffer, "\n");        cli_Printf(cli_buffer, "\n");
         return RETCODE_EOF;          return RETCODE_EOF;
 }  }
   
 /*  /*
 * cli_Cmd_Help() Builtin helper function for Help screen * cli_Cmd_Help() - Builtin helper function for Help screen
 * @buffer = CLI buffer *
 * @idx = Selected command ID * @cli_buffer = CLI buffer
  * @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 buffer, int idx, char ** __restrict args)int
 cli_Cmd_Help(void * __restrict cli_buffer, int idx, char ** __restrict args)
 {  {
        linebuffer_t *buf = buffer;        linebuffer_t *buf = cli_buffer;
         struct tagCommand *cmd;          struct tagCommand *cmd;
   
        if (!buffer) {        if (!cli_buffer) {
                cli_SetErr(EINVAL, "Error:: invalid input parameters ...");                cli_SetErr(EINVAL, "Invalid input parameters ...");
                 return RETCODE_ERR;                  return RETCODE_ERR;
         }          }
   
         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 51  int cli_Cmd_Help(void * __restrict buffer, int idx, ch Line 96  int cli_Cmd_Help(void * __restrict 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 (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);
                 }                  }
         }          }
        cli_Printf(buffer, "\r");        cli_Printf(cli_buffer, "\r");
   
         return RETCODE_OK;          return RETCODE_OK;
 }  }
   
 /*  /*
 * cli_Cmd_Unsupported() Builtin helper function for unsupported commands * cli_Cmd_Unsupported() - Builtin helper function for unsupported commands
 * @buffer = CLI buffer *
 * @idx = Selected command ID * @cli_buffer = CLI buffer
  * @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 buffer, int idx, char ** __restrict args)int
 cli_Cmd_Unsupported(void * __restrict cli_buffer, int idx, char ** __restrict args)
 {  {
        cli_Printf(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.2  
changed lines
  Added in v.1.7


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