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

2004-03-31  Andrew Haley  <aph@redhat.com>

        PR java/14104
        * jcf-io.c (opendir_in_zip): Tidy up error handling.

From-SVN: r80248

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 3843f9d..11d090d 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-31  Andrew Haley  <aph@redhat.com>
+
+       PR java/14104
+       * jcf-io.c (opendir_in_zip): Tidy up error handling.
+
 2004-03-30  Zack Weinberg  <zack@codesourcery.com>
 
        * builtins.c, expr.c, jcf.h, parse.h: Use new shorter

diff --git a/gcc/java/jcf-io.c b/gcc/java/jcf-io.c
index 101be8e..2a22e0a 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;
 }