--- libaitio/src/bufio.c	2016/08/11 12:25:51	1.9.8.1
+++ libaitio/src/bufio.c	2016/08/15 12:13:47	1.9.8.3
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: bufio.c,v 1.9.8.1 2016/08/11 12:25:51 misho Exp $
+* $Id: bufio.c,v 1.9.8.3 2016/08/15 12:13:47 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -53,7 +53,6 @@ unmap_cf(struct tagBufIO *buf)
 		munmap(buf->buf_base, buf->buf_size);
 }
 
-#ifndef __linux__
 static int
 cf_(struct tagBufIO *buf)
 {
@@ -71,6 +70,7 @@ cf_(struct tagBufIO *buf)
 	return 0;
 }
 
+#ifndef __linux__
 #ifdef __NetBSD__
 static off_t
 sf_lim(struct tagBufIO *buf, off_t pos, int w)
@@ -78,7 +78,15 @@ sf_lim(struct tagBufIO *buf, off_t pos, int w)
 static fpos_t
 sf_lim(struct tagBufIO *buf, fpos_t pos, int w)
 #endif
+#else
+static off_t
+sf_lim(struct tagBufIO *buf, off64_t *ppos, int w)
+#endif
 {
+#ifdef __linux__
+	off_t pos = (off_t) *ppos;
+#endif
+
 	if (!buf)
 		goto err;
 
@@ -140,6 +148,7 @@ wf_lim(struct tagBufIO *buf, const char *dat, int siz)
 	return siz;
 }
 
+#ifndef __linux__
 #ifdef __NetBSD__
 static off_t
 sf_inf(struct tagBufIO *buf, off_t pos, int w)
@@ -147,8 +156,15 @@ sf_inf(struct tagBufIO *buf, off_t pos, int w)
 static fpos_t
 sf_inf(struct tagBufIO *buf, fpos_t pos, int w)
 #endif
+#else
+static off_t
+sf_inf(struct tagBufIO *buf, off64_t *ppos, int w)
+#endif
 {
 	void *b;
+#ifdef __linux__
+	off_t pos = (off_t) *ppos;
+#endif
 
 	if (!buf)
 		goto err;
@@ -241,7 +257,6 @@ wf_inf(struct tagBufIO *buf, const char *dat, int siz)
 	buf->buf_offset += siz;
 	return siz;
 }
-#endif
 
 
 /*
@@ -256,6 +271,9 @@ io_fmemopen(void ** __restrict base, off_t basesize)
 {
 	FILE *f = NULL;
 	struct tagBufIO *buf;
+#ifdef __linux__
+	cookie_io_functions_t cookie;
+#endif
 
 	if (!base) {
 		io_SetErr(EINVAL, "Invalid base argument ...");
@@ -270,7 +288,6 @@ io_fmemopen(void ** __restrict base, off_t basesize)
 		memset(buf, 0, sizeof(struct tagBufIO));
 
 	if (!*base) {
-#ifndef __linux__
 		*base = e_malloc(basesize);
 		if (!*base) {
 			LOGERR;
@@ -279,17 +296,13 @@ io_fmemopen(void ** __restrict base, off_t basesize)
 		} else
 			memset(*base, 0, basesize);
 
-		buf->buf_base = *base;
-		buf->buf_size = basesize;
-#endif
 		buf->buf_mode = BUFIO_MODE_INFINIT;
-	} else {
-		buf->buf_base = *base;
-		buf->buf_size = basesize;
-
+	} else
 		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)
@@ -315,26 +328,29 @@ io_fmemopen(void ** __restrict base, off_t basesize)
 				(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+");
+	if (buf->buf_mode == BUFIO_MODE_INFINIT) {
+		cookie.read = (cookie_read_function_t*) rf_lim;
+		cookie.write = (cookie_write_function_t*) wf_inf;
+		cookie.seek = (cookie_seek_function_t*) sf_inf;
+		cookie.close = (cookie_close_function_t*) cf_;
+	} else {
+		cookie.read = (cookie_read_function_t*) rf_lim;
+		cookie.write = (cookie_write_function_t*) wf_lim;
+		cookie.seek = (cookie_seek_function_t*) sf_lim;
+		cookie.close = (cookie_close_function_t*) cf_;
+	}
+
+	f = fopencookie(buf, "r+", cookie);
 #endif
 	if (!f) {
 		LOGERR;
-#ifndef __linux__
 		if (buf->buf_mode == BUFIO_MODE_INFINIT) {
 			e_free(*base);
 			*base = NULL;
 		}
-#endif
 		e_free(buf);
 		return NULL;
 	}
-#ifdef __linux__
-	if (buf->buf_mode == BUFIO_MODE_INFINIT)
-		*base = buf->buf_base;
-#endif
 
 	return f;
 }
@@ -358,6 +374,14 @@ io_fmapopen(const char *csFile, int mode, int perm, in
 	void *base;
 	off_t basesize;
 	int fd = -1;
+#ifdef __linux__
+	cookie_io_functions_t cookie = {
+		.read = (cookie_read_function_t*) rf_lim, 
+		.write = (cookie_write_function_t*) wf_lim, 
+		.seek = (cookie_seek_function_t*) sf_lim, 
+		.close = (cookie_close_function_t*) cf_
+	};
+#endif
 
 	if (csFile) {
 		fd = open(csFile, mode, perm);
@@ -382,7 +406,7 @@ io_fmapopen(const char *csFile, int mode, int perm, in
 			close(fd);
 	} else if (offset) {
 		basesize = offset;
-		base = mmap(NULL, basesize, prot, MAP_ANON, -1, 0);
+		base = mmap(NULL, basesize, prot, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
 		if (base == MAP_FAILED) {
 			LOGERR;
 			return NULL;
@@ -419,7 +443,7 @@ io_fmapopen(const char *csFile, int mode, int perm, in
 			(int (*)(void *)) cf_);
 #endif
 #else
-	f = fmemopen(buf->buf_base, buf->buf_size, "r+");
+	f = fopencookie(buf, "r+", cookie);
 #endif
 	if (!f) {
 		LOGERR;