Diff for /libaitcli/inc/aitcli.h between versions 1.2.2.2 and 1.2.2.6

version 1.2.2.2, 2010/06/04 12:46:27 version 1.2.2.6, 2010/06/07 11:32:50
Line 10 Line 10
 #define __AITCLI_H  #define __AITCLI_H
   
   
   #include <termios.h>
   #include <sys/queue.h>
   
   
 #define STRSIZ          256  #define STRSIZ          256
   
 /* Key definitions */  /* Key definitions */
Line 160  typedef struct { Line 164  typedef struct {
 } bindkey_t;  } bindkey_t;
   
   
   /* Commands structure for CLI */
   
   typedef int (*cmd_func_t)(/*linebuffer_t **/ void * __restrict buffer, int argc, char ** __restrict argv);
   struct tagCommand {
           int                     cmd_level;
   
           int                     cmd_len;
           char                    cmd_name[STRSIZ];
   
           char                    cmd_info[STRSIZ];
           char                    cmd_help[STRSIZ];
   
           cmd_func_t              cmd_func;
   
           SLIST_ENTRY(tagCommand) cmd_next;
   };
   typedef SLIST_HEAD(slCommandHead, tagCommand) commands_t;
   
   
 /* Main structure, Buffer for CLI work with thread models ;-) special designed by M.Punov */  /* Main structure, Buffer for CLI work with thread models ;-) special designed by M.Punov */
   
 typedef struct {  typedef struct {
Line 177  typedef struct { Line 200  typedef struct {
   
         bindkey_t               *line_keys;          bindkey_t               *line_keys;
   
           commands_t              line_cmds;
   
         int                     line_in;          int                     line_in;
         int                     line_out;          int                     line_out;
 } linebuffer_t;  } linebuffer_t;
   
 /* Commands structure for CLI */  
   
 typedef int (*cmd_func_t)(linebuffer_t * __restrict buffer, int argc, char ** __restrict argv);  
 typedef struct {  
         int                     cmd_level;  
   
         int                     cmd_min;  
         int                     cmd_len;  
         char                    cmd_name[STRSIZ];  
   
         char                    cmd_info[STRSIZ];  
         char                    cmd_help[STRSIZ];  
   
         cmd_func_t              *cmd_func;  
 } commands_t;  
   
   
 /* Error support functions */  /* Error support functions */
   
 // cli_GetErrno() Get error code of last operation  // cli_GetErrno() Get error code of last operation
Line 209  inline const char *cli_GetError(); Line 218  inline const char *cli_GetError();
 /* CLI Functions */  /* CLI Functions */
   
 /*  /*
 * cliExec() Execute CLI main loop * cli_BindKey() Bind function to key
 * @cmdList = Commands list * @key = key structure
 * @csPrompt = Prompt text * @buffer = CLI buffer
 * return: -1 error, 0 = exit w/^+D, 1 done. * return: RETCODE_ERR error, RETCODE_OK ok, >0 bind at position
 */  */
int cliExec(commands_t *cmdList, const char *csPrompt);int cli_BindKey(bindkey_t * __restrict key, linebuffer_t * __restrict buffer);
 
 
 /*  /*
 * cliNetExec() Execute net CLI main loop * cli_addCommand() Add command to CLI session
 * @cmdList = Commands list * @buffer = CLI buffer
 * @csPrompt = Prompt text * @csCmd = Command name
  * @cliLevel = Level in CLI, -1 unprivi(view from all), 0 main config, 1 sub config ...
  * @funcCmd = Callback function when user call command
  * @csInfo = Inline information for command
  * @csHelp = Help line when call help
  * return: RETCODE_ERR error, RETCODE_OK ok
 */
 int
 cli_addCommand(linebuffer_t * __restrict buffer, const char *csCmd, int cliLevel, cmd_func_t funcCmd, 
                 const char *csInfo, const char *csHelp);
 /*
  * cli_delCommand() Delete command from CLI session
  * @buffer = CLI buffer
  * @csCmd = Command name
  * @cliLevel = Level in CLI, -1 unprivi(view from all), 0 main config, 1 sub config ...
  * return: RETCODE_ERR error, RETCODE_OK ok
 */
 int
 cli_delCommand(linebuffer_t * __restrict buffer, const char *csCmd, int cliLevel);
 /*
  * cli_updCommand() Update command in CLI session
  * @buffer = CLI buffer
  * @csCmd = Command name
  * @cliLevel = Level in CLI, -1 unprivi(view from all), 0 main config, 1 sub config ...
  * @funcCmd = Callback function when user call command
  * @csInfo = Inline information for command
  * @csHelp = Help line when call help
  * return: RETCODE_ERR error, RETCODE_OK ok
 */
 int
 cli_updCommand(linebuffer_t * __restrict buffer, const char *csCmd, int cliLevel, cmd_func_t funcCmd, 
                 const char *csInfo, const char *csHelp);
 
 
 /*
  * cli_addHistory() Add line to history
  * @buffer = CLI buffer
  * @str = Add custom text or if NULL use readed line from CLI buffer
  * return: RETCODE_ERR error, RETCODE_OK ok
 */
 int cli_addHistory(linebuffer_t * __restrict buffer, const char * __restrict str);
 /*
  * cli_saveHistory() Save history to file
  * @buffer = CLI buffer
  * @histfile = History filename, if NULL will be use default name
  * @lines = Maximum history lines to save
  * return: RETCODE_ERR error, RETCODE_OK ok
 */
 int cli_saveHistory(linebuffer_t * __restrict buffer, const char *histfile, int lines);
 /*
  * cli_loadHistory() Load history from file
  * @buffer = CLI buffer
  * @histfile = History filename, if NULL will be use default name
  * return: RETCODE_ERR error, RETCODE_OK ok
 */
 int cli_loadHistory(linebuffer_t * __restrict buffer, const char *histfile);
 /*
  * cli_resetHistory() Reset history search in CLI session
  * @buffer = CLI buffer
  * return: none
 */
 inline void cli_resetHistory(linebuffer_t * __restrict buffer);
 
 /*
  * cli_freeLine() Clear entire line
  * @buffer = CLI buffer
  * return: RETCODE_ERR error, RETCODE_OK ok
 */
 inline int cli_freeLine(linebuffer_t * __restrict buffer);
 /*
  * cli_setPrompt() Set new prompt for CLI session
  * @buffer = CLI buffer
  * @prompt = new text for prompt or if NULL disable prompt
  * return: none
 */
 inline void cli_setPrompt(linebuffer_t * __restrict buffer, const char *prompt);
 /*
  * cli_Printf() Send message to CLI session
  * @buffer = CLI buffer
  * @fmt = printf format string
  * @... = arguments defined in fmt
  * return: none
 */
 inline void cli_Printf(linebuffer_t * __restrict buffer, char *fmt, ...);
 
 /*
  * cliEnd() Clear data, Free resources and close CLI session
  * @buffer = CLI buffer
  * return: RETCODE_ERR error, RETCODE_OK ok
 */
 void cliEnd(linebuffer_t * __restrict buffer);
 /*
  * cliInit() Start CLI session, allocate memory for resources and bind keys
  * @fin = Input device handle
  * @fout = Output device handle
  * @prompt = text for prompt, if NULL disable prompt
  * return: NULL if error or !=NULL CLI buffer
 */
 linebuffer_t *cliInit(int fin, int fout, const char *prompt);
 
 /*
  * cliReadLine() Read line from opened CLI session
  * @buffer = CLI buffer
  * return: NULL if error or !=NULL readed line, must be free after use!
 */
 char *cliReadLine(linebuffer_t * __restrict buffer);
 /*
  * cliLoop() CLI main loop
  * @buffer = CLI buffer
  * @csHistFile = History file name
  * return: RETCODE_ERR error, RETCODE_OK ok
 */
 int cliLoop(linebuffer_t * __restrict buffer, const char *csHistFile);
 
 /*
  * cliLoop() CLI main loop
  * @buffer = CLI buffer
  * @csHistFile = History file name
  * return: RETCODE_ERR error, RETCODE_OK ok
 */
 int cliLoop(linebuffer_t * __restrict buffer, const char *csHistFile);
 /*
  * cliNetLoop() CLI network main loop binded to socket
  * @buffer = CLI buffer
  * @csHistFile = History file name
  * @sock = client socket   * @sock = client socket
  * @term = stdin termios   * @term = stdin termios
  * @win = window size of tty   * @win = window size of tty
 * return: -1 error, 0 = exit w/^+D, 1 done. * return: RETCODE_ERR error, RETCODE_OK ok
 */  */
int cliNetExec(commands_t *cmdList, const char *csPrompt, int sock, struct termios *term, struct winsize *win);int cliNetLoop(linebuffer_t * __restrict buffer, const char *csHistFile, int sock, 
                 struct termios *term, struct winsize *win);
   
   
 /* CLI Helper functions */  /* CLI Helper functions */

Removed from v.1.2.2.2  
changed lines
  Added in v.1.2.2.6


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