Fix Issue 2138 - Allow more than 65535 files in Zip archives #2914
Conversation
Fixed by adding support for reading and writing Zip64 archives
|
Is there any way at all to unittest this, or is that impractical? |
|
It can be verified if it can read what it wrote and get the same data, and that's it. A more practical test would involve an external zip program, but would that still be a unittest? That's why I have written a small front end to be able to test it more. Suggestions? |
|
This is some serious chunk of code, we definitely need unittests to make sure it works. |
…riginal, quite random data
|
You mean the unittest here covers it all? If you're on Windows could you please build with -cov and make sure code is covered? Then let's merge. Thanks! |
|
Yes, I'm on Windows. This is the coverage test's result: https://github.com/fgda/d-stuff/blob/default/debug/zip.lst - generated on Windows 7 64-bit with DMD32 v2.066.1. Unittest covers 88%, and doesn't test functions related to timestamps and file attributes, because I haven't modified them. |
|
Auto-merge toggled on |
|
Let's roll this in. Thanks for this work! |
|
Yay! Thanks. Glad, I could contribute something. |
andralex
added
merging pending autotester
and removed
merging pending autotester
labels
Fix Issue 2138 - Allow more than 65535 files in Zip archives
The limit of 65536 files in an archive was bypassed by adding support for reading and writing the Zip64 flavour of Zip archives, which has two extra blocks before the end of central directory record (eocd), namely the zip64 eocd and zip64 eocd locator.
Other than that, all is the same, files over 4 GB still aren't supported, but with the current implementation of zip creating the complete archive in memory it wouldn't make much sense anyway. I have, however, changed the index used in the reader from int to uint, because IMO it unnecessarily limited the archives to 2 GB.
To test the code, I have written a small utility - https://github.com/fgda/d-stuff/blob/default/ziptest.d -
and tried it in both 32- and 64-bit on win64 with dmd together with 7-zip and Cygwin/zip, to test reading and writing. So far, with success.
This is my first pull request, be gentle. :)
Bugzilla: https://issues.dlang.org/show_bug.cgi?id=2138