--- libaitio/src/bufio.c 2014/02/08 22:06:17 1.9 +++ libaitio/src/bufio.c 2016/08/11 12:51:52 1.9.8.2 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: bufio.c,v 1.9 2014/02/08 22:06:17 misho Exp $ +* $Id: bufio.c,v 1.9.8.2 2016/08/11 12:51:52 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 -Copyright 2004 - 2014 +Copyright 2004 - 2016 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -70,7 +70,7 @@ cf_(struct tagBufIO *buf) return 0; } -#ifdef __NetBSD__ +#if defined(__NetBSD__) || defined(__linux__) static off_t sf_lim(struct tagBufIO *buf, off_t pos, int w) #else @@ -139,7 +139,7 @@ wf_lim(struct tagBufIO *buf, const char *dat, int siz) return siz; } -#ifdef __NetBSD__ +#if defined(__NetBSD__) || defined(__linux__) static off_t sf_inf(struct tagBufIO *buf, off_t pos, int w) #else @@ -254,6 +254,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 ..."); @@ -283,6 +286,7 @@ io_fmemopen(void ** __restrict base, off_t basesize) 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,6 +310,21 @@ 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) { + 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; if (buf->buf_mode == BUFIO_MODE_INFINIT) { @@ -338,6 +357,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); @@ -386,6 +413,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, @@ -396,6 +424,9 @@ io_fmapopen(const char *csFile, int mode, int perm, in (int (*)(void *, char const *, int)) wf_lim, (fpos_t (*)(void *, fpos_t, int)) sf_lim, (int (*)(void *)) cf_); +#endif +#else + f = fopencookie(buf, "r+", cookie); #endif if (!f) { LOGERR;