--- libaitio/inc/aitio.h	2010/03/09 12:44:40	1.2.2.1
+++ libaitio/inc/aitio.h	2010/07/05 09:25:06	1.4.2.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitio.h,v 1.2.2.1 2010/03/09 12:44:40 misho Exp $
+* $Id: aitio.h,v 1.4.2.2 2010/07/05 09:25:06 misho Exp $
 *
 *************************************************************************/
 #ifndef __AITIO_H
@@ -29,19 +29,7 @@ struct tagIOURL {
 	char		*url_reserved;
 };
 
-struct tagIOCmd {
-	const char *cmd_name;
-	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;
-typedef char *io_CompEntry_t(const char *, int);
-typedef char **io_Completion_t(const char *, int, int);
-
-
 // io_GetErrno() Get error code of last operation
 inline int io_GetErrno();
 // io_GetError() Get error text of last operation
@@ -126,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
@@ -162,23 +190,31 @@ int ioURLGetValue(struct tagIOURL *url, const char *cs
 */
 int ioURLGetFile(struct tagIOURL *url, char * __restrict psValue, int valLen);
 
+
 /*
- * ioCLIInit() Initialize CLI features
- * @cmdList = Commands list
- * @out = Output handle
- * @cmdComplete = Completion function
- * @cmdEntry = Compentry function
- * return: none
-*/
-void ioCLIInit(ioCommands_t *cmdList, FILE *out, io_Completion_t *cmdComplete, io_CompEntry_t *cmdEntry);
+ * io_rread() Raw 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);
 /*
- * ioCLIExec() Execute CLI main loop
- * @cmdList = Commands list
- * @out = Output handle
- * @csPrompt = Prompt text
- * return: -1 error, 0 = exit w/^+D, 1 done.
-*/
-int ioCLIExec(ioCommands_t *cmdList, FILE *out, const char *csPrompt);
+ * io_rwrite() Raw 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