summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPixel <pixel@nobis-crew.org>2011-12-13 00:55:43 -0800
committerPixel <pixel@nobis-crew.org>2011-12-13 00:55:43 -0800
commitc3085db4a169ea17f8bc5c0384b71846c5e7a7f9 (patch)
tree0d4b0fd97f0aabdd4d302e0dcefc32665908d848 /src
parent73e17feeb7231ac92fa69fa0272377855ba7994b (diff)
Fixing a few bugs and problems in the ZHandle code.
Diffstat (limited to 'src')
-rw-r--r--src/ZHandle.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/ZHandle.cc b/src/ZHandle.cc
index 964f56d..0a43b05 100644
--- a/src/ZHandle.cc
+++ b/src/ZHandle.cc
@@ -103,7 +103,7 @@ ssize_t Balau::ZStream::write(const void * buf, size_t count) throw (GeneralExce
m_zout.next_in = (Bytef *) const_cast<void *>(buf);
m_zout.avail_in = count;
void * obuf = alloca(BLOCK_SIZE);
- while ((count != 0) && !m_h->isClosed() && !m_h->isEOF()) {
+ while ((count != 0) && !m_h->isClosed()) {
m_zout.next_out = (Bytef *) obuf;
m_zout.avail_out = BLOCK_SIZE;
int r = deflate(&m_zout, Z_NO_FLUSH);
@@ -115,8 +115,9 @@ ssize_t Balau::ZStream::write(const void * buf, size_t count) throw (GeneralExce
if (w <= 0)
return wroteTotal;
}
- wroteTotal += compressed;
- count -= compressed;
+ size_t didRead = count - m_zout.avail_in;
+ wroteTotal += didRead;
+ count -= didRead;
}
return wroteTotal;
}