Subject: Some simple java.util.zip changes - msg#00182

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
Index: ChangeLog
===================================================================
RCS file: /cvs/kaffe/kaffe/ChangeLog,v
retrieving revision 1.1718
diff -u -r1.1718 ChangeLog
--- ChangeLog 25 Oct 2003 20:00:11 -0000 1.1718
+++ ChangeLog 26 Oct 2003 15:05:14 -0000
@@ -1,3 +1,11 @@
+2003-10-26 Mark Wielaard <mark@xxxxxxxxx>
+
+ * libraries/javalib/java/util/zip/ZipFile.java
+ (ZipFile(File f, int mode)): New (dummy) method.
+ * libraries/javalib/java/util/zip/ZipInputStream.java
+ (getNextEntry): Use createZipEntry().
+ (createZipEntry): Implement.
+
2003-10-25 Dalibor Topic <robilad@xxxxxxxxx>

* FAQ/FAQ.automake: Recommend autmake 1.7.8.
Index: libraries/javalib/java/util/zip/ZipFile.java
===================================================================
RCS file: /cvs/kaffe/kaffe/libraries/javalib/java/util/zip/ZipFile.java,v
retrieving revision 1.11
diff -u -r1.11 ZipFile.java
--- libraries/javalib/java/util/zip/ZipFile.java 29 Sep 2003 23:50:26
-0000 1.11
+++ libraries/javalib/java/util/zip/ZipFile.java 26 Oct 2003 15:05:14
-0000
@@ -51,6 +51,12 @@
this(f.getPath());
}

+public ZipFile(File f, int mode) throws ZipException, IOException
+{
+ // XXX ignoring mode for now
+ this(f);
+}
+
public void close() throws IOException
{
if (zip != null) {
Index: libraries/javalib/java/util/zip/ZipInputStream.java
===================================================================
RCS file: /cvs/kaffe/kaffe/libraries/javalib/java/util/zip/ZipInputStream.java,v
retrieving revision 1.17
diff -u -r1.17 ZipInputStream.java
--- libraries/javalib/java/util/zip/ZipInputStream.java 24 Oct 2003 16:42:11
-0000 1.17
+++ libraries/javalib/java/util/zip/ZipInputStream.java 26 Oct 2003 15:05:15
-0000
@@ -63,7 +63,7 @@
readFully(extra, 0, extra.length);

// Setup new entry
- entry = new ZipEntry(UTF8.decode(nameBuf));
+ entry = createZipEntry(UTF8.decode(nameBuf));
entry.version = get16(zheader, LOCVER);
entry.flag = get16(zheader, LOCFLG);

@@ -211,8 +211,7 @@
}

protected ZipEntry createZipEntry(String name) {
- // XXX FIXME what is this supposed to do?
- return null;
+ return new ZipEntry(name);
}
}

signature.asc
Description: This is a digitally signed message part