From 7e60f47cd9d0b7c0e87ed3521d26c04a830c78bf Mon Sep 17 00:00:00 2001 From: Roger Sayle Date: Mon, 13 Dec 2004 18:00:02 +0000 Subject: [PATCH] re PR java/14104 (java testsuite fails "linking simple") PR java/14104 Backport from mainline 2004-03-31 Andrew Haley * jcf-io.c (opendir_in_zip): Tidy up error handling. From-SVN: r92096 --- gcc/java/ChangeLog | 7 +++++++ gcc/java/jcf-io.c | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index a248524a748d..2e3e40229d1b 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,10 @@ +2004-12-13 Roger Sayle + + PR java/14104 + Backport from mainline + 2004-03-31 Andrew Haley + * jcf-io.c (opendir_in_zip): Tidy up error handling. + 2004-12-07 Tom Tromey PR java/14853: diff --git a/gcc/java/jcf-io.c b/gcc/java/jcf-io.c index 101be8ee1d3a..059d7f32731a 100644 --- 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; } -- 2.47.2