Repository: ant Updated Branches: refs/heads/master 76455a35c -> 661f8becc
COMPRESS-324 be mor lenient when detecting GNU long name entries Project: http://git-wip-us.apache.org/repos/asf/ant/repo Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/661f8bec Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/661f8bec Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/661f8bec Branch: refs/heads/master Commit: 661f8becc40fa2aa831edcd3a4b94a2299fd05f1 Parents: 76455a3 Author: Stefan Bodewig <[email protected]> Authored: Sun Oct 11 10:18:05 2015 +0200 Committer: Stefan Bodewig <[email protected]> Committed: Sun Oct 11 10:18:05 2015 +0200 ---------------------------------------------------------------------- WHATSNEW | 4 ++++ src/main/org/apache/tools/tar/TarEntry.java | 6 ++---- 2 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/661f8bec/WHATSNEW ---------------------------------------------------------------------- diff --git a/WHATSNEW b/WHATSNEW index 18708f9..6fbf8c2 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -18,6 +18,10 @@ Fixed bugs: jars. This resulted in jar files that couldn't be read by Java5. Bugzilla Report 58428 + * <untar> will now detect GNU tar longname/link records even if they + don't use the names used by GNU tar itself. star is known to + create archives of that kind. + https://issues.apache.org/jira/browse/COMPRESS-324 Other changes: -------------- http://git-wip-us.apache.org/repos/asf/ant/blob/661f8bec/src/main/org/apache/tools/tar/TarEntry.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/tools/tar/TarEntry.java b/src/main/org/apache/tools/tar/TarEntry.java index a9c96f1..de15a1c 100644 --- a/src/main/org/apache/tools/tar/TarEntry.java +++ b/src/main/org/apache/tools/tar/TarEntry.java @@ -706,8 +706,7 @@ public class TarEntry implements TarConstants { * @return true if this is a long name extension provided by GNU tar */ public boolean isGNULongLinkEntry() { - return linkFlag == LF_GNUTYPE_LONGLINK - && name.equals(GNU_LONGLINK); + return linkFlag == LF_GNUTYPE_LONGLINK; } /** @@ -716,8 +715,7 @@ public class TarEntry implements TarConstants { * @return true if this is a long name extension provided by GNU tar */ public boolean isGNULongNameEntry() { - return linkFlag == LF_GNUTYPE_LONGNAME - && name.equals(GNU_LONGLINK); + return linkFlag == LF_GNUTYPE_LONGNAME; } /**
