--- libaitio/inc/aitio.h	2010/09/08 13:17:04	1.4.2.8
+++ libaitio/inc/aitio.h	2011/02/10 22:01:34	1.6
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitio.h,v 1.4.2.8 2010/09/08 13:17:04 misho Exp $
+* $Id: aitio.h,v 1.6 2011/02/10 22:01:34 misho Exp $
 *
 *************************************************************************/
 #ifndef __AITIO_H
@@ -29,7 +29,20 @@ struct tagIOURL {
 	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
 inline int io_GetErrno();
 // io_GetError() Get error text of last operation
@@ -84,6 +97,13 @@ int ioRegexGet(const char *csRegex, const char *csData
 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
  * @csArgs = Input argument line
  * @psPath = Output Path, if ==NULL path not returned
@@ -192,6 +212,32 @@ 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);
+
+/*
+ * 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
@@ -229,23 +275,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_ifERROR(x)		if ((x)) \
-					syslog(LOG_ERR, "ioError(if):%s(%d): #%d - %s\n", \
-							__func__, __LINE__, (x), strerror((x))); \
-				if ((x))
-#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