aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/java/ChangeLog5
-rw-r--r--gcc/java/jcf-parse.c5
2 files changed, 7 insertions, 3 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 4de89c5..6d5c29a 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,8 @@
+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>
* expr.c (java_stack_swap): Make sure destination stack slots are
diff --git a/gcc/java/jcf-parse.c b/gcc/java/jcf-parse.c
index fa77efe..016e974 100644
--- a/gcc/java/jcf-parse.c
+++ b/gcc/java/jcf-parse.c
@@ -1172,10 +1172,9 @@ classify_zip_file (struct ZipDirectory *zdir)
".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. */