[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.4 and 1.6.4.2

version 1.4, 2012/07/22 22:37:08 version 1.6.4.2, 2013/10/08 09:38:55
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, 2012Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
         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 47  SUCH DAMAGE. Line 47  SUCH DAMAGE.
   
   
 /*  /*
 * cli_Cmd_Exit() Builtin helper function for Exit from Cli * cli_Cmd_Exit() - Builtin helper function for Exit from Cli
 * @buffer = CLI buffer *
  * @cli_buffer = CLI buffer
  * @idx = Selected command ID   * @idx = Selected command ID
  * @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 *
  * @cli_buffer = CLI buffer
  * @idx = Selected command ID   * @idx = Selected command ID
  * @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 != 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 88  int cli_Cmd_Help(void * __restrict buffer, int idx, ch Line 94  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 != idx)
                                 continue;                                  continue;
                           if (args[1] && (cmd->cmd_level != 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 *
  * @cli_buffer = CLI buffer
  * @idx = Selected command ID   * @idx = Selected command ID
  * @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;          return RETCODE_OK;
 }  }
Removed from v.1.4  
changed lines
  Added in v.1.6.4.2

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