From 6afce8909c4c8e04169364b92742d9ccc202410d Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Thu, 17 Apr 2008 17:16:09 +0000
Subject: [PATCH] re PR libgcj/35950 (jar produces files ecj won't handle)

	PR libgcj/35950:
	* tools/gnu/classpath/tools/jar/Entry.java: New version from
	Classpath.
	* tools/classes/gnu/classpath/tools/jar/Entry.class: Update.

From-SVN: r134402
---
 libjava/classpath/ChangeLog.gcj                       |   7 +++++++
 .../tools/classes/gnu/classpath/tools/jar/Entry.class | Bin 634 -> 873 bytes
 .../tools/gnu/classpath/tools/jar/Entry.java          |  18 ++++++++++++++----
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj
index ffc3571..093b2fb 100644
--- a/libjava/classpath/ChangeLog.gcj
+++ b/libjava/classpath/ChangeLog.gcj
@@ -1,3 +1,10 @@
+2008-04-17  Tom Tromey  <tromey@redhat.com>
+
+	PR libgcj/35950:
+	* tools/gnu/classpath/tools/jar/Entry.java: New version from
+	Classpath.
+	* tools/classes/gnu/classpath/tools/jar/Entry.class: Update.
+
 2008-03-02  Jakub Jelinek  <jakub@redhat.com>
 
 	* gnu/java/rmi/registry/RegistryImpl.java (version): Update
diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Entry.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Entry.class
index d030d92ddd800119199eb9434c6d6eb4b03534c1..b517df7439dcb49b68354ce5b327d10f063fc7cc 100644
GIT binary patch
delta 505
zcmZ9J!A=uV6o$XkPFs3AXi+H&R0KuaX{At<2s9X}F=^sL<H9YYHl?O%&CKYw8()C*
z0d!%aTTLj5i9Ueg9a!@UF3>XrfrPs_=iGb#^Z)<7_pf!BG=GkM{sxv<*)hNRhD%&Y
zaaqW|bw9Y3j@xZjUIbpd+p-xaCnP(~ZY$Up;)P-(gkQC}#-xyW-Fwq~)@yfzM}c4!
z8pTGMX|AWp3wFfT?p2<&J58GzZV01(^PTItLC>piyPhC*Q&qk>o15Gc(*FBbexxjn
zE8ElahSt*vw|DkmnuH&?o{CCiFe|x{X(~30EDfH^oG}Vown<|KzSR5Qh-2w}YtA0F
zQ`+TXeB&$0kMUS}$XGtH^@YiDe#k_2;WOEC-rCao2UDN^9XR3n>@M@)bw0)&jSePy
zJBwvictD0#E>L4k^Au~$vrd%_jSne=`2MjtMI8-SjRZ+`7*;7pls2PZQKGCi^$EDE
qF{9m0-N!T=r&JoUut)XGgo!$JML&*2a>vM14RfL)+|x>%_x}S5u~Mx7

delta 281
zcmaFK_KSt<)W2Q(7#J7~85AaR?PcX;U}O-QT)`NwC#d0*l~|UjpP8@kmYI`ktr^C}
zAju%j&LG9ez=JHq!yv;TJNY}K(qv^O=lVznCI)7pdHh=28F;j`w*nbDTNwm50)?0u
zgn^_G0}I$X76xMmP6iVOJ_b_;5uk_yL>q%BgBXwpG=PDXfeq*y5R09G1E`x3s9qdM
zas$PJfP5w(ErhT}dmDqqR#!}`%z+kK0<~H(2r^iMtrCN1g<B;AwTh8J4rnA3gFFBk
CEF;JO

diff --git a/libjava/classpath/tools/gnu/classpath/tools/jar/Entry.java b/libjava/classpath/tools/gnu/classpath/tools/jar/Entry.java
index aa8679a..b910879 100644
--- a/libjava/classpath/tools/gnu/classpath/tools/jar/Entry.java
+++ b/libjava/classpath/tools/gnu/classpath/tools/jar/Entry.java
@@ -1,5 +1,5 @@
 /* Entry.java - represent a single file to write to a jar
- Copyright (C) 2006 Free Software Foundation, Inc.
+ Copyright (C) 2006, 2007 Free Software Foundation, Inc.
 
  This file is part of GNU Classpath.
 
@@ -49,12 +49,22 @@ public class Entry
   public Entry(File file, String name)
   {
     this.file = file;
-    this.name = name;
+
+    /* Removes any './' prefixes automatically. Those caused trouble
+     * in (boot) classpath use-cases. See #32516.
+     */
+    int start = 0;
+    while (name.length() > start + 2
+           && name.codePointAt(start) == '.'
+           && name.codePointAt(start + 1) == File.separatorChar)
+      start += 2;
+
+    this.name = name.substring(start);
   }
 
   public Entry(File file)
   {
-    this.file = file;
-    this.name = file.toString();
+    this(file, file.toString());
   }
+
 }
-- 
2.7.4