OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR libgcj/35950 (jar produces files ecj won't handle)

Browse Source 
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
This commit is contained in:
Tom Tromey 2008-04-17 17:16:09 +00:00 committed by Tom Tromey
parent 46225e2688
commit 6afce8909c
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libjava/classpath/ChangeLog.gcj
View File

@ -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

BIN
libjava/classpath/tools/classes/gnu/classpath/tools/jar/Entry.class
View File

Binary file not shown.

18
libjava/classpath/tools/gnu/classpath/tools/jar/Entry.java
View File

@ -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());
}
}