Weird New libjava Testsuite Failure (PR java/14104)

Fri Mar 26 11:28:00 GMT 2004

Andrew Haley writes:
 > Andrew Haley writes:
 > > Ranjit Mathew writes:
 > > > 
 > > > You have invalidated that comment now, haven't you?
 > > 
 > > No. We may still want to re-consider that.
 > 
 > Ah hold on, you're right.
 > 
 > I'll give the matter some more thought befor committing this patch. I
 > don't want to break anything at this stage.
I'm going to go with this simpler patch. It fixes the bug without
changing other behaviour.
Andrew.
2004年03月23日 Andrew Haley <aph@redhat.com>
	PR java/14104
	* jcf-io.c (opendir_in_zip): Tidy up error handling.
Index: jcf-io.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/java/jcf-io.c,v
retrieving revision 1.48
diff -c -2 -p -r1.48 jcf-io.c
*** jcf-io.c	20 Dec 2003 15:38:27 -0000	1.48
--- jcf-io.c	23 Mar 2004 11:49:18 -0000
*************** opendir_in_zip (const char *zipfile, int
*** 121,125 ****
 zipf->name = (char*)(zipf+1);
 strcpy (zipf->name, zipfile);
- SeenZipFiles = zipf;
 fd = open (zipfile, O_RDONLY | O_BINARY);
 zipf->fd = fd;
--- 121,124 ----
*************** opendir_in_zip (const char *zipfile, int
*** 141,144 ****
--- 140,145 ----
 	return NULL;
 }
+ 
+ SeenZipFiles = zipf; 
 return zipf;
 }