--- libaitio/inc/aitio.h 2010/09/08 08:10:09 1.4.2.7 +++ libaitio/inc/aitio.h 2010/09/27 16:08:37 1.5.2.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitio.h,v 1.4.2.7 2010/09/08 08:10:09 misho Exp $ +* $Id: aitio.h,v 1.5.2.1 2010/09/27 16:08:37 misho Exp $ * *************************************************************************/ #ifndef __AITIO_H @@ -29,7 +29,19 @@ struct tagIOURL { char *url_reserved; }; +struct tagReqXML { + unsigned char xml_line[BUFSIZ]; + url_Item_t xml_namespace; + url_Item_t xml_container; + 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 inline int io_GetErrno(); // io_GetError() Get error text of last operation @@ -192,6 +204,24 @@ int ioURLGetFile(struct tagIOURL *url, char * __restri /* + * 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); + + +/* * io_rread() Raw VFS read function * @fd = File handle * @buf = Read buffer @@ -229,19 +259,27 @@ extern int io_Debug; if ((x) <= io_Debug) \ syslog(LOG_DEBUG, "ioDebug(%d):%s(%d): %s\n", \ (x), __func__, __LINE__, str); \ - } while(0) + } while (0) -#define io_sysERROR() do { \ - if (errno) \ +#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__, errno, strerror(errno)); \ - } while(0) + __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) + } while (0) #endif