This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Patch: FYI: fix PR 12894
- From: Tom Tromey <tromey at redhat dot com>
- To: GCC libjava patches <java-patches at gcc dot gnu dot org>
- Cc: Gcc Patch List <gcc-patches at gcc dot gnu dot org>
- Date: 08 Nov 2003 13:34:54 -0700
- Subject: Patch: FYI: fix PR 12894
- Reply-to: tromey at redhat dot com
I'm checking this in on the trunk.
We can't exclude everything from the META-INF directory, since that
sometimes has service files and other things needed for proper
operation. So, now we only skip the manifest file.
Tested on x86 RHL 9.
Tom
Index: ChangeLog
from Tom Tromey <tromey@redhat.com>
PR java/12894:
* jcf-parse.c (classify_zip_file): Only skip MANIFEST.MF file.
Index: jcf-parse.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/java/jcf-parse.c,v
retrieving revision 1.151
diff -u -r1.151 jcf-parse.c
--- jcf-parse.c 24 Oct 2003 12:13:18 -0000 1.151
+++ jcf-parse.c 8 Nov 2003 20:41:00 -0000
@@ -1172,10 +1172,9 @@
".class", 6))
return 1;
- /* For now we drop the manifest and other information. Maybe it
- would make more sense to compile it in? */
+ /* For now we drop the manifest, but not other information. */
if (zdir->filename_length > 8
- && !strncmp (class_name_in_zip_dir, "META-INF/", 9))
+ && !strncmp (class_name_in_zip_dir, "META-INF/MANIFEST.MF", 20))
return 0;
/* Drop directory entries. */