libaitio/src/bufio.c - diff

Return to bufio.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / libaitio / src

Diff for /libaitio/src/bufio.c between versions 1.2 and 1.9.8.1

version 1.2, 2012/02/02 21:32:42	version 1.9.8.1, 2016/08/11 12:25:51
Line 1	Line 1
	/*************************************************************************
	* (C) 2011 AITNET ltd - Sofia/Bulgaria - <misho@aitnet.org>
	* by Michael Pounov <misho@elwix.org>
	*
	* $Author$
	* $Id$
	*
	**************************************************************************
	The ELWIX and AITNET software is distributed under the following
	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 - 2016
	by Michael Pounov <misho@elwix.org>. All rights reserved.

	Redistribution and use in source and binary forms, with or without
	modification, are permitted provided that the following conditions
	are met:
	1. Redistributions of source code must retain the above copyright
	notice, this list of conditions and the following disclaimer.
	2. Redistributions in binary form must reproduce the above copyright
	notice, this list of conditions and the following disclaimer in the
	documentation and/or other materials provided with the distribution.
	3. All advertising materials mentioning features or use of this software
	must display the following acknowledgement:
	This product includes software developed by Michael Pounov <misho@elwix.org>
	ELWIX - Embedded LightWeight unIX and its contributors.
	4. Neither the name of AITNET nor the names of its contributors
	may be used to endorse or promote products derived from this software
	without specific prior written permission.

	THIS SOFTWARE IS PROVIDED BY AITNET AND CONTRIBUTORS ``AS IS'' AND
	ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
	ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
	FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
	DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
	OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
	HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
	LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
	OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
	SUCH DAMAGE.
	*/
#include "global.h"	#include "global.h"


Line 8 unmap_cf(struct tagBufIO *buf)	Line 53 unmap_cf(struct tagBufIO *buf)
munmap(buf->buf_base, buf->buf_size);	munmap(buf->buf_base, buf->buf_size);
}	}

	#ifndef __linux__
static int	static int
cf_(struct tagBufIO *buf)	cf_(struct tagBufIO *buf)
{	{
Line 17 cf_(struct tagBufIO *buf)	Line 63 cf_(struct tagBufIO *buf)
}	}

if (buf->buf_mode == BUFIO_MODE_INFINIT)	if (buf->buf_mode == BUFIO_MODE_INFINIT)
free(buf->buf_base);	e_free(buf->buf_base);
else if (buf->buf_unmap)	else if (buf->buf_unmap)
buf->buf_unmap(buf);	buf->buf_unmap(buf);

free(buf);	e_free(buf);
return 0;	return 0;
}	}

	#ifdef __NetBSD__
	static off_t
	sf_lim(struct tagBufIO *buf, off_t pos, int w)
	#else
static fpos_t	static fpos_t
sf_lim(struct tagBufIO *buf, fpos_t pos, int w)	sf_lim(struct tagBufIO *buf, fpos_t pos, int w)
	#endif
{	{
if (!buf)	if (!buf)
goto err;	goto err;
Line 89 wf_lim(struct tagBufIO buf, const char dat, int siz)	Line 140 wf_lim(struct tagBufIO buf, const char dat, int siz)
return siz;	return siz;
}	}

	#ifdef __NetBSD__
	static off_t
	sf_inf(struct tagBufIO *buf, off_t pos, int w)
	#else
static fpos_t	static fpos_t
sf_inf(struct tagBufIO *buf, fpos_t pos, int w)	sf_inf(struct tagBufIO *buf, fpos_t pos, int w)
	#endif
{	{
void *b;	void *b;

Line 102 sf_inf(struct tagBufIO *buf, fpos_t pos, int w)	Line 158 sf_inf(struct tagBufIO *buf, fpos_t pos, int w)
if (pos < 0)	if (pos < 0)
goto err;	goto err;
if (buf->buf_size < pos) {	if (buf->buf_size < pos) {
b = realloc(buf->buf_base, pos);	b = e_realloc(buf->buf_base, pos);
if (!b) {	if (!b) {
LOGERR;	LOGERR;
return -1;	return -1;
Line 118 sf_inf(struct tagBufIO *buf, fpos_t pos, int w)	Line 174 sf_inf(struct tagBufIO *buf, fpos_t pos, int w)
if ((buf->buf_offset + pos) < 0)	if ((buf->buf_offset + pos) < 0)
goto err;	goto err;
if (buf->buf_size < (buf->buf_offset + pos)) {	if (buf->buf_size < (buf->buf_offset + pos)) {
b = realloc(buf->buf_base, buf->buf_offset + pos);	b = e_realloc(buf->buf_base, buf->buf_offset + pos);
if (!b) {	if (!b) {
LOGERR;	LOGERR;
return -1;	return -1;
Line 135 sf_inf(struct tagBufIO *buf, fpos_t pos, int w)	Line 191 sf_inf(struct tagBufIO *buf, fpos_t pos, int w)
if ((buf->buf_size + pos) < 0)	if ((buf->buf_size + pos) < 0)
goto err;	goto err;
if (buf->buf_size < (buf->buf_size + pos)) {	if (buf->buf_size < (buf->buf_size + pos)) {
b = realloc(buf->buf_base, buf->buf_size + pos);	b = e_realloc(buf->buf_base, buf->buf_size + pos);
if (!b) {	if (!b) {
LOGERR;	LOGERR;
return -1;	return -1;
Line 169 wf_inf(struct tagBufIO buf, const char dat, int siz)	Line 225 wf_inf(struct tagBufIO buf, const char dat, int siz)
}	}

if (buf->buf_offset + siz > buf->buf_size) {	if (buf->buf_offset + siz > buf->buf_size) {
b = realloc(buf->buf_base, buf->buf_offset + siz);	b = e_realloc(buf->buf_base, buf->buf_offset + siz);
if (!b) {	if (!b) {
LOGERR;	LOGERR;
return -1;	return -1;
Line 185 wf_inf(struct tagBufIO buf, const char dat, int siz)	Line 241 wf_inf(struct tagBufIO buf, const char dat, int siz)
buf->buf_offset += siz;	buf->buf_offset += siz;
return siz;	return siz;
}	}
	#endif


/*	/*
* io_fmemopen() File buffered stream operations over memory block	* io_fmemopen() - File buffered stream operations over memory block
*	*
* @base = Base address of memory block, if =NULL Infinit length(auto-grow)	* @base = Base address of memory block, if =NULL Infinit length(auto-grow)
* @basesize = Size of memory block	* @basesize = Size of memory block
Line 205 io_fmemopen(void ** __restrict base, off_t basesize)	Line 262 io_fmemopen(void ** __restrict base, off_t basesize)
return NULL;	return NULL;
}	}

buf = malloc(sizeof(struct tagBufIO));	buf = e_malloc(sizeof(struct tagBufIO));
if (!buf) {	if (!buf) {
LOGERR;	LOGERR;
return NULL;	return NULL;
Line 213 io_fmemopen(void ** __restrict base, off_t basesize)	Line 270 io_fmemopen(void ** __restrict base, off_t basesize)
memset(buf, 0, sizeof(struct tagBufIO));	memset(buf, 0, sizeof(struct tagBufIO));

if (!*base) {	if (!*base) {
*base = malloc(basesize);	#ifndef __linux__
	*base = e_malloc(basesize);
if (!*base) {	if (!*base) {
LOGERR;	LOGERR;
free(buf);	e_free(buf);
return NULL;	return NULL;
} else	} else
memset(*base, 0, basesize);	memset(*base, 0, basesize);

	buf->buf_base = *base;
	buf->buf_size = basesize;
	#endif
buf->buf_mode = BUFIO_MODE_INFINIT;	buf->buf_mode = BUFIO_MODE_INFINIT;
} else	} else {
	buf->buf_base = *base;
	buf->buf_size = basesize;

buf->buf_mode = BUFIO_MODE_LIMIT;	buf->buf_mode = BUFIO_MODE_LIMIT;
	}

buf->buf_base = *base;	#ifndef __linux__
buf->buf_size = basesize;	#ifdef __NetBSD__

if (buf->buf_mode == BUFIO_MODE_INFINIT)	if (buf->buf_mode == BUFIO_MODE_INFINIT)
f = funopen(buf, (int ()(void , char *, int)) rf_lim,	f = funopen(buf, (int ()(void , char *, int)) rf_lim,
(int ()(void , char const *, int)) wf_inf,	(int ()(void , char const *, int)) wf_inf,
	(off_t ()(void , off_t, int)) sf_inf,
	(int ()(void )) cf_);
	else
	f = funopen(buf, (int ()(void , char *, int)) rf_lim,
	(int ()(void , char const *, int)) wf_lim,
	(off_t ()(void , off_t, int)) sf_lim,
	(int ()(void )) cf_);
	#else
	if (buf->buf_mode == BUFIO_MODE_INFINIT)
	f = funopen(buf, (int ()(void , char *, int)) rf_lim,
	(int ()(void , char const *, int)) wf_inf,
(fpos_t ()(void , fpos_t, int)) sf_inf,	(fpos_t ()(void , fpos_t, int)) sf_inf,
(int ()(void )) cf_);	(int ()(void )) cf_);
else	else
Line 238 io_fmemopen(void ** __restrict base, off_t basesize)	Line 313 io_fmemopen(void ** __restrict base, off_t basesize)
(int ()(void , char const *, int)) wf_lim,	(int ()(void , char const *, int)) wf_lim,
(fpos_t ()(void , fpos_t, int)) sf_lim,	(fpos_t ()(void , fpos_t, int)) sf_lim,
(int ()(void )) cf_);	(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) {	if (!f) {
LOGERR;	LOGERR;
	#ifndef __linux__
if (buf->buf_mode == BUFIO_MODE_INFINIT) {	if (buf->buf_mode == BUFIO_MODE_INFINIT) {
free(*base);	e_free(*base);
*base = NULL;	*base = NULL;
}	}
free(buf);	#endif
	e_free(buf);
return NULL;	return NULL;
}	}
	#ifdef __linux__
	if (buf->buf_mode == BUFIO_MODE_INFINIT)
	*base = buf->buf_base;
	#endif

return f;	return f;
}	}

/*	/*
* io_fmapopen() File buffered stream operations over MMAP block	* io_fmapopen() - File buffered stream operations over MMAP block
*	*
* @csFile = Filename for MMAP, if =NULL private MMAP block	* @csFile = Filename for MMAP, if =NULL private MMAP block
* @mode = File open mode	* @mode = File open mode
Line 305 io_fmapopen(const char *csFile, int mode, int perm, in	Line 393 io_fmapopen(const char *csFile, int mode, int perm, in
}	}


buf = malloc(sizeof(struct tagBufIO));	buf = e_malloc(sizeof(struct tagBufIO));
if (!buf) {	if (!buf) {
LOGERR;	LOGERR;
munmap(base, basesize);	munmap(base, basesize);
Line 318 io_fmapopen(const char *csFile, int mode, int perm, in	Line 406 io_fmapopen(const char *csFile, int mode, int perm, in
buf->buf_size = basesize;	buf->buf_size = basesize;
buf->buf_unmap = unmap_cf;	buf->buf_unmap = unmap_cf;

	#ifndef __linux__
	#ifdef __NetBSD__
f = funopen(buf, (int ()(void , char *, int)) rf_lim,	f = funopen(buf, (int ()(void , char *, int)) rf_lim,
(int ()(void , char const *, int)) wf_lim,	(int ()(void , char const *, int)) wf_lim,
	(off_t ()(void , off_t, int)) sf_lim,
	(int ()(void )) cf_);
	#else
	f = funopen(buf, (int ()(void , char *, int)) rf_lim,
	(int ()(void , char const *, int)) wf_lim,
(fpos_t ()(void , fpos_t, int)) sf_lim,	(fpos_t ()(void , fpos_t, int)) sf_lim,
(int ()(void )) cf_);	(int ()(void )) cf_);
	#endif
	#else
	f = fmemopen(buf->buf_base, buf->buf_size, "r+");
	#endif
if (!f) {	if (!f) {
LOGERR;	LOGERR;
free(buf);	e_free(buf);
munmap(base, basesize);	munmap(base, basesize);
return NULL;	return NULL;
}	}
Line 333 io_fmapopen(const char *csFile, int mode, int perm, in	Line 432 io_fmapopen(const char *csFile, int mode, int perm, in
}	}

/*	/*
* io_dumbFile() Create empry or dumb file with fixed size	* io_dumbFile() - Create empry or dumb file with fixed size
*	*
* @csFile = Filename for create	* @csFile = Filename for create
* @mode = File access permissions	* @mode = File access permissions
Line 366 err:	Line 465 err:
}	}

/*	/*
* io_fd2buf() Convert open file handle to buffered file I/O	* io_fd2buf() - Convert open file handle to buffered file I/O
*	*
* @fd = File handle	* @fd = File handle
* @mode = Permissions for new buffered file I/O	* @mode = Permissions for new buffered file I/O
* return: NULL error or open buffered file	* return: NULL error or open buffered file
*/	*/
inline FILE *	FILE *
io_fd2buf(int fd, const char *mode)	io_fd2buf(int fd, const char *mode)
{	{
FILE *f;	FILE *f;

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.2
changed lines
	Added in v.1.9.8.1