--- libaitio/inc/aitio.h 2010/04/05 08:51:34 1.3.2.4 +++ libaitio/inc/aitio.h 2010/09/10 12:39:41 1.5 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitio.h,v 1.3.2.4 2010/04/05 08:51:34 misho Exp $ +* $Id: aitio.h,v 1.5 2010/09/10 12:39:41 misho Exp $ * *************************************************************************/ #ifndef __AITIO_H @@ -29,19 +29,7 @@ struct tagIOURL { char *url_reserved; }; -struct tagIOCmd { - const char *cmd_name; - int (*cmd_func)(void *, FILE *, char **); - const char *cmd_doc; - const char *cmd_help; - char *(*cmd_comp)(const char *, int); -}; -typedef struct tagIOCmd ioCommands_t; -typedef char *io_CompEntry_t(const char *, int); -typedef char **io_Completion_t(const char *, int, int); - - // io_GetErrno() Get error code of last operation inline int io_GetErrno(); // io_GetError() Get error text of last operation @@ -142,39 +130,39 @@ inline int io_MakeArray(char * __restrict psArgs, cons * @psLine = Text string * return: 0 nothing to do; 1 successful unquoted string */ -inline int io_UnquotStr(unsigned char *psLine); +inline int io_UnquotStr(unsigned char * __restrict psLine); /* * io_LTrimStr() Remove left whitespaces from text string * @psLine = Text string * return: 0 nothing to do; !=0 Removed bytes */ -inline int io_LTrimStr(unsigned char *psLine); +inline int io_LTrimStr(unsigned char * __restrict psLine); /* * io_RTrimStr() Remove right whitespaces from text string * @psLine = Text string * return: 0 nothing to do; !=0 Removed bytes */ -inline int io_RTrimStr(unsigned char *psLine); +inline int io_RTrimStr(unsigned char * __restrict psLine); /* * io_TrimStr() Remove left and right whitespaces from text string * @psLine = Text string * return: 0 nothing to do; !=0 Removed bytes */ -inline int io_TrimStr(unsigned char *psLine); +inline int io_TrimStr(unsigned char * __restrict psLine); /* - * io_Char2Hex() Convert from Char string to Hex string + * io_Ch2Hex() Convert from Char string to Hex string * @psLine = Text string * @lineLen = Length of Text string - * return: NULL nothing to do or error; !=0 Allocated new converted string(must be free) + * return: NULL nothing to do or error; !=0 Allocated new converted data without term\0 (must be free) */ -inline char *io_Char2Hex(unsigned char *psLine, int lineLen); +inline unsigned char *io_Ch2Hex(unsigned char *psLine, int lineLen); /* - * io_Hex2Char() Convert from Hex string to Char string + * io_Hex2Ch() Convert from Hex string to Char string * @psLine = Text string * @lineLen = Length of Text string * return: NULL nothing to do or error; !=0 Allocated new converted string(must be free) */ -inline char *io_Hex2Char(unsigned char *psLine, int lineLen); +inline char *io_Hex2Ch(unsigned char *psLine, int lineLen); /* * ioURLGet() Parse and get data from input URL @@ -202,71 +190,75 @@ int ioURLGetValue(struct tagIOURL *url, const char *cs */ int ioURLGetFile(struct tagIOURL *url, char * __restrict psValue, int valLen); + /* - * ioCLIComp() Initialize completion CLI features - * @cmdComplete = Completion function - * @cmdEntry = Compentry function - * return: none + * ioMkDir() Function for racursive directory creation and validation + * @csDir = Full directory path + * @mode = Mode for directory creation if missing dir + * return: -1 error, 0 directory path exist, >0 created missing dirs */ -inline void ioCLIComp(io_Completion_t *cmdComplete, io_CompEntry_t *cmdEntry); -/* - * ioCLIExec() Execute CLI main loop - * @cmdList = Commands list - * @out = Output handle - * @csPrompt = Prompt text - * return: -1 error, 0 = exit w/^+D, 1 done. -*/ -int ioCLIExec(ioCommands_t *cmdList, FILE *out, const char *csPrompt); +int ioMkDir(const char *csDir, int mode); + /* - * 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_rread() Raw VFS read function + * @fd = File handle + * @buf = Read buffer + * @nbytes = Read buffer size + * @offset = Read from position, if -1 read nbytes from current position + * @update = Update file handle position !0 + * return: -1 error or !=-1 readed bytes + */ +inline int io_rread(int fd, void * __restrict buf, size_t nbytes, off_t offset, int update); /* - * 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_rwrite() Raw VFS write function + * @fd = File handle + * @buf = Write buffer + * @nbytes = Write bytes from buffer + * @offset = Write at position, if -1 write nbytes from current position + * @update = Update file handle position !0 + * return: -1 error or !=-1 writed bytes + */ +inline int io_rwrite(int fd, void * __restrict buf, size_t nbytes, off_t offset, int update); +/* Disk I/O helper macros */ +#define io_read(f, b, n) io_rread(f, b, n, -1, 1) +#define io_write(f, b, n) io_rwrite(f, b, n, -1, 1) -/* - * 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); +/* Debug helper macros */ +extern int io_Debug; + +#define io_initDebug(x) io_Debug = (x); +#define io_addDebug io_Debug++ +#define ioDEBUG(x, fmt, ...) do { \ + assert((fmt)); \ + char str[STRSIZ] = { 0 }; \ + snprintf(str, STRSIZ, (fmt), ##__VA_ARGS__); \ + if ((x) <= io_Debug) \ + syslog(LOG_DEBUG, "ioDebug(%d):%s(%d): %s\n", \ + (x), __func__, __LINE__, str); \ + } while (0) + +#define ioERROR(x, fmt, ...) do { \ + assert((fmt)); \ + char str[STRSIZ] = { 0 }; \ + snprintf(str, STRSIZ, (fmt), ##__VA_ARGS__); \ + syslog(LOG_ERR, "ioError():%s(%d): #%d - %s\n", \ + __func__, __LINE__, (x), str); \ + } while (0) +#define io_sysERROR(x) do { \ + if (x > 0 || errno) \ + syslog(LOG_ERR, "ioError(sys):%s(%d): #%d - %s\n", \ + __func__, __LINE__, x > 0 ? x : errno, \ + strerror(x > 0 ? x : errno)); \ + } while (0) +#define io_aitERROR(ait) do { \ + if (ait##_GetErrno()) \ + syslog(LOG_ERR, "ioError(ait):%s(%d): #%d - %s\n", \ + __func__, __LINE__, ait##_GetErrno(), \ + ait##_GetError()); \ + } while (0) #endif