libaitsync/src/zc.c - diff

Return to zc.c CVS log

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

Diff for /libaitsync/src/zc.c between versions 1.1.1.1.2.1 and 1.3.2.1

version 1.1.1.1.2.1, 2010/03/24 16:04:49	version 1.3.2.1, 2012/11/13 10:30:44
Line 5	Line 5
* $Author$	* $Author$
* $Id$	* $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, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
	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"
#include "file.h"	#include "file.h"
#include "zc.h"	#include "zc.h"


int sync_Deflate(int inf, int outf, int level)	/*
	* sync_Deflate() - LibZ deflate data
	*
	* @inf = Input file
	* @outf = Output file
	* @level = Compress level
	* return: -1 error, != -1 ok
	*/
	int
	sync_Deflate(int inf, int outf, int level)
{	{
z_stream z;	z_stream z;
int ret, flush, readed;	int ret, flush, readed;
Line 19 int sync_Deflate(int inf, int outf, int level)	Line 65 int sync_Deflate(int inf, int outf, int level)

lseek(outf, 0l, SEEK_SET);	lseek(outf, 0l, SEEK_SET);
if (lseek(inf, 0l, SEEK_SET) == -1) {	if (lseek(inf, 0l, SEEK_SET) == -1) {
SETERR;	LOGERR;
return -1;	return -1;
}	}

// init zlib	/* init zlib */
memset(&z, 0, sizeof z);	memset(&z, 0, sizeof z);
ret = deflateInit(&z, level);	ret = deflateInit(&z, level);
if (ret)	if (ret)
return ret;	return ret;

do {	do {
// set input buffer for compress	/* set input buffer for compress */
readed = read(inf, ibuf, Z_CHUNK);	readed = read(inf, ibuf, Z_CHUNK);
if (-1 == readed) {	if (-1 == readed) {
SETERR;	LOGERR;
break;	break;
} else {	} else {
z.avail_in = readed;	z.avail_in = readed;
z.next_in = ibuf;	z.next_in = ibuf;
}	}

// check flush flag	/* check flush flag */
flush = syncEOF(inf) ? Z_FINISH : Z_NO_FLUSH;	flush = sync_EOF(inf) ? Z_FINISH : Z_NO_FLUSH;

do {	do {
// compress and write to file	// compress and write to file
Line 49 int sync_Deflate(int inf, int outf, int level)	Line 95 int sync_Deflate(int inf, int outf, int level)
z.next_out = obuf;	z.next_out = obuf;
ret = deflate(&z, flush);	ret = deflate(&z, flush);
if (Z_STREAM_ERROR == ret) {	if (Z_STREAM_ERROR == ret) {
syncSetErr(ENOEXEC, "Error:: can`t deflate !!!\n");	sync_SetErr(ENOEXEC, "Error:: can`t deflate !!!\n");
flush = Z_FINISH;	flush = Z_FINISH;
ret = -1;	ret = -1;
break;	break;
Line 57 int sync_Deflate(int inf, int outf, int level)	Line 103 int sync_Deflate(int inf, int outf, int level)

ret = write(outf, obuf, readed - z.avail_out);	ret = write(outf, obuf, readed - z.avail_out);
if (-1 == ret \|\| ret != readed - z.avail_out) {	if (-1 == ret \|\| ret != readed - z.avail_out) {
SETERR;	LOGERR;
flush = Z_FINISH;	flush = Z_FINISH;
ret = -1;	ret = -1;
break;	break;
Line 65 int sync_Deflate(int inf, int outf, int level)	Line 111 int sync_Deflate(int inf, int outf, int level)
} while (!z.avail_out);	} while (!z.avail_out);

if (z.avail_in) {	if (z.avail_in) {
syncSetErr(ENOEXEC, "Error:: can`t get all input for deflate !!!\n");	sync_SetErr(ENOEXEC, "Error:: can`t get all input for deflate !!!\n");
ret = -1;	ret = -1;
break;	break;
}	}
Line 76 int sync_Deflate(int inf, int outf, int level)	Line 122 int sync_Deflate(int inf, int outf, int level)
return ret;	return ret;
}	}

int sync_Inflate(int inf, int outf)	/*
	* sync_Inflate() LibZ inflate data
	* @inf = Input file
	* @outf = Output file
	* return: -1 error, != -1 ok
	*/
	int
	sync_Inflate(int inf, int outf)
{	{
z_stream z;	z_stream z;
int ret, flush;	int ret, flush;
Line 84 int sync_Inflate(int inf, int outf)	Line 137 int sync_Inflate(int inf, int outf)

lseek(outf, 0l, SEEK_SET);	lseek(outf, 0l, SEEK_SET);
if (lseek(inf, 0l, SEEK_SET) == -1) {	if (lseek(inf, 0l, SEEK_SET) == -1) {
SETERR;	LOGERR;
return -1;	return -1;
}	}

Line 98 int sync_Inflate(int inf, int outf)	Line 151 int sync_Inflate(int inf, int outf)
// set input buffer for decompress	// set input buffer for decompress
ret = read(inf, ibuf, Z_CHUNK);	ret = read(inf, ibuf, Z_CHUNK);
if (-1 == ret) {	if (-1 == ret) {
SETERR;	LOGERR;
break;	break;
}	}
if (!ret)	if (!ret)
Line 117 int sync_Inflate(int inf, int outf)	Line 170 int sync_Inflate(int inf, int outf)
case Z_NEED_DICT:	case Z_NEED_DICT:
case Z_DATA_ERROR:	case Z_DATA_ERROR:
case Z_MEM_ERROR:	case Z_MEM_ERROR:
syncSetErr(ENOEXEC, "Error:: can`t inflate !!!\n");	sync_SetErr(ENOEXEC, "Error:: can`t inflate !!!\n");
flush = Z_STREAM_END;	flush = Z_STREAM_END;
ret = -1;	ret = -1;
break;	break;
Line 125 int sync_Inflate(int inf, int outf)	Line 178 int sync_Inflate(int inf, int outf)

ret = write(outf, obuf, Z_CHUNK - z.avail_out);	ret = write(outf, obuf, Z_CHUNK - z.avail_out);
if (-1 == ret \|\| ret != Z_CHUNK - z.avail_out) {	if (-1 == ret \|\| ret != Z_CHUNK - z.avail_out) {
SETERR;	LOGERR;
flush = Z_STREAM_END;	flush = Z_STREAM_END;
ret = -1;	ret = -1;
break;	break;

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

Removed from v.1.1.1.1.2.1
changed lines
	Added in v.1.3.2.1