re PR java/14104 (java testsuite fails "linking simple")

	PR java/14104
	Backport from mainline
	2004-03-31  Andrew Haley  <aph@redhat.com>
	* jcf-io.c (opendir_in_zip): Tidy up error handling.

From-SVN: r92096

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index a248524a748d87a87963e014e52c11c8ed007db6..2e3e40229d1b6432caf4e8d5980b1ed79bd174ef 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,10 @@
+2004-12-13  Roger Sayle  <roger@eyesopen.com>
+
+       PR java/14104
+       Backport from mainline
+       2004-03-31  Andrew Haley  <aph@redhat.com>
+       * jcf-io.c (opendir_in_zip): Tidy up error handling.
+
 2004-12-07  Tom Tromey  <tromey@redhat.com>
 
        PR java/14853:

diff --git a/gcc/java/jcf-io.c b/gcc/java/jcf-io.c
index 101be8ee1d3a389c54dd76f321ebd610c5a8adbc..059d7f32731a2f2c6d5fbc2668a8df2208e5a837 100644 (file)
--- a/gcc/java/jcf-io.c
+++ b/gcc/java/jcf-io.c
@@ -120,7 +120,6 @@ opendir_in_zip (const char *zipfile, int is_system)
   zipf->next = SeenZipFiles;
   zipf->name = (char*)(zipf+1);
   strcpy (zipf->name, zipfile);
-  SeenZipFiles = zipf;
   fd = open (zipfile, O_RDONLY | O_BINARY);
   zipf->fd = fd;
   if (fd < 0)
@@ -140,6 +139,8 @@ opendir_in_zip (const char *zipfile, int is_system)
       if (read_zip_archive (zipf) != 0)
        return NULL;
     }
+
+  SeenZipFiles = zipf;
   return zipf;
 }