[BACK]Return to aitio.h CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / libaitio / inc

Diff for /libaitio/inc/aitio.h between versions 1.4 and 1.5.2.1

version 1.4, 2010/04/16 13:25:27 version 1.5.2.1, 2010/09/27 16:08:37
Line 29  struct tagIOURL { Line 29  struct tagIOURL {
         char            *url_reserved;          char            *url_reserved;
 };  };
   
struct tagIOCmd {struct tagReqXML {
        const char *cmd_name;        unsigned char   xml_line[BUFSIZ];
        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;        url_Item_t      xml_namespace;
typedef char *io_CompEntry_t(const char *, int);        url_Item_t      xml_container;
typedef char **io_Completion_t(const char *, int, int);        url_Item_t      xml_data;
         url_Item_t      xml_attribute;
         url_Item_t      xml_value;
   
           char            *xml_reserved;
   };
   
   
 // io_GetErrno() Get error code of last operation  // io_GetErrno() Get error code of last operation
 inline int io_GetErrno();  inline int io_GetErrno();
 // io_GetError() Get error text of last operation  // io_GetError() Get error text of last operation
Line 142  inline int io_MakeArray(char * __restrict psArgs, cons Line 142  inline int io_MakeArray(char * __restrict psArgs, cons
  * @psLine = Text string   * @psLine = Text string
  * return: 0 nothing to do; 1 successful unquoted 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   * io_LTrimStr() Remove left whitespaces from text string
  * @psLine = Text string   * @psLine = Text string
  * return: 0 nothing to do; !=0 Removed bytes   * 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   * io_RTrimStr() Remove right whitespaces from text string
  * @psLine = Text string   * @psLine = Text string
  * return: 0 nothing to do; !=0 Removed bytes   * 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   * io_TrimStr() Remove left and right whitespaces from text string
  * @psLine = Text string   * @psLine = Text string
  * return: 0 nothing to do; !=0 Removed bytes   * 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   * @psLine = Text string
  * @lineLen = Length of 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   * @psLine = Text string
  * @lineLen = Length of 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 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   * ioURLGet() Parse and get data from input URL
Line 202  int ioURLGetValue(struct tagIOURL *url, const char *cs Line 202  int ioURLGetValue(struct tagIOURL *url, const char *cs
 */  */
 int ioURLGetFile(struct tagIOURL *url, char * __restrict psValue, int valLen);  int ioURLGetFile(struct tagIOURL *url, char * __restrict psValue, int valLen);
   
   
 /*  /*
 * ioCLIComp() Initialize completion CLI features * ioXMLGet() Parse and get data from input XML request string [ns:]container[|attribute[=value]][?data]
 * @cmdComplete = Completion function * @csXML = Input XML request line
 * @cmdEntry = Compentry function * @xml = Output parsed XML request
 * return: none * return: 0 error format incorrect, -1 error:: can`t read; >0 ok readed elements bits
 */  */
inline void ioCLIComp(io_Completion_t *cmdComplete, io_CompEntry_t *cmdEntry);int ioXMLGet(const char *csXML, struct tagReqXML *xml);
 
 
 /*  /*
 * ioCLIExec() Execute CLI main loop * ioMkDir() Function for racursive directory creation and validation
 * @cmdList = Commands list * @csDir = Full directory path
 * @out = Output handle * @mode = Mode for directory creation if missing dir
 * @csPrompt = Prompt text * return: -1 error, 0 directory path exist, >0 created missing dirs
 * 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 * io_rread() Raw VFS read function
 * @cmds = Commands list * @fd = File handle
 * @out = Output handle * @buf = Read buffer
 * @args = Parsed arguments array * @nbytes = Read buffer size
 * return: -1 error, 0 = ok, 1 exit from Cli! * @offset = Read from position, if -1 read nbytes from current position
*/ * @update = Update file handle position !0
int io_Cmd_Unsupported(void *cmds, FILE *out, char ** __restrict args); * 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 * io_rwrite() Raw VFS write function
 * @cmds = Commands list * @fd = File handle
 * @out = Output handle * @buf = Write buffer
 * @args = Parsed arguments array * @nbytes = Write bytes from buffer
 * return: -1 error, 0 = ok * @offset = Write at position, if -1 write nbytes from current position
*/ * @update = Update file handle position !0
int io_Cmd_Help(void *cmds, FILE *out, char ** __restrict args); * return: -1 error or !=-1 writed bytes
/* */
 * io_Cmd_Exit() Builtin helper function for Exit from Cliinline int io_rwrite(int fd, void * __restrict buf, size_t nbytes, off_t offset, int update);
 * @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); 
   
   /* 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; \  
         }  
   
/*/* Debug helper macros */
 * io_Make_Comp_Args - Declare helper function for Arguments completionextern int io_Debug;
*/ 
#define IO_MAKE_COMP_ARGS(FUNC, ARGS)   \ 
        char *FUNC(const char *text __attribute__((unused)), int state) \ 
        { \ 
                while (ARGS[state]) \ 
                        return strdup(ARGS[state]); \ 
                return NULL; \ 
        } 
   
/*#define io_initDebug(x)            io_Debug = (x);
 * io_Comp_Filename() Builtin helper function for filename completion arguments#define io_addDebug             io_Debug++
 * @text = Text line#define ioDEBUG(x, fmt, ...)    do { \
 * @state = Position state                                        assert((fmt)); \
 * return: NULL not found filename, != NULL filename                                        char str[STRSIZ] = { 0 }; \
*/                                        snprintf(str, STRSIZ, (fmt), ##__VA_ARGS__); \
char *io_Comp_Filename(const char *text, int state);                                        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  #endif
Removed from v.1.4  
changed lines
  Added in v.1.5.2.1

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