[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.2 and 1.7

version 1.2, 2010/03/09 09:26:27 version 1.7, 2011/04/19 20:00:31
Line 10 Line 10
 #define __AITIO_H  #define __AITIO_H
   
   
   #include <openssl/evp.h>
   
   
 typedef struct _tagURLItem {  typedef struct _tagURLItem {
         int     vallen;          int     vallen;
         char    *value;          char    *value;
Line 29  struct tagIOURL { Line 32  struct tagIOURL {
         char            *url_reserved;          char            *url_reserved;
 };  };
   
   struct tagReqXML {
           unsigned char   xml_line[BUFSIZ];
   
           url_Item_t      xml_namespace;
           union {
                   url_Item_t      container;
                   url_Item_t      path;
           }               xml_node;
           url_Item_t      xml_data;
           url_Item_t      xml_attribute;
           url_Item_t      xml_value;
   };
   
   
 // 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 83  int ioRegexGet(const char *csRegex, const char *csData Line 100  int ioRegexGet(const char *csRegex, const char *csData
 char *ioRegexReplace(const char *csRegex, const char *csData, const char *csNew);  char *ioRegexReplace(const char *csRegex, const char *csData, const char *csNew);
   
 /*  /*
    * ioVarAst() Function for evaluate string like asterisk variable "{text[:[-]#[:#]]}"
    * @csString = Input string
    * return: NULL error, !=NULL Allocated new string evaluated from input string, must be free()
   */
   char *ioVarAst(const char *csString);
   
   /*
  * io_Path2File() Parse and make path/filename pair   * io_Path2File() Parse and make path/filename pair
  * @csArgs = Input argument line   * @csArgs = Input argument line
  * @psPath = Output Path, if ==NULL path not returned   * @psPath = Output Path, if ==NULL path not returned
Line 113  inline int io_MakeAV(const char * __restrict csArgs, c Line 137  inline int io_MakeAV(const char * __restrict csArgs, c
 */  */
 inline int io_SizeArray(const char *csArgs, const char *csDelim);  inline int io_SizeArray(const char *csArgs, const char *csDelim);
 /*  /*
 * io_MakeArray() Parse and make array of arguments values * io_MakeArray() Parse and make array of arguments values ... 
 * @psArgs = Input arguments line *      (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   * @csDelim = Delimiter(s) for separate
  * @args = Output array of arguments ... (must be free() after procced function!)   * @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   * 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,   inline int io_MakeArray(char * __restrict psArgs, const char *csDelim, 
                 char *** __restrict args, int nargs);                  char *** __restrict args, int nargs);
   
 /*  /*
    * io_UnquotStr() Remove quots from input text string 
    * @psLine = Text string
    * return: 0 nothing to do; 1 successful unquoted string
   */
   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 * __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 * __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 * __restrict psLine);
   /*
    * 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 data without term\0 (must be free)
   */
   inline unsigned char *io_Ch2Hex(unsigned char *psLine, int lineLen);
   /*
    * 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_Hex2Ch(unsigned char *psLine, int lineLen);
   
   /*
  * ioURLGet() Parse and get data from input URL   * ioURLGet() Parse and get data from input URL
  * @csURL = Input URL line   * @csURL = Input URL line
  * @url = Output parsed URL   * @url = Output parsed URL
Line 148  int ioURLGetValue(struct tagIOURL *url, const char *cs Line 212  int ioURLGetValue(struct tagIOURL *url, const char *cs
  * return: -1 error:: can`t read; 0 ok   * return: -1 error:: can`t read; 0 ok
 */  */
 int ioURLGetFile(struct tagIOURL *url, char * __restrict psValue, int valLen);  int ioURLGetFile(struct tagIOURL *url, char * __restrict psValue, int valLen);
   
   
   /*
    * ioXMLGet() Parse and get data from input XML request string [ns:]container[|attribute[=value]][?data]
    * @csXML = Input XML request line
    * @xml = Output parsed XML request
    * return: 0 error format incorrect, -1 error:: can`t read; >0 ok readed elements bits
   */
   int ioXMLGet(const char *csXML, struct tagReqXML *xml);
   
   
   /*
    * 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
   */
   int ioMkDir(const char *csDir, int mode);
   
   /*
    * ioWatchDirLoop() Function for watching changes in directory and fire callback
    * @csDir = Full directory path
    * @callback = Callback if raise event! nOp -1 delete, 0 change/move, 1 create
    * return: -1 error, !=-1 ok, number of total signaled events
   */
   int ioWatchDirLoop(const char *csDir, int (*callback)(const char *csName, int nOp));
   
   
   /*
    * 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_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)
   
   
   /* 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)
   
   
   /* Crypto framework */
   
   /*
    * ioCipher() Cipher wrapper for all supported crypto algorythms
    * @pInput = input buffer
    * @inLen = input buffer len
    * @ppOutput = output allocated buffe, must be free after use
    * @Cipher = cipher engine, like EVP_bf_cbc() or etc...
    * @pKey = key
    * @pIV = IV, salt (8 bytes)
    * @nMode = Mode 0 - decrypting or 1 - encrypting
    * return: 0 not present data or error!; >0 number of processed and returned bytes into ppOutput
   */
   int ioCipher(unsigned char *pInput, int inLen, unsigned char **ppOutput, const EVP_CIPHER *Cipher, 
                   unsigned char *pKey, unsigned char *pIV, int nMode);
   
   /*
    * io_Blowfish() Blowfish cipher algorythm, work with ASCII hex strings
    * @pInput = input buffer
    * @inLen = input buffer len
    * @ppOutput = output allocated buffe, must be free after use
    * @pKey = key
    * @pIV = IV, salt (8 bytes)
    * @nMode = Mode 0 - decrypting or 1 - encrypting
    * return: 0 not present data or error!; >0 number of processed and returned bytes into ppOutput
   */
   int io_Blowfish(u_char *pInput, int inLen, u_char **ppOutput, u_char *pKey, u_char *pIV, int nMode);
   
   
 #endif  #endif
Removed from v.1.2  
changed lines
  Added in v.1.7

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