* java/io/File.java (deleteOnExit): New method.

        * gnu/gcj/runtime/FileDeleter.java: New class.
        * java/lang/natRuntime.cc (exit): Call
        FileDeleter.deleteOnExitNow()
        * Makefile.am: Add FileDeleter.java.
        * Makefile.in: Rebuilt.


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

2 files changed, 19 insertions, 1 deletions

diff --git a/libjava/java/io/File.java b/libjava/java/io/File.java
index b9ff9ff23f2..9043660be38 100644
--- a/libjava/java/io/File.java
+++ b/libjava/java/io/File.java
@@ -10,6 +10,9 @@ details.  */
 
 package java.io;
 
+import java.util.*;
+import gnu.gcj.runtime.FileDeleter;
+
 /**
  * @author Tom Tromey <tromey@cygnus.com>
  * @date September 24, 1998 
@@ -42,7 +45,7 @@ public class File implements Serializable
     return access (p, WRITE);
   }
 
-  private final native boolean performDelete (String canon);
+  private final native static boolean performDelete (String canon);
   public boolean delete ()
   {
     SecurityManager s = System.getSecurityManager();
@@ -347,6 +350,17 @@ public class File implements Serializable
     return p;
   }
 
+  // Add this File to the set of files to be deleted upon normal
+  // termination.
+  public void deleteOnExit ()
+  {
+    SecurityManager sm = System.getSecurityManager ();
+    if (sm != null)
+      sm.checkDelete (getName ());
+
+    FileDeleter.add (this);
+  }
+
   // QUERY arguments to access function.
   private final static int READ = 0;
   private final static int WRITE = 1;
diff --git a/libjava/java/lang/natRuntime.cc b/libjava/java/lang/natRuntime.cc
index ad45066c261..93771651afe 100644
--- a/libjava/java/lang/natRuntime.cc
+++ b/libjava/java/lang/natRuntime.cc
@@ -17,6 +17,7 @@ details.  */
 #include <java/lang/Runtime.h>
 #include <java/lang/UnknownError.h>
 #include <java/lang/UnsatisfiedLinkError.h>
+#include <gnu/gcj/runtime/FileDeleter.h>
 
 #include <jni.h>
 
@@ -85,6 +86,9 @@ java::lang::Runtime::exit (jint status)
   if (finalize_on_exit)
     _Jv_RunAllFinalizers ();
 
+  // Delete all files registered with File.deleteOnExit()
+  gnu::gcj::runtime::FileDeleter::deleteOnExitNow ();
+
   ::exit (status);
 }