--- libaitio/inc/aitio.h	2010/03/22 15:21:20	1.3
+++ 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.3 2010/03/22 15:21:20 misho Exp $
+* $Id: aitio.h,v 1.4.2.3 2010/07/05 11:01:56 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
@@ -138,6 +126,45 @@ inline int io_MakeArray(char * __restrict psArgs, cons
 		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
@@ -163,71 +190,31 @@ int ioURLGetValue(struct tagIOURL *url, const char *cs
 */
 int ioURLGetFile(struct tagIOURL *url, char * __restrict psValue, int valLen);
 
-/*
- * ioCLIComp() Initialize completion CLI features
- * @cmdComplete = Completion function
- * @cmdEntry = Compentry function
- * return: none
-*/
-inline void ioCLIComp(io_Completion_t *cmdComplete, io_CompEntry_t *cmdEntry);
-/*
- * 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_Cmd_Unsupported() Builtin helper function for unsupported commands
- * @cmds = Commands list
- * @out = Output handle
- * @args = Parsed arguments array
- * return: -1 error, 0 = ok, 1 exit from Cli!
-*/
-int io_Cmd_Unsupported(void *cmds, FILE *out, char ** __restrict args);
+ * 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_Cmd_Help() Builtin helper function for Help screen
- * @cmds = Commands list
- * @out = Output handle
- * @args = Parsed arguments array
- * return: -1 error, 0 = ok
-*/
-int io_Cmd_Help(void *cmds, FILE *out, char ** __restrict args);
-/*
- * io_Cmd_Exit() Builtin helper function for Exit from Cli
- * @cmds = Commands list
- * @out = Output handle
- * @args = Parsed arguments array
- * return: 1 exit from Cli!
-*/
-int io_Cmd_Exit(void *cmds, FILE *out, char ** __restrict args);
+ * 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);
 
-
-/*
- * io_Make_Comp_Commands - Declare helper function for Commands completion arguments
-*/
-#define IO_MAKE_COMP_COMMANDS(FUNC, CMDS)	\
-	char *FUNC(const char *text, int state) \
-	{ \
-		register int i; \
-		int len = strlen(text); \
-		for (i = state; CMDS[i].cmd_name; i++) { \
-			if (strncmp(CMDS[i].cmd_name, "---", 3) && \
-					!strncmp(CMDS[i].cmd_name, text, len)) \
-				return strdup(CMDS[i].cmd_name); \
-		} \
-		return NULL; \
-	}
-
-/*
- * io_Comp_Filename() Builtin helper function for filename completion arguments
- * @text = Text line
- * @state = Position state
- * return: NULL not found filename, != NULL filename
-*/
-char *io_Comp_Filename(const char *text, int state);
+/* 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