[kaffe] Some simple java.util.zip changes

[Mark Wielaard]

--=-8ZlWTR1Tm3fu4LhZCM0h
Content-Type: multipart/mixed; boundary="=-dufnqnRL0dD5UzCz1+qD"


--=-dufnqnRL0dD5UzCz1+qD
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

Hi,

Helmer found a nasty bug in the Classpath readManifest() implementation.
Which is now fixed in Classpath and for which there is a new test in
Mauve.

When I make the following simple changes to kaffe java/util/zip then I
can just drop in Classpath java/util/jar and all kaffe tests and the jar
mauve tests succeed with that.

Cheers,

Mark

--=-dufnqnRL0dD5UzCz1+qD
Content-Disposition: inline; filename=zip.patches
Content-Type: text/x-patch; name=zip.patches; charset=ISO-8859-1
Content-Transfer-Encoding: base64

SW5kZXg6IENoYW5nZUxvZw0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KUkNTIGZpbGU6IC9jdnMva2FmZmUva2FmZmUv
Q2hhbmdlTG9nLHYNCnJldHJpZXZpbmcgcmV2aXNpb24gMS4xNzE4DQpkaWZmIC11IC1yMS4xNzE4
IENoYW5nZUxvZw0KLS0tIENoYW5nZUxvZwkyNSBPY3QgMjAwMyAyMDowMDoxMSAtMDAwMAkxLjE3
MTgNCisrKyBDaGFuZ2VMb2cJMjYgT2N0IDIwMDMgMTU6MDU6MTQgLTAwMDANCkBAIC0xLDMgKzEs
MTEgQEANCisyMDAzLTEwLTI2ICBNYXJrIFdpZWxhYXJkIDxtYXJrQGtsb21wLm9yZz4NCisNCisJ
KiBsaWJyYXJpZXMvamF2YWxpYi9qYXZhL3V0aWwvemlwL1ppcEZpbGUuamF2YQ0KKwkoWmlwRmls
ZShGaWxlIGYsIGludCBtb2RlKSk6IE5ldyAoZHVtbXkpIG1ldGhvZC4NCisJKiBsaWJyYXJpZXMv
amF2YWxpYi9qYXZhL3V0aWwvemlwL1ppcElucHV0U3RyZWFtLmphdmENCisJKGdldE5leHRFbnRy
eSk6IFVzZSBjcmVhdGVaaXBFbnRyeSgpLg0KKwkoY3JlYXRlWmlwRW50cnkpOiBJbXBsZW1lbnQu
DQorDQogMjAwMy0xMC0yNSAgRGFsaWJvciBUb3BpYyA8cm9iaWxhZEBrYWZmZS5vcmc+DQogDQog
CSogRkFRL0ZBUS5hdXRvbWFrZTogUmVjb21tZW5kIGF1dG1ha2UgMS43LjguDQpJbmRleDogbGli
cmFyaWVzL2phdmFsaWIvamF2YS91dGlsL3ppcC9aaXBGaWxlLmphdmENCj09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NClJD
UyBmaWxlOiAvY3ZzL2thZmZlL2thZmZlL2xpYnJhcmllcy9qYXZhbGliL2phdmEvdXRpbC96aXAv
WmlwRmlsZS5qYXZhLHYNCnJldHJpZXZpbmcgcmV2aXNpb24gMS4xMQ0KZGlmZiAtdSAtcjEuMTEg
WmlwRmlsZS5qYXZhDQotLS0gbGlicmFyaWVzL2phdmFsaWIvamF2YS91dGlsL3ppcC9aaXBGaWxl
LmphdmEJMjkgU2VwIDIwMDMgMjM6NTA6MjYgLTAwMDAJMS4xMQ0KKysrIGxpYnJhcmllcy9qYXZh
bGliL2phdmEvdXRpbC96aXAvWmlwRmlsZS5qYXZhCTI2IE9jdCAyMDAzIDE1OjA1OjE0IC0wMDAw
DQpAQCAtNTEsNiArNTEsMTIgQEANCiAJdGhpcyhmLmdldFBhdGgoKSk7DQogfQ0KIA0KK3B1Ymxp
YyBaaXBGaWxlKEZpbGUgZiwgaW50IG1vZGUpIHRocm93cyBaaXBFeGNlcHRpb24sIElPRXhjZXB0
aW9uDQorew0KKwkvLyBYWFggaWdub3JpbmcgbW9kZSBmb3Igbm93DQorCXRoaXMoZik7DQorfQ0K
Kw0KIHB1YmxpYyB2b2lkIGNsb3NlKCkgdGhyb3dzIElPRXhjZXB0aW9uDQogew0KIAlpZiAoemlw
ICE9IG51bGwpIHsNCkluZGV4OiBsaWJyYXJpZXMvamF2YWxpYi9qYXZhL3V0aWwvemlwL1ppcElu
cHV0U3RyZWFtLmphdmENCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT0NClJDUyBmaWxlOiAvY3ZzL2thZmZlL2thZmZlL2xp
YnJhcmllcy9qYXZhbGliL2phdmEvdXRpbC96aXAvWmlwSW5wdXRTdHJlYW0uamF2YSx2DQpyZXRy
aWV2aW5nIHJldmlzaW9uIDEuMTcNCmRpZmYgLXUgLXIxLjE3IFppcElucHV0U3RyZWFtLmphdmEN
Ci0tLSBsaWJyYXJpZXMvamF2YWxpYi9qYXZhL3V0aWwvemlwL1ppcElucHV0U3RyZWFtLmphdmEJ
MjQgT2N0IDIwMDMgMTY6NDI6MTEgLTAwMDAJMS4xNw0KKysrIGxpYnJhcmllcy9qYXZhbGliL2ph
dmEvdXRpbC96aXAvWmlwSW5wdXRTdHJlYW0uamF2YQkyNiBPY3QgMjAwMyAxNTowNToxNSAtMDAw
MA0KQEAgLTYzLDcgKzYzLDcgQEANCiAgICAgICByZWFkRnVsbHkoZXh0cmEsIDAsIGV4dHJhLmxl
bmd0aCk7DQogDQogICAgICAgLy8gU2V0dXAgbmV3IGVudHJ5DQotICAgICAgZW50cnkgPSBuZXcg
WmlwRW50cnkoVVRGOC5kZWNvZGUobmFtZUJ1ZikpOw0KKyAgICAgIGVudHJ5ID0gY3JlYXRlWmlw
RW50cnkoVVRGOC5kZWNvZGUobmFtZUJ1ZikpOw0KICAgICAgIGVudHJ5LnZlcnNpb24gPSBnZXQx
Nih6aGVhZGVyLCBMT0NWRVIpOw0KICAgICAgIGVudHJ5LmZsYWcgICAgPSBnZXQxNih6aGVhZGVy
LCBMT0NGTEcpOw0KIA0KQEAgLTIxMSw4ICsyMTEsNyBAQA0KICAgfQ0KIA0KICAgcHJvdGVjdGVk
IFppcEVudHJ5IGNyZWF0ZVppcEVudHJ5KFN0cmluZyBuYW1lKSB7DQotCS8vIFhYWCBGSVhNRSB3
aGF0IGlzIHRoaXMgc3VwcG9zZWQgdG8gZG8/DQotCXJldHVybiBudWxsOw0KKwlyZXR1cm4gbmV3
IFppcEVudHJ5KG5hbWUpOw0KICAgfQ0KIH0NCiANCg==

--=-dufnqnRL0dD5UzCz1+qD--

--=-8ZlWTR1Tm3fu4LhZCM0h
Content-Type: application/pgp-signature; name=signature.asc
Content-Description: This is a digitally signed message part

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3 (GNU/Linux)

iD8DBQA/m+KHxVhZCJWr9QwRAq8XAJ4oGAy5SsEqku+n0cd8Z/hXrFp4PQCfdQ+2
mlGPXQWjkWKW9HYFPmLFpyo=
=kPu2
-----END PGP SIGNATURE-----

--=-8ZlWTR1Tm3fu4LhZCM0h--