--- libaitio/inc/aitio.h 2010/03/09 12:44:40 1.2.2.1 +++ libaitio/inc/aitio.h 2010/03/22 15:21:20 1.3 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitio.h,v 1.2.2.1 2010/03/09 12:44:40 misho Exp $ +* $Id: aitio.h,v 1.3 2010/03/22 15:21:20 misho Exp $ * *************************************************************************/ #ifndef __AITIO_H @@ -126,11 +126,12 @@ inline int io_MakeAV(const char * __restrict csArgs, c */ inline int io_SizeArray(const char *csArgs, const char *csDelim); /* - * io_MakeArray() Parse and make array of arguments values - * @psArgs = Input arguments line + * io_MakeArray() Parse and make array of arguments values ... + * (input string will be modified! and output array must be free) + * @psArgs = Input arguments line, after execute string is modified!!! * @csDelim = Delimiter(s) for separate * @args = Output array of arguments ... (must be free() after procced function!) - * @nargs = Requested count of arguments + * @nargs = Maximum requested count of arguments from input string psArgs * return: 0 error format; -1 error:: can`t read; >0 ok, number of readed items */ inline int io_MakeArray(char * __restrict psArgs, const char *csDelim, @@ -163,14 +164,12 @@ int ioURLGetValue(struct tagIOURL *url, const char *cs int ioURLGetFile(struct tagIOURL *url, char * __restrict psValue, int valLen); /* - * ioCLIInit() Initialize CLI features - * @cmdList = Commands list - * @out = Output handle + * ioCLIComp() Initialize completion CLI features * @cmdComplete = Completion function * @cmdEntry = Compentry function * return: none */ -void ioCLIInit(ioCommands_t *cmdList, FILE *out, io_Completion_t *cmdComplete, io_CompEntry_t *cmdEntry); +inline void ioCLIComp(io_Completion_t *cmdComplete, io_CompEntry_t *cmdEntry); /* * ioCLIExec() Execute CLI main loop * @cmdList = Commands list @@ -179,6 +178,56 @@ void ioCLIInit(ioCommands_t *cmdList, FILE *out, io_Co * return: -1 error, 0 = exit w/^+D, 1 done. */ int ioCLIExec(ioCommands_t *cmdList, FILE *out, const char *csPrompt); + +/* + * io_Cmd_Unsupported() Builtin helper function for unsupported commands + * @cmds = Commands list + * @out = Output handle + * @args = Parsed arguments array + * return: -1 error, 0 = ok, 1 exit from Cli! +*/ +int io_Cmd_Unsupported(void *cmds, FILE *out, char ** __restrict args); +/* + * io_Cmd_Help() Builtin helper function for Help screen + * @cmds = Commands list + * @out = Output handle + * @args = Parsed arguments array + * return: -1 error, 0 = ok +*/ +int io_Cmd_Help(void *cmds, FILE *out, char ** __restrict args); +/* + * io_Cmd_Exit() Builtin helper function for Exit from Cli + * @cmds = Commands list + * @out = Output handle + * @args = Parsed arguments array + * return: 1 exit from Cli! +*/ +int io_Cmd_Exit(void *cmds, FILE *out, char ** __restrict args); + + +/* + * io_Make_Comp_Commands - Declare helper function for Commands completion arguments +*/ +#define IO_MAKE_COMP_COMMANDS(FUNC, CMDS) \ + char *FUNC(const char *text, int state) \ + { \ + register int i; \ + int len = strlen(text); \ + for (i = state; CMDS[i].cmd_name; i++) { \ + if (strncmp(CMDS[i].cmd_name, "---", 3) && \ + !strncmp(CMDS[i].cmd_name, text, len)) \ + return strdup(CMDS[i].cmd_name); \ + } \ + return NULL; \ + } + +/* + * io_Comp_Filename() Builtin helper function for filename completion arguments + * @text = Text line + * @state = Position state + * return: NULL not found filename, != NULL filename +*/ +char *io_Comp_Filename(const char *text, int state); #endif