diff options
Diffstat (limited to 'contrib/minizip/unzip.c')
-rw-r--r-- | contrib/minizip/unzip.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/contrib/minizip/unzip.c b/contrib/minizip/unzip.c index 050d506..6a4d104 100644 --- a/contrib/minizip/unzip.c +++ b/contrib/minizip/unzip.c | |||
@@ -15,7 +15,7 @@ | |||
15 | 15 | ||
16 | ------------------------------------------------------------------------------------ | 16 | ------------------------------------------------------------------------------------ |
17 | Decryption code comes from crypt.c by Info-ZIP but has been greatly reduced in terms of | 17 | Decryption code comes from crypt.c by Info-ZIP but has been greatly reduced in terms of |
18 | compatibility with older software. The following is from the original crypt.c. | 18 | compatibility with older software. The following is from the original crypt.c. |
19 | Code woven in by Terry Thorsen 1/2003. | 19 | Code woven in by Terry Thorsen 1/2003. |
20 | 20 | ||
21 | Copyright (c) 1990-2000 Info-ZIP. All rights reserved. | 21 | Copyright (c) 1990-2000 Info-ZIP. All rights reserved. |
@@ -45,13 +45,13 @@ | |||
45 | 2007-2008 - Even Rouault - Decoration of symbol names unz* -> cpl_unz* | 45 | 2007-2008 - Even Rouault - Decoration of symbol names unz* -> cpl_unz* |
46 | 2007-2008 - Even Rouault - Remove old C style function prototypes | 46 | 2007-2008 - Even Rouault - Remove old C style function prototypes |
47 | 2007-2008 - Even Rouault - Add unzip support for ZIP64 | 47 | 2007-2008 - Even Rouault - Add unzip support for ZIP64 |
48 | 48 | ||
49 | Copyright (C) 2007-2008 Even Rouault | 49 | Copyright (C) 2007-2008 Even Rouault |
50 | 50 | ||
51 | 51 | ||
52 | Okt-2009 - Mathias Svensson - Removed cpl_* from symbol names (Even Rouault added them but since this is now moved to a new project (minizip64) I renamed them again). | 52 | Okt-2009 - Mathias Svensson - Removed cpl_* from symbol names (Even Rouault added them but since this is now moved to a new project (minizip64) I renamed them again). |
53 | Okt-2009 - Mathias Svensson - Fixed problem if uncompressed size was > 4G and compressed size was <4G | 53 | Okt-2009 - Mathias Svensson - Fixed problem if uncompressed size was > 4G and compressed size was <4G |
54 | should only read the compressed/uncompressed size from the Zip64 format if | 54 | should only read the compressed/uncompressed size from the Zip64 format if |
55 | the size from normal header was 0xFFFFFFFF | 55 | the size from normal header was 0xFFFFFFFF |
56 | Okt-2009 - Mathias Svensson - Applied some bug fixes from paches recived from Gilles Vollant | 56 | Okt-2009 - Mathias Svensson - Applied some bug fixes from paches recived from Gilles Vollant |
57 | Okt-2009 - Mathias Svensson - Applied support to unzip files with compression mathod BZIP2 (bzip2 lib is required) | 57 | Okt-2009 - Mathias Svensson - Applied support to unzip files with compression mathod BZIP2 (bzip2 lib is required) |
@@ -1010,7 +1010,7 @@ local int unz64local_GetCurrentFileInfoInternal (unzFile file, | |||
1010 | if ((err==UNZ_OK) && (file_info.size_file_extra != 0)) | 1010 | if ((err==UNZ_OK) && (file_info.size_file_extra != 0)) |
1011 | { | 1011 | { |
1012 | uLong acc = 0; | 1012 | uLong acc = 0; |
1013 | 1013 | ||
1014 | // since lSeek now points to after the extra field we need to move back | 1014 | // since lSeek now points to after the extra field we need to move back |
1015 | lSeek -= file_info.size_file_extra; | 1015 | lSeek -= file_info.size_file_extra; |
1016 | 1016 | ||
@@ -1826,7 +1826,7 @@ extern int ZEXPORT unzReadCurrentFile (unzFile file, voidp buf, unsigned len) | |||
1826 | pfile_in_zip_read_info->stream.next_out = (Bytef*)pfile_in_zip_read_info->bstream.next_out; | 1826 | pfile_in_zip_read_info->stream.next_out = (Bytef*)pfile_in_zip_read_info->bstream.next_out; |
1827 | pfile_in_zip_read_info->stream.avail_out = pfile_in_zip_read_info->bstream.avail_out; | 1827 | pfile_in_zip_read_info->stream.avail_out = pfile_in_zip_read_info->bstream.avail_out; |
1828 | pfile_in_zip_read_info->stream.total_out = pfile_in_zip_read_info->bstream.total_out_lo32; | 1828 | pfile_in_zip_read_info->stream.total_out = pfile_in_zip_read_info->bstream.total_out_lo32; |
1829 | 1829 | ||
1830 | if (err==BZ_STREAM_END) | 1830 | if (err==BZ_STREAM_END) |
1831 | return (iRead==0) ? UNZ_EOF : iRead; | 1831 | return (iRead==0) ? UNZ_EOF : iRead; |
1832 | if (err!=BZ_OK) | 1832 | if (err!=BZ_OK) |