Public/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2025-11-13 11:58:26 -06:00
Code Activity

Windows: update libzip to version 1.2.0

Browse Source
This commit is contained in:
Mounir IDRASSI
2017-04-26 00:10:55 +02:00
parent 9270952b3d
commit d081d6143e
44 changed files with 795 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/Common/libzip/zip_source_read.c
View File

@@ -1,6 +1,6 @@
/*
zip_source_read.c -- read data from zip_source
Copyright (C) 2009-2014 Dieter Baron and Thomas Klausner
Copyright (C) 2009-2016 Dieter Baron and Thomas Klausner
This file is part of libzip, a library to manipulate ZIP archives.
The authors can be contacted at <libzip@nih.at>
@@ -38,6 +38,9 @@
zip_int64_t
zip_source_read(zip_source_t *src, void *data, zip_uint64_t len)
{
zip_uint64_t bytes_read;
zip_int64_t n;
if (src->source_closed) {
return -1;
}
@@ -46,5 +49,39 @@ zip_source_read(zip_source_t *src, void *data, zip_uint64_t len)
return -1;
}
return _zip_source_call(src, data, len, ZIP_SOURCE_READ);
if (_zip_source_had_error(src)) {
return -1;
}
if (_zip_source_eof(src)) {
return 0;
}
bytes_read = 0;
while (bytes_read < len) {
if ((n = _zip_source_call(src, (zip_uint8_t *)data + bytes_read, len - bytes_read, ZIP_SOURCE_READ)) < 0) {
if (bytes_read == 0) {
return -1;
}
else {
return (zip_int64_t)bytes_read;
}
}
if (n == 0) {
src->eof = 1;
break;
}
bytes_read += (zip_uint64_t)n;
}
return (zip_int64_t)bytes_read;
}
bool
_zip_source_eof(zip_source_t *src)
{
return src->eof;
}