Author: bodewig
Date: Wed Jul 17 14:37:22 2013
New Revision: 1504154
URL: http://svn.apache.org/r1504154
Log:
Remove direct citations form APPNOTE.TXT in javadocs, obey to section
1.4.2 in http://www.pkware.com/documents/casestudies/APPNOTE.TXT
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnicodeCommentExtraField.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnicodePathExtraField.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/Zip64ExtendedInformationExtraField.java
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnicodeCommentExtraField.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnicodeCommentExtraField.java?rev=1504154&r1=1504153&r2=1504154&view=diff
==============================================================================
---
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnicodeCommentExtraField.java
(original)
+++
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnicodeCommentExtraField.java
Wed Jul 17 14:37:22 2013
@@ -24,15 +24,10 @@ package org.apache.commons.compress.arch
* <p>Stores the UTF-8 version of the file comment as stored in the
* central directory header.</p>
*
- * <pre>
- * Value Size Description
- * ----- ---- -----------
- * (UCom) 0x6375 Short tag for this extra block type ("uc")
- * TSize Short total data size for this block
- * Version 1 byte version of this extra field, currently 1
- * ComCRC32 4 bytes Comment Field CRC32 Checksum
- * UnicodeCom Variable UTF-8 version of the entry comment
- * </pre>
+ * <p>See {@link
+ * "http://www.pkware.com/documents/casestudies/APPNOTE.TXT PKWARE's
+ * APPNOTE.TXT, section 4.6.8"}.</p>
+ *
* @NotThreadSafe super-class is not thread-safe
*/
public class UnicodeCommentExtraField extends AbstractUnicodeExtraField {
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnicodePathExtraField.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnicodePathExtraField.java?rev=1504154&r1=1504153&r2=1504154&view=diff
==============================================================================
---
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnicodePathExtraField.java
(original)
+++
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/UnicodePathExtraField.java
Wed Jul 17 14:37:22 2013
@@ -24,15 +24,9 @@ package org.apache.commons.compress.arch
* <p>Stores the UTF-8 version of the file name field as stored in the
* local header and central directory header.</p>
*
- * <pre>
- * Value Size Description
- * ----- ---- -----------
- * (UPath) 0x7075 Short tag for this extra block type ("up")
- * TSize Short total data size for this block
- * Version 1 byte version of this extra field, currently 1
- * NameCRC32 4 bytes File Name Field CRC32 Checksum
- * UnicodeName Variable UTF-8 version of the entry File Name
- * </pre>
+ * <p>See {@link
+ * "http://www.pkware.com/documents/casestudies/APPNOTE.TXT PKWARE's
+ * APPNOTE.TXT, section 4.6.9"}.</p>
* @NotThreadSafe super-class is not thread-safe
*/
public class UnicodePathExtraField extends AbstractUnicodeExtraField {
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/Zip64ExtendedInformationExtraField.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/Zip64ExtendedInformationExtraField.java?rev=1504154&r1=1504153&r2=1504154&view=diff
==============================================================================
---
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/Zip64ExtendedInformationExtraField.java
(original)
+++
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/Zip64ExtendedInformationExtraField.java
Wed Jul 17 14:37:22 2013
@@ -27,42 +27,9 @@ import static org.apache.commons.compres
* Holds size and other extended information for entries that use Zip64
* features.
*
- * <p>From {@link "http://www.pkware.com/documents/casestudies/APPNOTE.TXT
PKWARE's APPNOTE.TXT"}
- * <pre>
- * Zip64 Extended Information Extra Field (0x0001):
- *
- * The following is the layout of the zip64 extended
- * information "extra" block. If one of the size or
- * offset fields in the Local or Central directory
- * record is too small to hold the required data,
- * a Zip64 extended information record is created.
- * The order of the fields in the zip64 extended
- * information record is fixed, but the fields will
- * only appear if the corresponding Local or Central
- * directory record field is set to 0xFFFF or 0xFFFFFFFF.
- *
- * Note: all fields stored in Intel low-byte/high-byte order.
- *
- * Value Size Description
- * ----- ---- -----------
- * (ZIP64) 0x0001 2 bytes Tag for this "extra" block type
- * Size 2 bytes Size of this "extra" block
- * Original
- * Size 8 bytes Original uncompressed file size
- * Compressed
- * Size 8 bytes Size of compressed data
- * Relative Header
- * Offset 8 bytes Offset of local header record
- * Disk Start
- * Number 4 bytes Number of the disk on which
- * this file starts
- *
- * This entry in the Local header must include BOTH original
- * and compressed file size fields. If encrypting the
- * central directory and bit 13 of the general purpose bit
- * flag is set indicating masking, the value stored in the
- * Local Header for the original file size will be zero.
- * </pre></p>
+ * <p>See {@link
+ * "http://www.pkware.com/documents/casestudies/APPNOTE.TXT PKWARE's
+ * APPNOTE.TXT, section 4.5.3"}.</p>
*
* <p>Currently Commons Compress doesn't support encrypting the
* central directory so the note about masking doesn't apply.</p>
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java?rev=1504154&r1=1504153&r2=1504154&view=diff
==============================================================================
---
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
(original)
+++
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/zip/ZipArchiveInputStream.java
Wed Jul 17 14:37:22 2013
@@ -113,38 +113,38 @@ public class ZipArchiveInputStream exten
private static final int LFH_LEN = 30;
/*
- local file header signature 4 bytes (0x04034b50)
- version needed to extract 2 bytes
- general purpose bit flag 2 bytes
- compression method 2 bytes
- last mod file time 2 bytes
- last mod file date 2 bytes
- crc-32 4 bytes
- compressed size 4 bytes
- uncompressed size 4 bytes
- file name length 2 bytes
- extra field length 2 bytes
+ local file header signature WORD
+ version needed to extract SHORT
+ general purpose bit flag SHORT
+ compression method SHORT
+ last mod file time SHORT
+ last mod file date SHORT
+ crc-32 WORD
+ compressed size WORD
+ uncompressed size WORD
+ file name length SHORT
+ extra field length SHORT
*/
private static final int CFH_LEN = 46;
/*
- central file header signature 4 bytes (0x02014b50)
- version made by 2 bytes
- version needed to extract 2 bytes
- general purpose bit flag 2 bytes
- compression method 2 bytes
- last mod file time 2 bytes
- last mod file date 2 bytes
- crc-32 4 bytes
- compressed size 4 bytes
- uncompressed size 4 bytes
- file name length 2 bytes
- extra field length 2 bytes
- file comment length 2 bytes
- disk number start 2 bytes
- internal file attributes 2 bytes
- external file attributes 4 bytes
- relative offset of local header 4 bytes
+ central file header signature WORD
+ version made by SHORT
+ version needed to extract SHORT
+ general purpose bit flag SHORT
+ compression method SHORT
+ last mod file time SHORT
+ last mod file date SHORT
+ crc-32 WORD
+ compressed size WORD
+ uncompressed size WORD
+ file name length SHORT
+ extra field length SHORT
+ file comment length SHORT
+ disk number start SHORT
+ internal file attributes SHORT
+ external file attributes WORD
+ relative offset of local header WORD
*/
private static final long TWO_EXP_32 = ZIP64_MAGIC + 1;
@@ -860,20 +860,20 @@ public class ZipArchiveInputStream exten
}
// End of Central Directory Record
- // end of central dir signature 4 bytes (0x06054b50)
- // number of this disk 2 bytes
+ // end of central dir signature WORD
+ // number of this disk SHORT
// number of the disk with the
- // start of the central directory 2 bytes
+ // start of the central directory SHORT
// total number of entries in the
- // central directory on this disk 2 bytes
+ // central directory on this disk SHORT
// total number of entries in
- // the central directory 2 bytes
- // size of the central directory 4 bytes
+ // the central directory SHORT
+ // size of the central directory WORD
// offset of start of central
// directory with respect to
- // the starting disk number 4 bytes
- // .ZIP file comment length 2 bytes
- // .ZIP file comment (variable size)
+ // the starting disk number WORD
+ // .ZIP file comment length SHORT
+ // .ZIP file comment up to 64KB
//
/**
