+2000-05-11 Tom Tromey <tromey@cygnus.com>
+
+ * java/util/zip/ZipInputStream.java (getNextEntry): When reading
+ file headers, don't include `size' in the skip call.
+
2000-05-10 Bryce McKinlay <bryce@albatross.co.nz>
* java/lang/StringBuffer.java (delete): Call arrayCopy() correctly.
-/* Copyright (C) 1999 Free Software Foundation
+/* Copyright (C) 1999, 2000 Free Software Foundation
This file is part of libgcj.
int fname_length = readu2();
int extra_length = readu2();
int fcomment_length = readu2();
- in.skip(12+fname_length+extra_length+fcomment_length+size);
+ // `12' is the number of bytes between the comment length
+ // field and the end of the fixed part of the header:
+ // 2 bytes for `disk number start'
+ // 2 bytes for `internal file attributes'
+ // 4 bytes for `external file attributes'
+ // 4 bytes for `relative offset of local header'
+ in.skip(12 + fname_length + extra_length + fcomment_length);
if (in.read() != 'P' || in.read() != 'K')
return null;
code = in.read();