InflaterInputStream.java (read): Loop if data has been read but none output by inflater.

	* java/util/zip/InflaterInputStream.java (read): Loop if data has
	been read but none output by inflater.
	* java/util/zip/natDeflater.cc (reset): Set is_finished.
	* java/util/zip/natInflater.cc (reset): Set dist_needed and
	is_finished.
	* java/util/zip/ZipOutputStream.java: Replaced with Classpath
	version.
	* java/util/zip/ZipFile.java: Replaced with Classpath version.
	* java/util/zip/ZipEntry.java: Replaced with Classpath version.
	* java/util/zip/ZipInputStream.java: Replaced with Classpath
	version.
	* java/util/zip/ZipConstants.java: Replaced with Classpath version.

From-SVN: r54653

libjava/ChangeLog

+2002-06-15  Tom Tromey  <tromey@redhat.com>
+
+	* java/util/zip/InflaterInputStream.java (read): Loop if data has
+	been read but none output by inflater.
+	* java/util/zip/natDeflater.cc (reset): Set is_finished.
+	* java/util/zip/natInflater.cc (reset): Set dist_needed and
+	is_finished.
+	* java/util/zip/ZipOutputStream.java: Replaced with Classpath
+	version.
+	* java/util/zip/ZipFile.java: Replaced with Classpath version.
+	* java/util/zip/ZipEntry.java: Replaced with Classpath version.
+	* java/util/zip/ZipInputStream.java: Replaced with Classpath
+	version.
+	* java/util/zip/ZipConstants.java: Replaced with Classpath version.
+
 2002-06-13  Tom Tromey  <tromey@redhat.com>
 
 	* java/lang/natString.cc (init): Handle case where DONT_COPY is

libjava/java/util/zip/InflaterInputStream.java

 /* InflaterInputStream.java - Input stream filter for decompressing
-   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -92,23 +92,30 @@ public class InflaterInputStream extends FilterInputStream
       throw new IOException ("stream closed");
     if (inf.finished())
       return -1;
-    if (inf.needsInput())
-      fill ();
-    int count;
-    try
+
+    int count = 0;
+    while (count == 0)
       {
-	count = inf.inflate(buf, off, len);	
-	if (count == 0)
+	if (inf.needsInput())
+	  fill ();
+	try
 	  {
-	    if (this.len == -1)
-	      return -1; // Couldn't get any more data to feed to the Inflater
-	    if (inf.needsDictionary())
-	      throw new ZipException ("Inflater needs Dictionary");
-	  }	      
-      }
-    catch (DataFormatException dfe)
-      {
-	throw new ZipException (dfe.getMessage());
+	    count = inf.inflate(buf, off, len);	
+	    if (count == 0)
+	      {
+		if (this.len == -1)
+		  {
+		    // Couldn't get any more data to feed to the Inflater
+		    return -1;
+		  }
+		if (inf.needsDictionary())
+		  throw new ZipException ("Inflater needs Dictionary");
+	      }
+	  }
+	catch (DataFormatException dfe)
+	  {
+	    throw new ZipException (dfe.getMessage());
+	  }
       }
     return count;
   }

libjava/java/util/zip/ZipConstants.java

-/* ZipConstants.java - Some constants used in the zip package
-   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+/* java.util.zip.ZipConstants
+   Copyright (C) 2001 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -7,7 +7,7 @@ GNU Classpath is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
- 
+
 GNU Classpath is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -37,19 +37,61 @@ exception statement from your version. */
 
 package java.util.zip;
 
-/**
- * Some constants used in the zip package.
- * <p>
- * Since this package local interface is completely undocumented no effort
- * is made to make it compatible with other implementations.
- * If someone is really interested you can probably come up with the right
- * constants and documentation by studying the Info-ZIP zipfile.c constants.
- */
 interface ZipConstants
 {
-  // Size in bytes of local file header, including signature.
-  public static final int LOCAL_FILE_HEADER_SIZE = 30;
+    /* The local file header */
+    public final static int LOCHDR = 30;
+    public final static int LOCSIG = 'P'|('K'<<8)|(3<<16)|(4<<24);
+
+    public final static int LOCVER =  4;
+    public final static int LOCFLG =  6;
+    public final static int LOCHOW =  8;
+    public final static int LOCTIM = 10;
+    public final static int LOCCRC = 14;
+    public final static int LOCSIZ = 18;
+    public final static int LOCLEN = 22;
+    public final static int LOCNAM = 26;
+    public final static int LOCEXT = 28;
+
+    /* The Data descriptor */
+    public final static int EXTSIG = 'P'|('K'<<8)|(7<<16)|(8<<24);
+    public final static int EXTHDR = 16;
+
+    public final static int EXTCRC =  4;
+    public final static int EXTSIZ =  8;
+    public final static int EXTLEN = 12;
 
-  // Size in bytes of the "end of central directory" record, with signature.
-  public static final int END_CENTRAL_DIR_SIZE = 22;
+    /* The central directory file header */
+    public final static int CENSIG = 'P'|('K'<<8)|(1<<16)|(2<<24);
+    public final static int CENHDR = 46;
+
+    public final static int CENVEM =  4;
+    public final static int CENVER =  6;
+    public final static int CENFLG =  8;
+    public final static int CENHOW = 10;
+    public final static int CENTIM = 12;
+    public final static int CENCRC = 16;
+    public final static int CENSIZ = 20;
+    public final static int CENLEN = 24;
+    public final static int CENNAM = 28;
+    public final static int CENEXT = 30;
+    public final static int CENCOM = 32;
+    public final static int CENDSK = 34;
+    public final static int CENATT = 36;
+    public final static int CENATX = 38;
+    public final static int CENOFF = 42;
+
+    /* The entries in the end of central directory */
+    public final static int ENDSIG = 'P'|('K'<<8)|(5<<16)|(6<<24);
+    public final static int ENDHDR = 22;
+
+    /* The following two fields are missing in SUN JDK */
+    final static int ENDNRD =  4;
+    final static int ENDDCD =  6;
+    public final static int ENDSUB =  8;
+    public final static int ENDTOT = 10;
+    public final static int ENDSIZ = 12;
+    public final static int ENDOFF = 16;
+    public final static int ENDCOM = 20;
 }
+

libjava/java/util/zip/natDeflater.cc

 // natDeflater.cc - Implementation of Deflater native methods.
 
-/* Copyright (C) 1999  Free Software Foundation
+/* Copyright (C) 1999, 2002  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -125,6 +125,7 @@ java::util::zip::Deflater::reset ()
   // Just ignore errors.
   deflateReset (s);
   flush_flag = 0;
+  is_finished = false;
 }
 
 void

libjava/java/util/zip/natInflater.cc

 // natInflater.cc - Implementation of Inflater native methods.
 
-/* Copyright (C) 1999  Free Software Foundation
+/* Copyright (C) 1999, 2002  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -149,6 +149,8 @@ java::util::zip::Inflater::reset ()
   z_streamp s = (z_streamp) zstream;
   // Just ignore errors.
   inflateReset (s);
+  is_finished = false;
+  dict_needed = false;
 }
 
 void