--- libaitio/src/bufio.c	2012/07/03 08:51:05	1.6
+++ libaitio/src/bufio.c	2016/08/11 12:25:51	1.9.8.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: bufio.c,v 1.6 2012/07/03 08:51:05 misho Exp $
+* $Id: bufio.c,v 1.9.8.1 2016/08/11 12:25:51 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, 2012
+Copyright 2004 - 2016
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -53,6 +53,7 @@ unmap_cf(struct tagBufIO *buf)
 		munmap(buf->buf_base, buf->buf_size);
 }
 
+#ifndef __linux__
 static int
 cf_(struct tagBufIO *buf)
 {
@@ -62,11 +63,11 @@ cf_(struct tagBufIO *buf)
 	}
 
 	if (buf->buf_mode == BUFIO_MODE_INFINIT)
-		io_free(buf->buf_base);
+		e_free(buf->buf_base);
 	else if (buf->buf_unmap)
 		buf->buf_unmap(buf);
 
-	io_free(buf);
+	e_free(buf);
 	return 0;
 }
 
@@ -157,7 +158,7 @@ sf_inf(struct tagBufIO *buf, fpos_t pos, int w)
 			if (pos < 0)
 				goto err;
 			if (buf->buf_size < pos) {
-				b = io_realloc(buf->buf_base, pos);
+				b = e_realloc(buf->buf_base, pos);
 				if (!b) {
 					LOGERR;
 					return -1;
@@ -173,7 +174,7 @@ sf_inf(struct tagBufIO *buf, fpos_t pos, int w)
 			if ((buf->buf_offset + pos) < 0)
 				goto err;
 			if (buf->buf_size < (buf->buf_offset + pos)) {
-				b = io_realloc(buf->buf_base, buf->buf_offset + pos);
+				b = e_realloc(buf->buf_base, buf->buf_offset + pos);
 				if (!b) {
 					LOGERR;
 					return -1;
@@ -190,7 +191,7 @@ sf_inf(struct tagBufIO *buf, fpos_t pos, int w)
 			if ((buf->buf_size + pos) < 0)
 				goto err;
 			if (buf->buf_size < (buf->buf_size + pos)) {
-				b = io_realloc(buf->buf_base, buf->buf_size + pos);
+				b = e_realloc(buf->buf_base, buf->buf_size + pos);
 				if (!b) {
 					LOGERR;
 					return -1;
@@ -224,7 +225,7 @@ wf_inf(struct tagBufIO *buf, const char *dat, int siz)
 	}
 
 	if (buf->buf_offset + siz > buf->buf_size) {
-		b = io_realloc(buf->buf_base, buf->buf_offset + siz);
+		b = e_realloc(buf->buf_base, buf->buf_offset + siz);
 		if (!b) {
 			LOGERR;
 			return -1;
@@ -240,6 +241,7 @@ wf_inf(struct tagBufIO *buf, const char *dat, int siz)
 	buf->buf_offset += siz;
 	return siz;
 }
+#endif
 
 
 /*
@@ -260,7 +262,7 @@ io_fmemopen(void ** __restrict base, off_t basesize)
 		return NULL;
 	}
 
-	buf = io_malloc(sizeof(struct tagBufIO));
+	buf = e_malloc(sizeof(struct tagBufIO));
 	if (!buf) {
 		LOGERR;
 		return NULL;
@@ -268,21 +270,27 @@ io_fmemopen(void ** __restrict base, off_t basesize)
 		memset(buf, 0, sizeof(struct tagBufIO));
 
 	if (!*base) {
-		*base = io_malloc(basesize);
+#ifndef __linux__
+		*base = e_malloc(basesize);
 		if (!*base) {
 			LOGERR;
-			io_free(buf);
+			e_free(buf);
 			return NULL;
 		} else
 			memset(*base, 0, basesize);
 
+		buf->buf_base = *base;
+		buf->buf_size = basesize;
+#endif
 		buf->buf_mode = BUFIO_MODE_INFINIT;
-	} else
+	} else {
+		buf->buf_base = *base;
+		buf->buf_size = basesize;
+
 		buf->buf_mode = BUFIO_MODE_LIMIT;
+	}
 
-	buf->buf_base = *base;
-	buf->buf_size = basesize;
-
+#ifndef __linux__
 #ifdef __NetBSD__
 	if (buf->buf_mode == BUFIO_MODE_INFINIT)
 		f = funopen(buf, (int (*)(void *, char *, int)) rf_lim, 
@@ -306,15 +314,27 @@ io_fmemopen(void ** __restrict base, off_t basesize)
 				(fpos_t (*)(void *, fpos_t, int)) sf_lim, 
 				(int (*)(void *)) cf_);
 #endif
+#else
+	if (buf->buf_mode == BUFIO_MODE_INFINIT)
+		f = open_memstream((char**) &buf->buf_base, (size_t*) &buf->buf_size);
+	else
+		f = fmemopen(buf->buf_base, buf->buf_size, "r+");
+#endif
 	if (!f) {
 		LOGERR;
+#ifndef __linux__
 		if (buf->buf_mode == BUFIO_MODE_INFINIT) {
-			io_free(*base);
+			e_free(*base);
 			*base = NULL;
 		}
-		io_free(buf);
+#endif
+		e_free(buf);
 		return NULL;
 	}
+#ifdef __linux__
+	if (buf->buf_mode == BUFIO_MODE_INFINIT)
+		*base = buf->buf_base;
+#endif
 
 	return f;
 }
@@ -373,7 +393,7 @@ io_fmapopen(const char *csFile, int mode, int perm, in
 	}
 
 
-	buf = io_malloc(sizeof(struct tagBufIO));
+	buf = e_malloc(sizeof(struct tagBufIO));
 	if (!buf) {
 		LOGERR;
 		munmap(base, basesize);
@@ -386,6 +406,7 @@ io_fmapopen(const char *csFile, int mode, int perm, in
 	buf->buf_size = basesize;
 	buf->buf_unmap = unmap_cf;
 
+#ifndef __linux__
 #ifdef __NetBSD__
 	f = funopen(buf, (int (*)(void *, char *, int)) rf_lim, 
 			(int (*)(void *, char const *, int)) wf_lim, 
@@ -397,9 +418,12 @@ io_fmapopen(const char *csFile, int mode, int perm, in
 			(fpos_t (*)(void *, fpos_t, int)) sf_lim, 
 			(int (*)(void *)) cf_);
 #endif
+#else
+	f = fmemopen(buf->buf_base, buf->buf_size, "r+");
+#endif
 	if (!f) {
 		LOGERR;
-		io_free(buf);
+		e_free(buf);
 		munmap(base, basesize);
 		return NULL;
 	}
@@ -447,7 +471,7 @@ err:
  * @mode = Permissions for new buffered file I/O
  * return: NULL error or open buffered file
  */
-inline FILE *
+FILE *
 io_fd2buf(int fd, const char *mode)
 {
 	FILE *f;