Author: bodewig
Date: Fri Sep 19 18:08:41 2014
New Revision: 1626290
URL: http://svn.apache.org/r1626290
Log:
COMPRESS-289 applies to PAX-headers as well
Modified:
commons/proper/compress/trunk/src/changes/changes.xml
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStreamTest.java
Modified: commons/proper/compress/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/changes/changes.xml?rev=1626290&r1=1626289&r2=1626290&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/changes/changes.xml (original)
+++ commons/proper/compress/trunk/src/changes/changes.xml Fri Sep 19 18:08:41
2014
@@ -64,9 +64,10 @@ The <action> type attribute can be add,u
</action>
<action type="fix" date="2014-09-19" issue="COMPRESS-289"
due-to="Bob Robertson">
- Long-Name and -link entries in TAR archives always had the
- current time as last modfication time, creating archives that
- are different at a byte level each time an archive was built.
+ Long-Name and -link or PAX-header entries in TAR archives
+ always had the current time as last modfication time, creating
+ archives that are different at a byte level each time an
+ archive was built.
</action>
</release>
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java?rev=1626290&r1=1626289&r2=1626290&view=diff
==============================================================================
---
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java
(original)
+++
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStream.java
Fri Sep 19 18:08:41 2014
@@ -24,6 +24,7 @@ import java.io.OutputStream;
import java.io.StringWriter;
import java.nio.ByteBuffer;
import java.util.Arrays;
+import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import org.apache.commons.compress.archivers.ArchiveEntry;
@@ -297,7 +298,7 @@ public class TarArchiveOutputStream exte
}
if (paxHeaders.size() > 0) {
- writePaxHeaders(entryName, paxHeaders);
+ writePaxHeaders(entry, entryName, paxHeaders);
}
entry.writeEntryHeader(recordBuf, encoding,
@@ -440,7 +441,8 @@ public class TarArchiveOutputStream exte
* Writes a PAX extended header with the given map as contents.
* @since 1.4
*/
- void writePaxHeaders(String entryName,
+ void writePaxHeaders(TarArchiveEntry entry,
+ String entryName,
Map<String, String> headers) throws IOException {
String name = "./PaxHeaders.X/" + stripTo7Bits(entryName);
if (name.length() >= TarConstants.NAMELEN) {
@@ -448,6 +450,7 @@ public class TarArchiveOutputStream exte
}
TarArchiveEntry pex = new TarArchiveEntry(name,
TarConstants.LF_PAX_EXTENDED_HEADER_LC);
+ transferModTime(entry, pex);
StringWriter w = new StringWriter();
for (Map.Entry<String, String> h : headers.entrySet()) {
@@ -662,7 +665,7 @@ public class TarArchiveOutputStream exte
TarArchiveEntry longLinkEntry = new
TarArchiveEntry(TarConstants.GNU_LONGLINK, linkType);
longLinkEntry.setSize(len + 1); // +1 for NUL
- longLinkEntry.setModTime(entry.getModTime());
+ transferModTime(entry, longLinkEntry);
putArchiveEntry(longLinkEntry);
write(encodedName.array(), encodedName.arrayOffset(), len);
write(0); // NUL terminator
@@ -675,4 +678,13 @@ public class TarArchiveOutputStream exte
}
return false;
}
+
+ private void transferModTime(TarArchiveEntry from, TarArchiveEntry to) {
+ Date fromModTime = from.getModTime();
+ long fromModTimeSeconds = fromModTime.getTime() / 1000;
+ if (fromModTimeSeconds < 0 || fromModTimeSeconds >
TarConstants.MAXSIZE) {
+ fromModTime = new Date(0);
+ }
+ to.setModTime(fromModTime);
+ }
}
Modified:
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStreamTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStreamTest.java?rev=1626290&r1=1626289&r2=1626290&view=diff
==============================================================================
---
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStreamTest.java
(original)
+++
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/tar/TarArchiveOutputStreamTest.java
Fri Sep 19 18:08:41 2014
@@ -188,7 +188,7 @@ public class TarArchiveOutputStreamTest
private byte[] writePaxHeader(Map<String, String> m) throws Exception {
ByteArrayOutputStream bos = new ByteArrayOutputStream();
TarArchiveOutputStream tos = new TarArchiveOutputStream(bos, "ASCII");
- tos.writePaxHeaders("foo", m);
+ tos.writePaxHeaders(new TarArchiveEntry("x"), "foo", m);
// add a dummy entry so data gets written
TarArchiveEntry t = new TarArchiveEntry("foo");