--- libaitio/src/aitio.c	2011/12/13 02:23:08	1.8
+++ libaitio/src/aitio.c	2012/08/01 08:51:00	1.11.8.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: aitio.c,v 1.8 2011/12/13 02:23:08 misho Exp $
+* $Id: aitio.c,v 1.11.8.1 2012/08/01 08:51:00 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -12,7 +12,7 @@ terms:
 All of the documentation and software included in the ELWIX and AITNET
 Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
 
-Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
+Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -47,10 +47,22 @@ SUCH DAMAGE.
 
 
 int io_Debug;
+mpool_t *io_mpool;
 
 
+/* Memory management */
+
+void *(*io_malloc)(size_t) = malloc;
+void *(*io_calloc)(size_t, size_t) = calloc;
+void *(*io_realloc)(void*, size_t) = realloc;
+char *(*io_strdup)(const char*) = strdup;
+void (*io_free)(void*) = free;
+
+
 #pragma GCC visibility push(hidden)
 
+int use_mm;
+
 int io_Errno;
 char io_Error[STRSIZ];
 
@@ -84,9 +96,94 @@ io_SetErr(int eno, char *estr, ...)
 	va_end(lst);
 }
 
+// io_mm_inuse() Check for memory management model
+inline int
+io_mm_inuse()
+{
+	return use_mm & IO_MPOOL;
+}
 
+
+// init libaitio routine
+void
+_init()
+{
+	ioLibInit(IO_MPOOL, 0);
+}
+
+// fini libaitio routine
+void
+_fini()
+{
+	ioLibFini();
+}
+
 /*
- * ioPromptRead() Read data from input h[0] with prompt to output h[1]
+ * ioLibInit() - Init libaitio library memory management
+ *
+ * @mm = memory management (IO_SYSM or IO_MPOOL)
+ * @maxmem = memory limit
+ * return: -1 error or !=-1 used memory management model
+ */
+inline int
+ioLibInit(int mm, u_long maxmem)
+{
+	switch (mm) {
+		case IO_MPOOL:	/* mpool */
+			io_mpool = mpool_init(maxmem);
+			if (io_mpool) {
+				io_malloc = mpool_xmalloc;
+				io_calloc = mpool_xcalloc;
+				io_realloc = mpool_xrealloc;
+				io_strdup = mpool_xstrdup;
+				io_free = mpool_xfree;
+				use_mm = mm;
+				break;
+			} else {
+				#undef USE_MPOOL
+			}
+		case IO_SYSM: 	/* system */
+			io_malloc = malloc;
+			io_calloc = calloc;
+			io_realloc = realloc;
+			io_strdup = strdup;
+			io_free = free;
+			use_mm = mm;
+			break;
+		default:	/* not supported */
+			io_SetErr(EINVAL, "Not supported memory management");
+			return -1;
+	}
+
+	return use_mm;
+}
+
+/*
+ * ioLibFini() - Finish libaitio library memory management
+ *
+ * return: none
+ */
+inline void
+ioLibFini()
+{
+	switch (use_mm) {
+		case IO_MPOOL:
+			mpool_destroy(&io_mpool);
+
+			io_malloc = malloc;
+			io_calloc = calloc;
+			io_realloc = realloc;
+			io_strdup = strdup;
+			io_free = free;
+			use_mm = IO_SYSM;
+			break;
+	}
+}
+
+
+/*
+ * ioPromptRead() - Read data from input h[0] with prompt to output h[1]
+ *
  * @h = file handles h[0] = input, h[1] = output, if NULL use stdin, stdout
  * @csPrompt = Prompt before input, may be NULL
  * @psData = Readed data
@@ -139,7 +236,8 @@ ioPromptRead(int *h, const char *csPrompt, char * __re
 }
 
 /*
- * ioPromptPassword() Read password from input h[0] with prompt to output h[1]
+ * ioPromptPassword() - Read password from input h[0] with prompt to output h[1]
+ *
  * @h = file handles h[0] = input, h[1] = output, if NULL use stdin, stdout
  * @csPrompt = Prompt before input, may be NULL
  * @psPass = Readed password
@@ -225,7 +323,8 @@ next:
 }
 
 /*
- * ioRegexVerify() Function for verify data match in regex expression
+ * ioRegexVerify() - Function for verify data match in regex expression
+ *
  * @csRegex = Regulare expression pattern
  * @csData = Data for check and verify
  * @startPos = Return start positions
@@ -246,7 +345,7 @@ ioRegexVerify(const char *csRegex, const char *csData,
 
 	if ((ret = regcomp(&re, csRegex, REG_EXTENDED))) {
 		regerror(ret, &re, szErr, STRSIZ);
-		io_SetErr(ret, "Error:: %s\n", szErr);
+		io_SetErr(ret, "%s", szErr);
 		regfree(&re);
 		return NULL;
 	}
@@ -264,7 +363,7 @@ ioRegexVerify(const char *csRegex, const char *csData,
 
 	if (ret) {
 		regerror(ret, &re, szErr, STRSIZ);
-		io_SetErr(ret, "Error:: %s\n", szErr);
+		io_SetErr(ret, "%s", szErr);
 		pos = NULL;
 	}
 
@@ -273,7 +372,8 @@ ioRegexVerify(const char *csRegex, const char *csData,
 }
 
 /*
- * ioRegexGet() Function for get data match in regex expression
+ * ioRegexGet() - Function for get data match in regex expression
+ *
  * @csRegex = Regulare expression pattern
  * @csData = Data from get
  * @psString = Returned string if match
@@ -303,11 +403,12 @@ ioRegexGet(const char *csRegex, const char *csData, ch
 }
 
 /*
- * ioRegexReplace() Function for replace data match in regex expression with newdata
+ * ioRegexReplace() - Function for replace data match in regex expression with newdata
+ *
  * @csRegex = Regulare expression pattern
  * @csData = Source data
  * @csNew = Data for replace
- * return: NULL not match or error; !=NULL allocated new string, must be free after use!
+ * return: NULL not match or error; !=NULL allocated new string, must be io_free after use!
 */
 char *
 ioRegexReplace(const char *csRegex, const char *csData, const char *csNew)
@@ -323,7 +424,7 @@ ioRegexReplace(const char *csRegex, const char *csData
 
 	// ___ before match
 	len = sp + 1;
-	str = malloc(len);
+	str = io_malloc(len);
 	if (!str) {
 		LOGERR;
 		return NULL;
@@ -332,7 +433,7 @@ ioRegexReplace(const char *csRegex, const char *csData
 	// * replace match *
 	if (csNew) {
 		len += strlen(csNew);
-		str = realloc(str, len);
+		str = io_realloc(str, len);
 		if (!str) {
 			LOGERR;
 			return NULL;
@@ -341,7 +442,7 @@ ioRegexReplace(const char *csRegex, const char *csData
 	}
 	// after match ___
 	len += strlen(csData) - ep;
-	str = realloc(str, len);
+	str = io_realloc(str, len);
 	if (!str) {
 		LOGERR;
 		return NULL;
@@ -352,9 +453,10 @@ ioRegexReplace(const char *csRegex, const char *csData
 }
 
 /*
- * ioStrAst() Function for evaluate string like asterisk variable "{text[:[-]#[:#]]}"
+ * ioStrAst() - 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()
+ * return: NULL error, !=NULL Allocated new string evaluated from input string, must be io_free()
 */
 char *
 ioStrAst(const char *csString)
@@ -367,12 +469,12 @@ ioStrAst(const char *csString)
 
 	if (!strchr(csString, '{') || !strrchr(csString, '}')) {
 		memset(io_Error, 0, STRSIZ);
-		snprintf(io_Error, STRSIZ, "Error:: Invalid input string format ... "
+		snprintf(io_Error, STRSIZ, "Invalid input string format ... "
 				"must be like {text[:[-]#[:#]]}");
 		io_Errno = EINVAL;
 		return NULL;
 	} else {
-		str = strdup(strchr(csString, '{') + 1);
+		str = io_strdup(strchr(csString, '{') + 1);
 		*strrchr(str, '}') = 0;
 	}
 
@@ -394,15 +496,16 @@ ioStrAst(const char *csString)
 		/* ok, clear show */
 		ext = str;
 
-	out = strdup(ext);
-	free(str);
+	out = io_strdup(ext);
+	io_free(str);
 
 	return out;
 }
 
 
 /*
- * ioMkDir() Function for racursive directory creation and validation
+ * 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
@@ -416,7 +519,7 @@ ioMkDir(const char *csDir, int mode)
 	if (!csDir)
 		return cx;
 
-	str = strdup(csDir);
+	str = io_strdup(csDir);
 	if (!str) {
 		LOGERR;
 		return cx;
@@ -444,12 +547,13 @@ ioMkDir(const char *csDir, int mode)
 	}
 end:
 	chdir(szOld);
-	free(str);
+	io_free(str);
 	return cx;
 }
 
 /*
- * ioWatchDirLoop() Function for watching changes in directory and fire callback
+ * 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
@@ -560,7 +664,8 @@ ioWatchDirLoop(const char *csDir, int (*callback)(cons
 }
 
 /*
- * ioCreatePIDFile() Create PID file
+ * ioCreatePIDFile() - Create PID file
+ *
  * @csName = PID filename
  * @ifExists = !=0 if filename exists return error
  * return: -1 error or 0 ok
@@ -587,7 +692,8 @@ ioCreatePIDFile(const char *csName, int ifExists)
 
 
 /*
- * ioSendFile() AITNET sendfile() userland implementation, not dependant from OS
+ * ioSendFile() - AITNET sendfile() userland implementation, not dependant from OS
+ *
  * @s = socket
  * @csFile = file for send
  * @sendLen = bytes to send, if 0 send all data
@@ -653,7 +759,8 @@ ioSendFile(int s, const char *csFile, size_t sendLen, 
 }
 
 /*
- * ioRecvFile() Receive file from socket, fastest (zero-copy) way
+ * ioRecvFile() - Receive file from socket, fastest (zero-copy) way
+ *
  * @s = socket
  * @csFile = file for receive
  * @recvLen = receive bytes
@@ -687,13 +794,7 @@ ioRecvFile(int s, const char *csFile, size_t recvLen, 
 		unlink(csFile);
 		return 0;
 	}
-	if (lseek(fd, recvLen - 1, SEEK_SET) == -1) {
-		LOGERR;
-		close(fd);
-		unlink(csFile);
-		return 0;
-	}
-	if (write(fd, "", 1) == -1) {
+	if (ftruncate(fd, recvLen) == -1) {
 		LOGERR;
 		close(fd);
 		unlink(csFile);