claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ArchiveTools] Zip read tweak

Browse Source
This commit is contained in:
Matt Nadareski
2017-03-19 20:00:53 -07:00
parent ed733793d4
commit 6b59910534
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
SabreTools.Helper/Tools/ArchiveTools.cs
View File

@@ -385,14 +385,19 @@ namespace SabreTools.Helper.Tools
// Otherwise, we do the normal loop // Otherwise, we do the normal loop
else else
{ {
int realBufferSize = (streamsize < _bufferSize ? (int)streamsize : _bufferSize); byte[] ibuffer = new byte[_bufferSize];
byte[] ibuffer = new byte[realBufferSize];
int ilen; int ilen;
while ((ilen = readStream.Read(ibuffer, 0, realBufferSize)) > 0) while (streamsize > _bufferSize)
{ {
ilen = readStream.Read(ibuffer, 0, _bufferSize);
ms.Write(ibuffer, 0, ilen); ms.Write(ibuffer, 0, ilen);
ms.Flush(); ms.Flush();
streamsize -= _bufferSize;
} }
ilen = readStream.Read(ibuffer, 0, (int)streamsize);
ms.Write(ibuffer, 0, ilen);
ms.Flush();
} }
zr = zf.CloseReadStream(); zr = zf.CloseReadStream();
@@ -847,14 +852,19 @@ namespace SabreTools.Helper.Tools
// Otherwise, we do the normal loop // Otherwise, we do the normal loop
else else
{ {
int realBufferSize = (streamsize < _bufferSize ? (int)streamsize : _bufferSize); byte[] ibuffer = new byte[_bufferSize];
byte[] ibuffer = new byte[realBufferSize];
int ilen; int ilen;
while ((ilen = readStream.Read(ibuffer, 0, realBufferSize)) > 0) while (streamsize > _bufferSize)
{ {
ilen = readStream.Read(ibuffer, 0, _bufferSize);
entryStream.Write(ibuffer, 0, ilen); entryStream.Write(ibuffer, 0, ilen);
entryStream.Flush(); entryStream.Flush();
streamsize -= _bufferSize;
} }
ilen = readStream.Read(ibuffer, 0, (int)streamsize);
entryStream.Write(ibuffer, 0, ilen);
entryStream.Flush();
} }
zr = zf.CloseReadStream(); zr = zf.CloseReadStream();