[kaffe] CVS kaffe (kaz): libraries/javalib/kaffe/tools/jar/Jar.java

[Kaffe CVS]

PatchSet 6664 
Date: 2005/06/26 01:21:50
Author: kaz
Branch: HEAD
Tag: (none) 
Log:
2005-06-26  Ito Kazumitsu  <kaz at maczuka.gcd.org>

        * libraries/javalib/kaffe/tools/jar/Jar.java
        (addEntry): Delete "./" from the top of entryname.

Members: 
	ChangeLog:1.4189->1.4190 
	libraries/javalib/kaffe/tools/jar/Jar.java:1.8->1.9 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4189 kaffe/ChangeLog:1.4190
--- kaffe/ChangeLog:1.4189	Fri Jun 24 15:57:25 2005
+++ kaffe/ChangeLog	Sun Jun 26 01:21:50 2005
@@ -1,3 +1,8 @@
+2005-06-26  Ito Kazumitsu  <kaz at maczuka.gcd.org>
+
+	* libraries/javalib/kaffe/tools/jar/Jar.java
+	(addEntry): Delete "./" from the top of entryname.
+
 2005-06-24  Ito Kazumitsu  <kaz at maczuka.gcd.org>
 
 	* gnu/java/nio/charset/UnicodeLittle.java
Index: kaffe/libraries/javalib/kaffe/tools/jar/Jar.java
diff -u kaffe/libraries/javalib/kaffe/tools/jar/Jar.java:1.8 kaffe/libraries/javalib/kaffe/tools/jar/Jar.java:1.9
--- kaffe/libraries/javalib/kaffe/tools/jar/Jar.java:1.8	Thu Apr 28 14:09:34 2005
+++ kaffe/libraries/javalib/kaffe/tools/jar/Jar.java	Sun Jun 26 01:21:53 2005
@@ -1142,6 +1142,11 @@
     void addEntry(ZipOutputStream zos, String entryname, XPFile entryfile)
     	throws IOException
     {
+	// Delete "./" from the top of entryname.  Sun's jar command seems to
+	// do this.
+	if (entryname.startsWith("./") && entryname.length() > 2) {
+	    entryname = entryname.substring(2);
+	}
 	// YIKES!! Watch out for the really ugly special case where
 	// we attempt to add the archive that we are writing to the
 	// archive we are writing to the archive we are writing.