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.5 and 1.9.8.2

version 1.5, 2012/05/14 12:49:21	version 1.9.8.2, 2016/08/11 12:51:52
Line 12 terms:	Line 12 terms:
All of the documentation and software included in the ELWIX and AITNET	All of the documentation and software included in the ELWIX and AITNET
Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>	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.	by Michael Pounov <misho@elwix.org>. All rights reserved.

Redistribution and use in source and binary forms, with or without	Redistribution and use in source and binary forms, with or without
Line 62 cf_(struct tagBufIO *buf)	Line 62 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__	#if defined(__NetBSD__) \|\| defined(__linux__)
static off_t	static off_t
sf_lim(struct tagBufIO *buf, off_t pos, int w)	sf_lim(struct tagBufIO *buf, off_t pos, int w)
#else	#else
Line 139 wf_lim(struct tagBufIO buf, const char dat, int siz)	Line 139 wf_lim(struct tagBufIO buf, const char dat, int siz)
return siz;	return siz;
}	}

#ifdef __NetBSD__	#if defined(__NetBSD__) \|\| defined(__linux__)
static off_t	static off_t
sf_inf(struct tagBufIO *buf, off_t pos, int w)	sf_inf(struct tagBufIO *buf, off_t pos, int w)
#else	#else
Line 157 sf_inf(struct tagBufIO *buf, fpos_t pos, int w)	Line 157 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 173 sf_inf(struct tagBufIO *buf, fpos_t pos, int w)	Line 173 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 190 sf_inf(struct tagBufIO *buf, fpos_t pos, int w)	Line 190 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 224 wf_inf(struct tagBufIO buf, const char dat, int siz)	Line 224 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 254 io_fmemopen(void ** __restrict base, off_t basesize)	Line 254 io_fmemopen(void ** __restrict base, off_t basesize)
{	{
FILE *f = NULL;	FILE *f = NULL;
struct tagBufIO *buf;	struct tagBufIO *buf;
	#ifdef __linux__
	cookie_io_functions_t cookie;
	#endif

if (!base) {	if (!base) {
io_SetErr(EINVAL, "Invalid base argument ...");	io_SetErr(EINVAL, "Invalid base argument ...");
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 268 io_fmemopen(void ** __restrict base, off_t basesize)	Line 271 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);	*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);
Line 283 io_fmemopen(void ** __restrict base, off_t basesize)	Line 286 io_fmemopen(void ** __restrict base, off_t basesize)
buf->buf_base = *base;	buf->buf_base = *base;
buf->buf_size = basesize;	buf->buf_size = basesize;

	#ifndef __linux__
#ifdef __NetBSD__	#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,
Line 306 io_fmemopen(void ** __restrict base, off_t basesize)	Line 310 io_fmemopen(void ** __restrict base, off_t basesize)
(fpos_t ()(void , fpos_t, int)) sf_lim,	(fpos_t ()(void , fpos_t, int)) sf_lim,
(int ()(void )) cf_);	(int ()(void )) cf_);
#endif	#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) {	if (!f) {
LOGERR;	LOGERR;
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);	e_free(buf);
return NULL;	return NULL;
}	}

Line 338 io_fmapopen(const char *csFile, int mode, int perm, in	Line 357 io_fmapopen(const char *csFile, int mode, int perm, in
void *base;	void *base;
off_t basesize;	off_t basesize;
int fd = -1;	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) {	if (csFile) {
fd = open(csFile, mode, perm);	fd = open(csFile, mode, perm);
Line 373 io_fmapopen(const char *csFile, int mode, int perm, in	Line 400 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 386 io_fmapopen(const char *csFile, int mode, int perm, in	Line 413 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__	#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,
Line 397 io_fmapopen(const char *csFile, int mode, int perm, in	Line 425 io_fmapopen(const char *csFile, int mode, int perm, in
(fpos_t ()(void , fpos_t, int)) sf_lim,	(fpos_t ()(void , fpos_t, int)) sf_lim,
(int ()(void )) cf_);	(int ()(void )) cf_);
#endif	#endif
	#else
	f = fopencookie(buf, "r+", cookie);
	#endif
if (!f) {	if (!f) {
LOGERR;	LOGERR;
free(buf);	e_free(buf);
munmap(base, basesize);	munmap(base, basesize);
return NULL;	return NULL;
}	}
Line 447 err:	Line 478 err:
* @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.5
changed lines
	Added in v.1.9.8.2