* java/util/zip/ZipFile.java: Implement OPEN_DELETE mode, new constructor,

    close can delete the file, finalize calls close.
    * java/util/jar/JarFile.java: Constructor that takes mode now calls super.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@36007 138bc75d-0d04-0410-961f-82ee72b054a4

2 files changed, 43 insertions, 14 deletions

diff --git a/libjava/java/util/jar/JarFile.java b/libjava/java/util/jar/JarFile.java
index a266f305bac..5e0f73b6c3b 100644
--- a/libjava/java/util/jar/JarFile.java
+++ b/libjava/java/util/jar/JarFile.java
@@ -129,15 +129,17 @@ public class JarFile extends ZipFile {
     }
 
     /**
-     * XXX - not yet implemented in java.util.zip.ZipFile
+     * Creates a new JarFile with the indicated mode, tries to read the
+     * manifest and if the manifest exists and verify is true verfies it.
      *
      * @param file the file to open to open as a jar file
      * @param verify checks manifest and entries when true and a manifest
      * exists, when false no checks are made
-     * @param mode XXX - see ZipFile
-     * @exception FileNotFoundException XXX
-     * @exception IOException XXX
-     * @exception IllegalArgumentException XXX
+     * @param mode either ZipFile.OPEN_READ or
+     *             (ZipFile.OPEN_READ | ZipFile.OPEN_DELETE)
+     * @exception FileNotFoundException if the file does not exist
+     * @exception IOException if another IO exception occurs while reading
+     * @exception IllegalArgumentException when given an illegal mode
      * 
      * @since 1.3
      */
@@ -145,12 +147,10 @@ public class JarFile extends ZipFile {
                                                     FileNotFoundException,
                                                     IOException,
                                                     IllegalArgumentException {
-        // XXX - For now don't use super(file, mode)
-        this(file, verify);
-        /* super(file, mode);
-           manifest = readManifest();
-           if (verify)
-               verify(); */
+        super(file, mode);
+        manifest = readManifest();
+        if (verify)
+            verify();
     }
 
     // Methods
diff --git a/libjava/java/util/zip/ZipFile.java b/libjava/java/util/zip/ZipFile.java
index 43d72267aea..bb6eab47146 100644
--- a/libjava/java/util/zip/ZipFile.java
+++ b/libjava/java/util/zip/ZipFile.java
@@ -18,15 +18,35 @@ import java.io.*;
 
 public class ZipFile implements ZipConstants
 {
+  public static final int OPEN_READ = 1;
+  public static final int OPEN_DELETE = 4;
+
   public ZipFile (String fname) throws IOException
   {
-    file = new RandomAccessFile(fname, "r");
-    name = fname;
-    readDirectory ();
+    this(new File(fname));
   }
 
   public ZipFile (File f) throws IOException
   {
+    this(f, OPEN_READ);
+  }
+
+  public ZipFile (File f, int mode) throws IOException
+  {
+    if (mode != OPEN_READ && mode != (OPEN_READ | OPEN_DELETE))
+        throw new IllegalArgumentException
+            ("mode can only be OPEN_READ or OPEN_READ | OPEN_DELETE");
+
+    if ((mode & OPEN_DELETE) != 0)
+      {
+	delete_on_close = f;
+	// f.deleteOnExit(); XXX - Not yet implemented in libgcj
+      }
+    else
+      {
+	delete_on_close = null;
+      }
+
     file = new RandomAccessFile(f, "r");
     name = f.getName();
     readDirectory ();
@@ -107,6 +127,8 @@ public class ZipFile implements ZipConstants
     file.close();
     entries = null;
     numEntries = 0;
+    if (delete_on_close != null)
+	delete_on_close.delete();
   }
 
   public ZipEntry getEntry(String name)
@@ -148,6 +170,10 @@ public class ZipFile implements ZipConstants
       return numEntries;
   }
 
+  protected void finalize () throws IOException {
+    close();
+  }
+
   private int readu2 () throws IOException
   {
     int byte0 = file.read();
@@ -173,6 +199,9 @@ public class ZipFile implements ZipConstants
   int numEntries;
   RandomAccessFile file;
   String name;
+  /** File to delete on close or null. */
+  File delete_on_close;
+    
 }
 
 final class ZipEnumeration implements java.util.Enumeration