Commit b9bc3665 by Tom Tromey Committed by Tom Tromey

re PR libgcj/12894 (META-INF entries should be incoluded as --resource entries when compiling jars)

	PR java/12894:
	* jcf-parse.c (classify_zip_file): Only skip MANIFEST.MF file.

From-SVN: r73376
parent cdc9103c
2003-11-08 Tom Tromey <tromey@redhat.com>
PR java/12894:
* jcf-parse.c (classify_zip_file): Only skip MANIFEST.MF file.
2003-11-06 Andrew Haley <aph@redhat.com> 2003-11-06 Andrew Haley <aph@redhat.com>
* expr.c (java_stack_swap): Make sure destination stack slots are * expr.c (java_stack_swap): Make sure destination stack slots are
......
...@@ -1172,10 +1172,9 @@ classify_zip_file (struct ZipDirectory *zdir) ...@@ -1172,10 +1172,9 @@ classify_zip_file (struct ZipDirectory *zdir)
".class", 6)) ".class", 6))
return 1; return 1;
/* For now we drop the manifest and other information. Maybe it /* For now we drop the manifest, but not other information. */
would make more sense to compile it in? */
if (zdir->filename_length > 8 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; return 0;
/* Drop directory entries. */ /* Drop directory entries. */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment