--- libaitcli/src/cli.c 2010/06/04 12:46:27 1.1.1.1.4.1 +++ libaitcli/src/cli.c 2012/07/22 22:36:21 1.3.2.1 @@ -3,76 +3,112 @@ * by Michael Pounov * * $Author: misho $ -* $Id: cli.c,v 1.1.1.1.4.1 2010/06/04 12:46:27 misho Exp $ +* $Id: cli.c,v 1.3.2.1 2012/07/22 22:36:21 misho Exp $ * -*************************************************************************/ +************************************************************************** +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 + +Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 + by Michael Pounov . 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 +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" /* * cli_Cmd_Exit() Builtin helper function for Exit from Cli - * @cmds = Commands list + * @buffer = CLI buffer * @idx = Selected command ID - * @out = Output handle * @args = Parsed arguments array - * return: 1 exit from Cli! + * return: RETCODE_EOF exit from Cli! */ -int cli_Cmd_Exit(void *cmds, int idx, FILE *out, char ** __restrict args) +int cli_Cmd_Exit(void * __restrict buffer, int idx, char ** __restrict args) { - return 1; + cli_Printf(buffer, "\n"); + return RETCODE_EOF; } /* * cli_Cmd_Help() Builtin helper function for Help screen - * @cmds = Commands list + * @buffer = CLI buffer * @idx = Selected command ID - * @out = Output handle * @args = Parsed arguments array - * return: -1 error, 0 = ok + * return: RETCODE_ERR in error or RETCODE_OK */ -/* -int cli_Cmd_Help(void *cmds, int idx, FILE *out, char ** __restrict args) +int cli_Cmd_Help(void * __restrict buffer, int idx, char ** __restrict args) { - register int i; - cliCommands_t *commands = cmds; + linebuffer_t *buf = buffer; + struct tagCommand *cmd; - if (!cmds) - return -1; + if (!buffer) { + cli_SetErr(EINVAL, "Error:: invalid input parameters ..."); + return RETCODE_ERR; + } + cli_Printf(buf, "\n"); if (!args) { - cli_Printf(out, "\n"); - for (i = 0; commands[i].cmd_name; i++) - cli_Printf(out, "%s\t\t%s\n", commands[i].cmd_name, commands[i].cmd_doc); + SLIST_FOREACH(cmd, &buf->line_cmds, cmd_next) + cli_Printf(buf, "%s\t\t%s\n", cmd->cmd_name, cmd->cmd_help); } else { if (!args[1]) - cli_Printf(out, "Help screen::\n"); + cli_Printf(buf, "Help screen::\n"); else if (!strncmp(args[1], "---", 3)) - return 0; + return RETCODE_OK; - for (i = 0; commands[i].cmd_name; i++) { - if (args[1] && strcmp(args[1], commands[i].cmd_name)) + SLIST_FOREACH(cmd, &buf->line_cmds, cmd_next) { + if (args[1] && (cmd->cmd_level != buf->line_level || strcmp(args[1], cmd->cmd_name))) continue; - cli_Printf(out, "%s%s\t\t%s\n", args[1] ? "Syntax::\n\t" : "", commands[i].cmd_name, - args[1] ? commands[i].cmd_help : commands[i].cmd_doc); + 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); } } + cli_Printf(buffer, "\r"); - return 0; + return RETCODE_OK; } -*/ /* * cli_Cmd_Unsupported() Builtin helper function for unsupported commands - * @cmds = Commands list + * @buffer = CLI buffer * @idx = Selected command ID - * @out = Output handle * @args = Parsed arguments array - * return: -1 error, 0 = ok, 1 exit from Cli! + * return: RETCODE_OK ok */ -int cli_Cmd_Unsupported(void *cmds, int idx, FILE *out, char ** __restrict args) +int cli_Cmd_Unsupported(void * __restrict buffer, int idx, char ** __restrict args) { -// cli_Printf(out, "Command %s not supported in this version ...\n", args[0]); - return 0; + cli_Printf(buffer, "Command %s not supported in this version ...\n", args[0]); + return RETCODE_OK; }