/*
-Minetest-c55
-Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "serialization.h"
-#include "utility.h"
-#ifdef _WIN32
- #define ZLIB_WINAPI
-#endif
+
+#include "util/serialize.h"
+
#include "zlib.h"
/* report a zlib or i/o error */
void zerr(int ret)
-{
- fputs("zerr: ", stderr);
+{
+ dstream<<"zerr: ";
switch (ret) {
case Z_ERRNO:
if (ferror(stdin))
- fputs("error reading stdin\n", stderr);
+ dstream<<"error reading stdin"<<std::endl;
if (ferror(stdout))
- fputs("error writing stdout\n", stderr);
+ dstream<<"error writing stdout"<<std::endl;
break;
case Z_STREAM_ERROR:
- fputs("invalid compression level\n", stderr);
+ dstream<<"invalid compression level"<<std::endl;
break;
case Z_DATA_ERROR:
- fputs("invalid or incomplete deflate data\n", stderr);
+ dstream<<"invalid or incomplete deflate data"<<std::endl;
break;
case Z_MEM_ERROR:
- fputs("out of memory\n", stderr);
+ dstream<<"out of memory"<<std::endl;
break;
case Z_VERSION_ERROR:
- fputs("zlib version mismatch!\n", stderr);
+ dstream<<"zlib version mismatch!"<<std::endl;
break;
default:
- dstream<<"return value = "<<ret<<"\n";
+ dstream<<"return value = "<<ret<<std::endl;
}
}
-void compressZlib(SharedBuffer<u8> data, std::ostream &os)
+void compressZlib(const u8 *data, size_t data_size, std::ostream &os, int level)
{
z_stream z;
const s32 bufsize = 16384;
- //char input_buffer[bufsize];
char output_buffer[bufsize];
- int input_i = 0;
int status = 0;
int ret;
z.zfree = Z_NULL;
z.opaque = Z_NULL;
- ret = deflateInit(&z, -1);
+ ret = deflateInit(&z, level);
if(ret != Z_OK)
throw SerializationError("compressZlib: deflateInit failed");
-
- z.avail_in = 0;
-
+
+ // Point zlib to our input buffer
+ z.next_in = (Bytef*)&data[0];
+ z.avail_in = data_size;
+ // And get all output
for(;;)
{
- int flush = Z_NO_FLUSH;
z.next_out = (Bytef*)output_buffer;
z.avail_out = bufsize;
- if(z.avail_in == 0)
- {
- //z.next_in = (char*)&data[input_i];
- z.next_in = (Bytef*)&data[input_i];
- z.avail_in = data.getSize() - input_i;
- input_i += z.avail_in;
- if(input_i == (int)data.getSize())
- flush = Z_FINISH;
- }
- if(z.avail_in == 0)
- break;
- status = deflate(&z, flush);
+ status = deflate(&z, Z_FINISH);
if(status == Z_NEED_DICT || status == Z_DATA_ERROR
|| status == Z_MEM_ERROR)
{
int count = bufsize - z.avail_out;
if(count)
os.write(output_buffer, count);
+ // This determines zlib has given all output
+ if(status == Z_STREAM_END)
+ break;
}
deflateEnd(&z);
-
}
-void compressZlib(const std::string &data, std::ostream &os)
+void compressZlib(const std::string &data, std::ostream &os, int level)
{
- SharedBuffer<u8> databuf((u8*)data.c_str(), data.size());
- compressZlib(databuf, os);
+ compressZlib((u8*)data.c_str(), data.size(), os, level);
}
-void decompressZlib(std::istream &is, std::ostream &os)
+void decompressZlib(std::istream &is, std::ostream &os, size_t limit)
{
z_stream z;
const s32 bufsize = 16384;
int status = 0;
int ret;
int bytes_read = 0;
+ int bytes_written = 0;
int input_buffer_len = 0;
z.zalloc = Z_NULL;
ret = inflateInit(&z);
if(ret != Z_OK)
throw SerializationError("dcompressZlib: inflateInit failed");
-
+
z.avail_in = 0;
-
+
//dstream<<"initial fail="<<is.fail()<<" bad="<<is.bad()<<std::endl;
for(;;)
{
+ int output_size = bufsize;
z.next_out = (Bytef*)output_buffer;
- z.avail_out = bufsize;
+ z.avail_out = output_size;
+
+ if (limit) {
+ int limit_remaining = limit - bytes_written;
+ if (limit_remaining <= 0) {
+ // we're aborting ahead of time - throw an error?
+ break;
+ }
+ if (limit_remaining < output_size) {
+ z.avail_out = output_size = limit_remaining;
+ }
+ }
if(z.avail_in == 0)
{
z.next_in = (Bytef*)input_buffer;
- input_buffer_len = is.readsome(input_buffer, bufsize);
+ is.read(input_buffer, bufsize);
+ input_buffer_len = is.gcount();
z.avail_in = input_buffer_len;
//dstream<<"read fail="<<is.fail()<<" bad="<<is.bad()<<std::endl;
}
//dstream<<"z.avail_in == 0"<<std::endl;
break;
}
-
+
//dstream<<"1 z.avail_in="<<z.avail_in<<std::endl;
status = inflate(&z, Z_NO_FLUSH);
//dstream<<"2 z.avail_in="<<z.avail_in<<std::endl;
zerr(status);
throw SerializationError("decompressZlib: inflate failed");
}
- int count = bufsize - z.avail_out;
+ int count = output_size - z.avail_out;
//dstream<<"count="<<count<<std::endl;
if(count)
os.write(output_buffer, count);
+ bytes_written += count;
if(status == Z_STREAM_END)
{
//dstream<<"Z_STREAM_END"<<std::endl;
-
+
//dstream<<"z.avail_in="<<z.avail_in<<std::endl;
//dstream<<"fail="<<is.fail()<<" bad="<<is.bad()<<std::endl;
// Unget all the data that inflate didn't take
+ is.clear(); // Just in case EOF is set
for(u32 i=0; i < z.avail_in; i++)
{
is.unget();
throw SerializationError("decompressZlib: unget failed");
}
}
-
+
break;
}
}
inflateEnd(&z);
}
-void compress(SharedBuffer<u8> data, std::ostream &os, u8 version)
+void compress(const SharedBuffer<u8> &data, std::ostream &os, u8 version)
{
if(version >= 11)
{
- compressZlib(data, os);
+ compressZlib(*data ,data.getSize(), os);
return;
}
if(data.getSize() == 0)
return;
-
+
// Write length (u32)
u8 tmp[4];
writeU32(tmp, data.getSize());
os.write((char*)tmp, 4);
-
+
// We will be writing 8-bit pairs of more_count and byte
u8 more_count = 0;
u8 current_byte = data[0];
u8 tmp[4];
is.read((char*)tmp, 4);
u32 len = readU32(tmp);
-
+
// We will be reading 8-bit pairs of more_count and byte
u32 count = 0;
for(;;)
u8 byte=0;
is.read((char*)&more_count, 1);
-
+
is.read((char*)&byte, 1);
if(is.eof())
projects / oweals / minetest.git / blobdiff