--- libaitio/inc/aitio.h	2010/03/04 09:54:23	1.1.1.1.2.4
+++ libaitio/inc/aitio.h	2010/07/05 11:01:56	1.4.2.3
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitio.h,v 1.1.1.1.2.4 2010/03/04 09:54:23 misho Exp $
+* $Id: aitio.h,v 1.4.2.3 2010/07/05 11:01:56 misho Exp $
 *
 *************************************************************************/
 #ifndef __AITIO_H
@@ -29,6 +29,7 @@ struct tagIOURL {
 	char		*url_reserved;
 };
 
+
 // io_GetErrno() Get error code of last operation
 inline int io_GetErrno();
 // io_GetError() Get error text of last operation
@@ -83,11 +84,24 @@ int ioRegexGet(const char *csRegex, const char *csData
 char *ioRegexReplace(const char *csRegex, const char *csData, const char *csNew);
 
 /*
+ * io_Path2File() Parse and make path/filename pair
+ * @csArgs = Input argument line
+ * @psPath = Output Path, if ==NULL path not returned
+ * @pathLen = Size of path array
+ * @psFile = Output File
+ * @fileLen = Size of file array
+ * return: 0 error format; -1 error:: can`t read; >0 ok, number of readed items
+*/
+inline int io_Path2File(const char * __restrict csArgs, char * __restrict psPath, int pathLen, 
+		char * __restrict psFile, int fileLen);
+/*
  * io_MakeAV() Parse and make attribute/value pair
  * @csArgs = Input argument line
  * @csDelim = Delimiter for separate
  * @psAttr = Output Attribute
+ * @attrLen = Size of attribute array
  * @psValue = Output Value, if ==NULL this element not present value or not wanted for return
+ * @valLen = Size of value array
  * return: 0 error format; -1 error:: can`t read; >0 ok, number of readed items
 */
 inline int io_MakeAV(const char * __restrict csArgs, const char *csDelim, 
@@ -100,17 +114,57 @@ inline int io_MakeAV(const char * __restrict csArgs, c
 */
 inline int io_SizeArray(const char *csArgs, const char *csDelim);
 /*
- * io_MakeArray() Parse and make array of arguments values
- * @psArgs = Input arguments line
+ * io_MakeArray() Parse and make array of arguments values ... 
+ *	(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
  * @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
 */
 inline int io_MakeArray(char * __restrict psArgs, const char *csDelim, 
 		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_Char2Hex() 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)
+*/
+inline char *io_Char2Hex(unsigned char *psLine, int lineLen);
+/*
+ * io_Hex2Char() 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);
+
+/*
  * ioURLGet() Parse and get data from input URL
  * @csURL = Input URL line
  * @url = Output parsed URL
@@ -127,6 +181,40 @@ int ioURLGet(const char *csURL, struct tagIOURL *url);
  * return: 0 error attribute not find; -1 error:: can`t read; >0 ok, find at position
 */
 int ioURLGetValue(struct tagIOURL *url, const char *csAttr, char * __restrict psValue, int valLen);
+/*
+ * ioURLGetFile() Get file from parsed URL
+ * @url = Input parsed URL
+ * @psValue = Return filename, if not specified file in url path, replace with /
+ * @valLen = Size of psValue array
+ * return: -1 error:: can`t read; 0 ok
+*/
+int ioURLGetFile(struct tagIOURL *url, char * __restrict psValue, int valLen);
+
+
+/*
+ * 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)
 
 
 #endif