Index: java/io/DeleteFileHelper.java
===================================================================
RCS file: java/io/DeleteFileHelper.java
diff -N java/io/DeleteFileHelper.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ java/io/DeleteFileHelper.java	19 May 2004 11:06:43 -0000
@@ -0,0 +1,112 @@
+/* DeleteFileHelper.java -- Helper class to delete files on VM exit
+   Copyright (C) 2004  Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+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
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+02111-1307 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package java.io;
+
+import java.security.AccessController;
+import java.security.PrivilegedAction;
+import java.util.ArrayList;
+import java.util.Iterator;
+
+/**
+ * @author Guilhem Lavaux (address@hidden)
+ * @author Jeroen Frijters (address@hidden)
+ * @author Michael Koch (address@hidden)
+ */
+public final class DeleteFileHelper extends Thread
+{
+  private static ArrayList filesToDelete;
+
+  static
+  {
+    Runtime.getRuntime().addShutdownHook(new DeleteFileHelper());
+  }
+
+  static synchronized void add(File file)
+  {
+    if (filesToDelete == null)
+      {
+        filesToDelete = new ArrayList();
+        
+        AccessController.doPrivileged(new PrivilegedAction()
+          {
+            public Object run()
+            {
+              try
+                {
+                  Runtime.getRuntime().addShutdownHook(new DeleteFileHelper());
+                }
+              catch (IllegalStateException e)
+                {
+                  // Shutdown is already in progress, so we can't register ours.
+                }
+                
+              return null;
+            }
+          });
+      }
+      
+    filesToDelete.add(file);
+  }
+
+  private static synchronized void deleteFiles()
+  {
+    Iterator it = filesToDelete.iterator();
+	
+    while (it.hasNext())
+      {
+	try
+	  {
+	    File file = (File) it.next();
+	    file.delete();
+	  }
+	catch (Exception e)
+	  {
+	    // Do nothing here.
+	  }
+      }
+  }
+
+  private DeleteFileHelper()
+  {
+  }
+  
+  public void run()
+  {
+    deleteFiles();
+  }
+}
Index: java/io/File.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/io/File.java,v
retrieving revision 1.46
diff -u -r1.46 File.java
--- java/io/File.java	7 May 2004 08:10:29 -0000	1.46
+++ java/io/File.java	19 May 2004 11:06:44 -0000
@@ -39,13 +39,13 @@
 
 package java.io;
 
+import gnu.java.io.PlatformHelper;
+
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
 
-import gnu.java.io.PlatformHelper;
-
 /* Written using "Java Class Libraries", 2nd edition, ISBN 0-201-31002-3
  * "The Java Language Specification", ISBN 0-201-63451-1
  * Status:  Complete to version 1.3.
@@ -1180,12 +1180,7 @@
     if (sm != null)
       sm.checkDelete(path);
 
-    // Sounds like we need to do some VM specific stuff here. We could delete
-    // the file in finalize() and set FinalizeOnExit to true, but delete on
-    // finalize != delete on exit and we should not be setting up system
-    // parameters without the user's knowledge.
-    // FIXME: ********IMPLEMENT ME!!!!!!***************
-    return;
+    DeleteFileHelper.add(this);
   }
 
   private void writeObject(ObjectOutputStream oos) throws IOException