From e67dc0b9f9fc7d9f0f38f074ce2258fab63d7e7d Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Fri, 1 Mar 2002 08:52:43 +0000 Subject: [PATCH] Allow v7 format tar files (Patch copied from main source tree) git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271626 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/aut/tar/TarInputStream.java | 23 ++----------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/proposal/myrmidon/src/java/org/apache/aut/tar/TarInputStream.java b/proposal/myrmidon/src/java/org/apache/aut/tar/TarInputStream.java index 47558c7f0..8e4c420c3 100644 --- a/proposal/myrmidon/src/java/org/apache/aut/tar/TarInputStream.java +++ b/proposal/myrmidon/src/java/org/apache/aut/tar/TarInputStream.java @@ -32,6 +32,7 @@ public class TarInputStream private boolean m_hasHitEOF; private byte[] m_oneBuf; private byte[] m_readBuf; + private boolean m_v7Format; public TarInputStream( final InputStream input ) { @@ -133,27 +134,7 @@ public class TarInputStream headerBuf[ 259 ] == 't' && headerBuf[ 260 ] == 'a' && headerBuf[ 261 ] == 'r' ) ) { - m_entrySize = 0; - m_entryOffset = 0; - m_currEntry = null; - - final String message = "bad header in block " + - m_buffer.getCurrentBlockNum() + - " record " + m_buffer.getCurrentRecordNum() + ", " + - "header magic is not 'ustar', but '" + - headerBuf[ 257 ] + - headerBuf[ 258 ] + - headerBuf[ 259 ] + - headerBuf[ 260 ] + - headerBuf[ 261 ] + - "', or (dec) " + - ( (int)headerBuf[ 257 ] ) + ", " + - ( (int)headerBuf[ 258 ] ) + ", " + - ( (int)headerBuf[ 259 ] ) + ", " + - ( (int)headerBuf[ 260 ] ) + ", " + - ( (int)headerBuf[ 261 ] ); - - throw new IOException( message ); + m_v7Format = true; } if( m_debug )