From ae05bf36b086294ba42d1bd38d7791d58a9b6437 Mon Sep 17 00:00:00 2001 From: Peter Donald Date: Fri, 22 Mar 2002 03:44:37 +0000 Subject: [PATCH] Move over to new tar package git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271947 13f79535-47bb-0310-9956-ffa450edef68 --- proposal/myrmidon/lib/excalibur-tar-1.0.jar | Bin 0 -> 31520 bytes .../java/org/apache/aut/tar/TarBuffer.java | 488 -------------- .../java/org/apache/aut/tar/TarConstants.java | 133 ---- .../src/java/org/apache/aut/tar/TarEntry.java | 627 ------------------ .../org/apache/aut/tar/TarInputStream.java | 419 ------------ .../org/apache/aut/tar/TarOutputStream.java | 329 --------- .../src/java/org/apache/aut/tar/TarUtils.java | 224 ------- .../tools/todo/taskdefs/archive/Tar.java | 6 +- .../tools/todo/taskdefs/archive/Untar.java | 5 +- 9 files changed, 4 insertions(+), 2227 deletions(-) create mode 100644 proposal/myrmidon/lib/excalibur-tar-1.0.jar delete mode 100644 proposal/myrmidon/src/java/org/apache/aut/tar/TarBuffer.java delete mode 100644 proposal/myrmidon/src/java/org/apache/aut/tar/TarConstants.java delete mode 100644 proposal/myrmidon/src/java/org/apache/aut/tar/TarEntry.java delete mode 100644 proposal/myrmidon/src/java/org/apache/aut/tar/TarInputStream.java delete mode 100644 proposal/myrmidon/src/java/org/apache/aut/tar/TarOutputStream.java delete mode 100644 proposal/myrmidon/src/java/org/apache/aut/tar/TarUtils.java diff --git a/proposal/myrmidon/lib/excalibur-tar-1.0.jar b/proposal/myrmidon/lib/excalibur-tar-1.0.jar new file mode 100644 index 0000000000000000000000000000000000000000..85fdb8fe5e7594a438c3d96a27a8e9d600a64d3e GIT binary patch literal 31520 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

j|)(5+>oRL8~a@|I6UMI_Hq znP%|ao-^`rOsl|;vP?tV@>$Hce9n5U0_8kov=A@uBn183FMQiv6}y2WJarVjgLpM; zT~o~lH_Hw5k05S-0_DO#fS&(^E%!&*a{m%y^Ix#l{xu8-zkw#_x6s`D9-5jzz)|{7 zP>cL0Z1Mk>4ugnK3QZDAjq9h<S6fi|Wh2}tkQR>d%u z4Y@tI;WdKcvI8Enee|s8hllI{uGERqyJDDrATFhU5LeKz#g+7DaSa?Kt`j-pdbm5> zD2m`EyFlD5s>Cf~nYavIvbV{uS2qc)O!1UhDVZ4K5uv@{E-)%Wmq~WEiRBQPE5TPz zu@r~xR)P^$%1N44w|!W%d>V15;2ZF+UcZ~Y*o`Lg2b8!cPx$a2~N)4+wCBUsC<7x~!jjl0ua*w|ftMtA7x%0mU z$8i3`rFiDgdbNZagKeF`s^p$zbvgeEmww*=;6H$y_^%5;=ut0!r%UgQ?T~&gdP@}k zMTtnIZv0jleiaPA3HCpY3m`V){;znnuRp27lBBQM8wtnP=-Du8#-&@>;^VrlD!qPS zK$nFQ_^l3j$Lzw7fB+W$?}+rmqb!b}0^^+ct&?6I?lZjqO32@*kty4wL*e*d9Xr{< zM5Xb&BystMc1efR9JaDO;e`OlKq_@O`sna2!PQ}W>C$jKwkwL?$>AR?QNM<=BQ`J) z+s(IA^~8pH<&|IwS!ghltW$U`t{R70f`4)(g;WpR_4GkF{pe^^g>~s~rVql`5kGu2kT5AP@4VthT07flTuqf^ zAJ}vkvg4GV0UmYs42*E+r9s3qIHppM?f{SMt&}8C*cfG)x+YO@-4C=R%6k*cMRuGv7c*LVj6cAY72R)S<>IwdZ#45cxYkH+VJP?5&7>~PT zxF=~~sJds3*-HjJmR0E+Qdng{D~%O*6gQAt2=ailKr$(qK{Ak>#+qTtrB4NP- zy}qppf1CB-CpL5hJ3H~My+aS-*Oo#EqFhHkt|1O~viQQ!Ftv0yh1%9u>J8mpdRu#! z-V$mJbs=L{d!^pB4s}c@h|2)=)?i2DI>4!K2(^T|HglZ-*Bt6A(T?>UwY^uI|%2*VW^)K&}|z>NnIk z0)upO0k*rXslF@J-loeob#>}|r*cOK$hUW(-i9FXuWx7xN(>|wa3gcDu}d}92y?SR zGhp9RsdsJ&HikF=dIize`i{+&3><(vgBNxq7rp}JdR*5W?9@vo$#_aSHQCT7xQZ~? z$_-*-b#^y&c7?jS@nctO+uNHu8GL83Vj}+8f0hg59ct71k*j z@%`a}9mb%XFdsk+r4~O@T<#8IR*7K+goO-C-yYog$V-#$EFL9I{(Y|o3`=;?B;*2=aA(WZZnIG|BYK!jGqgv#Vo&gYprD^IG1|5Ml-4a-e~-etnuRj zzP|X3YLF(a?6Ak5ZZ%;qgd*t-u(zCb9Z#9@ yXGBccjrf_lGk|TiJWWJD+m_d?;`=)-qu#Os-mu=mhmdgQXA-Tzczu5t$NnFhQHR3- literal 0 HcmV?d00001 diff --git a/proposal/myrmidon/src/java/org/apache/aut/tar/TarBuffer.java b/proposal/myrmidon/src/java/org/apache/aut/tar/TarBuffer.java deleted file mode 100644 index 03f40fa53..000000000 --- a/proposal/myrmidon/src/java/org/apache/aut/tar/TarBuffer.java +++ /dev/null @@ -1,488 +0,0 @@ -/* - * Copyright (C) The Apache Software Foundation. All rights reserved. - * - * This software is published under the terms of the Apache Software License - * version 1.1, a copy of which has been included with this distribution in - * the LICENSE.txt file. - */ -package org.apache.aut.tar; - -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; - -/** - * The TarBuffer class implements the tar archive concept of a buffered input - * stream. This concept goes back to the days of blocked tape drives and special - * io devices. In the Java universe, the only real function that this class - * performs is to ensure that files have the correct "block" size, or other tars - * will complain.

- * - * You should never have a need to access this class directly. TarBuffers are - * created by Tar IO Streams. - * - * @author Timothy Gerard Endres - * @author Peter Donald - */ -class TarBuffer -{ - public final static int DEFAULT_RCDSIZE = ( 512 ); - public final static int DEFAULT_BLKSIZE = ( DEFAULT_RCDSIZE * 20 ); - - private byte[] m_blockBuffer; - private int m_blockSize; - private int m_currBlkIdx; - private int m_currRecIdx; - private boolean m_debug; - - private InputStream m_input; - private OutputStream m_output; - private int m_recordSize; - private int m_recsPerBlock; - - public TarBuffer( final InputStream input ) - { - this( input, TarBuffer.DEFAULT_BLKSIZE ); - } - - public TarBuffer( final InputStream input, final int blockSize ) - { - this( input, blockSize, TarBuffer.DEFAULT_RCDSIZE ); - } - - public TarBuffer( final InputStream input, - final int blockSize, - final int recordSize ) - { - m_input = input; - initialize( blockSize, recordSize ); - } - - public TarBuffer( final OutputStream output ) - { - this( output, TarBuffer.DEFAULT_BLKSIZE ); - } - - public TarBuffer( final OutputStream output, final int blockSize ) - { - this( output, blockSize, TarBuffer.DEFAULT_RCDSIZE ); - } - - public TarBuffer( final OutputStream output, - final int blockSize, - final int recordSize ) - { - m_output = output; - initialize( blockSize, recordSize ); - } - - /** - * Set the debugging flag for the buffer. - * - * @param debug If true, print debugging output. - */ - public void setDebug( final boolean debug ) - { - m_debug = debug; - } - - /** - * Get the TAR Buffer's block size. Blocks consist of multiple records. - * - * @return The BlockSize value - */ - public int getBlockSize() - { - return m_blockSize; - } - - /** - * Get the current block number, zero based. - * - * @return The current zero based block number. - */ - public int getCurrentBlockNum() - { - return m_currBlkIdx; - } - - /** - * Get the current record number, within the current block, zero based. - * Thus, current offset = (currentBlockNum * recsPerBlk) + currentRecNum. - * - * @return The current zero based record number. - */ - public int getCurrentRecordNum() - { - return m_currRecIdx - 1; - } - - /** - * Get the TAR Buffer's record size. - * - * @return The RecordSize value - */ - public int getRecordSize() - { - return m_recordSize; - } - - /** - * Determine if an archive record indicate End of Archive. End of archive is - * indicated by a record that consists entirely of null bytes. - * - * @param record The record data to check. - * @return The EOFRecord value - */ - public boolean isEOFRecord( final byte[] record ) - { - final int size = getRecordSize(); - for( int i = 0; i < size; ++i ) - { - if( record[ i ] != 0 ) - { - return false; - } - } - - return true; - } - - /** - * Close the TarBuffer. If this is an output buffer, also flush the current - * block before closing. - */ - public void close() - throws IOException - { - if( m_debug ) - { - debug( "TarBuffer.closeBuffer()." ); - } - - if( null != m_output ) - { - flushBlock(); - - if( m_output != System.out && m_output != System.err ) - { - m_output.close(); - m_output = null; - } - } - else if( m_input != null ) - { - if( m_input != System.in ) - { - m_input.close(); - m_input = null; - } - } - } - - /** - * Read a record from the input stream and return the data. - * - * @return The record data. - * @exception IOException Description of Exception - */ - public byte[] readRecord() - throws IOException - { - if( m_debug ) - { - final String message = "ReadRecord: recIdx = " + m_currRecIdx + - " blkIdx = " + m_currBlkIdx; - debug( message ); - } - - if( null == m_input ) - { - final String message = "reading from an output buffer"; - throw new IOException( message ); - } - - if( m_currRecIdx >= m_recsPerBlock ) - { - if( !readBlock() ) - { - return null; - } - } - - final byte[] result = new byte[ m_recordSize ]; - System.arraycopy( m_blockBuffer, - ( m_currRecIdx * m_recordSize ), - result, - 0, - m_recordSize ); - - m_currRecIdx++; - - return result; - } - - /** - * Skip over a record on the input stream. - */ - public void skipRecord() - throws IOException - { - if( m_debug ) - { - final String message = "SkipRecord: recIdx = " + m_currRecIdx + - " blkIdx = " + m_currBlkIdx; - debug( message ); - } - - if( null == m_input ) - { - final String message = "reading (via skip) from an output buffer"; - throw new IOException( message ); - } - - if( m_currRecIdx >= m_recsPerBlock ) - { - if( !readBlock() ) - { - return;// UNDONE - } - } - - m_currRecIdx++; - } - - /** - * Write an archive record to the archive. - * - * @param record The record data to write to the archive. - */ - public void writeRecord( final byte[] record ) - throws IOException - { - if( m_debug ) - { - final String message = "WriteRecord: recIdx = " + m_currRecIdx + - " blkIdx = " + m_currBlkIdx; - debug( message ); - } - - if( null == m_output ) - { - final String message = "writing to an input buffer"; - throw new IOException( message ); - } - - if( record.length != m_recordSize ) - { - final String message = "record to write has length '" + - record.length + "' which is not the record size of '" + - m_recordSize + "'"; - throw new IOException( message ); - } - - if( m_currRecIdx >= m_recsPerBlock ) - { - writeBlock(); - } - - System.arraycopy( record, - 0, - m_blockBuffer, - ( m_currRecIdx * m_recordSize ), - m_recordSize ); - - m_currRecIdx++; - } - - /** - * Write an archive record to the archive, where the record may be inside of - * a larger array buffer. The buffer must be "offset plus record size" long. - * - * @param buffer The buffer containing the record data to write. - * @param offset The offset of the record data within buf. - */ - public void writeRecord( final byte[] buffer, final int offset ) - throws IOException - { - if( m_debug ) - { - final String message = "WriteRecord: recIdx = " + m_currRecIdx + - " blkIdx = " + m_currBlkIdx; - debug( message ); - } - - if( null == m_output ) - { - final String message = "writing to an input buffer"; - throw new IOException( message ); - } - - if( ( offset + m_recordSize ) > buffer.length ) - { - final String message = "record has length '" + buffer.length + - "' with offset '" + offset + "' which is less than the record size of '" + - m_recordSize + "'"; - throw new IOException( message ); - } - - if( m_currRecIdx >= m_recsPerBlock ) - { - writeBlock(); - } - - System.arraycopy( buffer, - offset, - m_blockBuffer, - ( m_currRecIdx * m_recordSize ), - m_recordSize ); - - m_currRecIdx++; - } - - /** - * Flush the current data block if it has any data in it. - */ - private void flushBlock() - throws IOException - { - if( m_debug ) - { - final String message = "TarBuffer.flushBlock() called."; - debug( message ); - } - - if( m_output == null ) - { - final String message = "writing to an input buffer"; - throw new IOException( message ); - } - - if( m_currRecIdx > 0 ) - { - writeBlock(); - } - } - - /** - * Initialization common to all constructors. - */ - private void initialize( final int blockSize, final int recordSize ) - { - m_debug = false; - m_blockSize = blockSize; - m_recordSize = recordSize; - m_recsPerBlock = ( m_blockSize / m_recordSize ); - m_blockBuffer = new byte[ m_blockSize ]; - - if( null != m_input ) - { - m_currBlkIdx = -1; - m_currRecIdx = m_recsPerBlock; - } - else - { - m_currBlkIdx = 0; - m_currRecIdx = 0; - } - } - - /** - * @return false if End-Of-File, else true - */ - private boolean readBlock() - throws IOException - { - if( m_debug ) - { - final String message = "ReadBlock: blkIdx = " + m_currBlkIdx; - debug( message ); - } - - if( null == m_input ) - { - final String message = "reading from an output buffer"; - throw new IOException( message ); - } - - m_currRecIdx = 0; - - int offset = 0; - int bytesNeeded = m_blockSize; - - while( bytesNeeded > 0 ) - { - final long numBytes = m_input.read( m_blockBuffer, offset, bytesNeeded ); - - // - // NOTE - // We have fit EOF, and the block is not full! - // - // This is a broken archive. It does not follow the standard - // blocking algorithm. However, because we are generous, and - // it requires little effort, we will simply ignore the error - // and continue as if the entire block were read. This does - // not appear to break anything upstream. We used to return - // false in this case. - // - // Thanks to 'Yohann.Roussel@alcatel.fr' for this fix. - // - if( numBytes == -1 ) - { - break; - } - - offset += numBytes; - bytesNeeded -= numBytes; - - if( numBytes != m_blockSize ) - { - if( m_debug ) - { - System.err.println( "ReadBlock: INCOMPLETE READ " - + numBytes + " of " + m_blockSize - + " bytes read." ); - } - } - } - - m_currBlkIdx++; - - return true; - } - - /** - * Write a TarBuffer block to the archive. - * - * @exception IOException Description of Exception - */ - private void writeBlock() - throws IOException - { - if( m_debug ) - { - final String message = "WriteBlock: blkIdx = " + m_currBlkIdx; - debug( message ); - } - - if( null == m_output ) - { - final String message = "writing to an input buffer"; - throw new IOException( message ); - } - - m_output.write( m_blockBuffer, 0, m_blockSize ); - m_output.flush(); - - m_currRecIdx = 0; - m_currBlkIdx++; - } - - protected void debug( final String message ) - { - if( m_debug ) - { - System.err.println( message ); - } - } -} diff --git a/proposal/myrmidon/src/java/org/apache/aut/tar/TarConstants.java b/proposal/myrmidon/src/java/org/apache/aut/tar/TarConstants.java deleted file mode 100644 index fbb325930..000000000 --- a/proposal/myrmidon/src/java/org/apache/aut/tar/TarConstants.java +++ /dev/null @@ -1,133 +0,0 @@ -/* - * Copyright (C) The Apache Software Foundation. All rights reserved. - * - * This software is published under the terms of the Apache Software License - * version 1.1, a copy of which has been included with this distribution in - * the LICENSE.txt file. - */ -package org.apache.aut.tar; - -/** - * This interface contains all the definitions used in the package. - * - * @author Timothy Gerard Endres - * @author Stefano Mazzocchi - */ -interface TarConstants -{ - /** - * The length of the mode field in a header buffer. - */ - int MODELEN = 8; - - /** - * The length of the user id field in a header buffer. - */ - int UIDLEN = 8; - - /** - * The length of the group id field in a header buffer. - */ - int GIDLEN = 8; - - /** - * The length of the checksum field in a header buffer. - */ - int CHKSUMLEN = 8; - - /** - * The length of the size field in a header buffer. - */ - int SIZELEN = 12; - - /** - * The length of the magic field in a header buffer. - */ - int MAGICLEN = 8; - - /** - * The length of the modification time field in a header buffer. - */ - int MODTIMELEN = 12; - - /** - * The length of the user name field in a header buffer. - */ - int UNAMELEN = 32; - - /** - * The length of the group name field in a header buffer. - */ - int GNAMELEN = 32; - - /** - * The length of the devices field in a header buffer. - */ - int DEVLEN = 8; - - /** - * LF_ constants represent the "link flag" of an entry, or more commonly, - * the "entry type". This is the "old way" of indicating a normal file. - */ - byte LF_OLDNORM = 0; - - /** - * Normal file type. - */ - byte LF_NORMAL = (byte)'0'; - - /** - * Link file type. - */ - byte LF_LINK = (byte)'1'; - - /** - * Symbolic link file type. - */ - byte LF_SYMLINK = (byte)'2'; - - /** - * Character device file type. - */ - byte LF_CHR = (byte)'3'; - - /** - * Block device file type. - */ - byte LF_BLK = (byte)'4'; - - /** - * Directory file type. - */ - byte LF_DIR = (byte)'5'; - - /** - * FIFO (pipe) file type. - */ - byte LF_FIFO = (byte)'6'; - - /** - * Contiguous file type. - */ - byte LF_CONTIG = (byte)'7'; - - /** - * The magic tag representing a POSIX tar archive. - */ - String TMAGIC = "ustar"; - - /** - * The magic tag representing a GNU tar archive. - */ - String GNU_TMAGIC = "ustar "; - - /** - * The namr of the GNU tar entry which contains a long name. - */ - String GNU_LONGLINK = "././@LongLink"; - - /** - * Identifies the *next* file on the tape as having a long name. - */ - byte LF_GNUTYPE_LONGNAME = (byte)'L'; -} diff --git a/proposal/myrmidon/src/java/org/apache/aut/tar/TarEntry.java b/proposal/myrmidon/src/java/org/apache/aut/tar/TarEntry.java deleted file mode 100644 index e16a815d4..000000000 --- a/proposal/myrmidon/src/java/org/apache/aut/tar/TarEntry.java +++ /dev/null @@ -1,627 +0,0 @@ -/* - * Copyright (C) The Apache Software Foundation. All rights reserved. - * - * This software is published under the terms of the Apache Software License - * version 1.1, a copy of which has been included with this distribution in - * the LICENSE.txt file. - */ -package org.apache.aut.tar; - -import java.io.File; -import java.util.Date; -import java.util.Locale; - -/** - * This class represents an entry in a Tar archive. It consists of the entry's - * header, as well as the entry's File. Entries can be instantiated in one of - * three ways, depending on how they are to be used.

- * - * TarEntries that are created from the header bytes read from an archive are - * instantiated with the TarEntry( byte[] ) constructor. These entries will be - * used when extracting from or listing the contents of an archive. These - * entries have their header filled in using the header bytes. They also set the - * File to null, since they reference an archive entry not a file.

- * - * TarEntries that are created from Files that are to be written into an archive - * are instantiated with the TarEntry( File ) constructor. These entries have - * their header filled in using the File's information. They also keep a - * reference to the File for convenience when writing entries.

- * - * Finally, TarEntries can be constructed from nothing but a name. This allows - * the programmer to construct the entry by hand, for instance when only an - * InputStream is available for writing to the archive, and the header - * information is constructed from other information. In this case the header - * fields are set to defaults and the File is set to null.

- * - * The C structure for a Tar Entry's header is: 

- * struct header {
- * char name[NAMSIZ];
- * char mode[8];
- * char uid[8];
- * char gid[8];
- * char size[12];
- * char mtime[12];
- * char chksum[8];
- * char linkflag;
- * char linkname[NAMSIZ];
- * char magic[8];
- * char uname[TUNMLEN];
- * char gname[TGNMLEN];
- * char devmajor[8];
- * char devminor[8];
- * } header;
- *
- * - * @author Timothy Gerard Endres - * @author Stefano Mazzocchi - * @author Peter Donald - */ -public class TarEntry -{ - /** - * The length of the name field in a header buffer. - */ - public final static int NAMELEN = 100; - - /** - * The entry's modification time. - */ - private int m_checkSum; - - /** - * The entry's group name. - */ - private int m_devMajor; - - /** - * The entry's major device number. - */ - private int m_devMinor; - - /** - * The entry's minor device number. - */ - private File m_file; - - /** - * The entry's user id. - */ - private int m_groupId; - - /** - * The entry's user name. - */ - private StringBuffer m_groupName; - - /** - * The entry's checksum. - */ - private byte m_linkFlag; - - /** - * The entry's link flag. - */ - private StringBuffer m_linkName; - - /** - * The entry's link name. - */ - private StringBuffer m_magic; - - /** - * The entry's size. - */ - private long m_modTime; - - /** - * The entry's name. - */ - private int m_mode; - - private StringBuffer m_name; - - /** - * The entry's group id. - */ - private long m_size; - - /** - * The entry's permission mode. - */ - private int m_userID; - - /** - * The entry's magic tag. - */ - private StringBuffer m_userName; - - /** - * Construct an entry with only a name. This allows the programmer to - * construct the entry's header "by hand". File is set to null. - */ - public TarEntry( final String name ) - { - this(); - - final boolean isDir = name.endsWith( "/" ); - - m_name = new StringBuffer( name ); - m_mode = isDir ? 040755 : 0100644; - m_linkFlag = isDir ? TarConstants.LF_DIR : TarConstants.LF_NORMAL; - m_modTime = ( new Date() ).getTime() / 1000; - m_linkName = new StringBuffer( "" ); - m_userName = new StringBuffer( "" ); - m_groupName = new StringBuffer( "" ); - } - - /** - * Construct an entry with a name an a link flag. - * - * @param name Description of Parameter - * @param linkFlag Description of Parameter - */ - public TarEntry( final String name, final byte linkFlag ) - { - this( name ); - m_linkFlag = linkFlag; - } - - /** - * Construct an entry for a file. File is set to file, and the header is - * constructed from information from the file. - * - * @param file The file that the entry represents. - */ - public TarEntry( final File file ) - { - this(); - - m_file = file; - - String name = file.getPath(); - - // Strip off drive letters! - final String osName = - System.getProperty( "os.name" ).toLowerCase( Locale.US ); - if( -1 != osName.indexOf( "netware" ) ) - { - if( name.length() > 2 ) - { - final char ch1 = name.charAt( 0 ); - final char ch2 = name.charAt( 1 ); - - if( ch2 == ':' && - ( ( ch1 >= 'a' && ch1 <= 'z' ) || - ( ch1 >= 'A' && ch1 <= 'Z' ) ) ) - { - name = name.substring( 2 ); - } - } - } - else if( -1 != osName.indexOf( "netware" ) ) - { - final int colon = name.indexOf( ':' ); - if( colon != -1 ) - { - name = name.substring( colon + 1 ); - } - } - - name = name.replace( File.separatorChar, '/' ); - - // No absolute pathnames - // Windows (and Posix?) paths can start with "\\NetworkDrive\", - // so we loop on starting /'s. - while( name.startsWith( "/" ) ) - { - name = name.substring( 1 ); - } - - m_linkName = new StringBuffer( "" ); - m_name = new StringBuffer( name ); - - if( file.isDirectory() ) - { - m_mode = 040755; - m_linkFlag = TarConstants.LF_DIR; - - if( m_name.charAt( m_name.length() - 1 ) != '/' ) - { - m_name.append( "/" ); - } - } - else - { - m_mode = 0100644; - m_linkFlag = TarConstants.LF_NORMAL; - } - - m_size = file.length(); - m_modTime = file.lastModified() / 1000; - m_checkSum = 0; - m_devMajor = 0; - m_devMinor = 0; - } - - /** - * Construct an entry from an archive's header bytes. File is set to null. - * - * @param header The header bytes from a tar archive entry. - */ - public TarEntry( final byte[] header ) - { - this(); - parseTarHeader( header ); - } - - /** - * Construct an empty entry and prepares the header values. - */ - private TarEntry() - { - m_magic = new StringBuffer( TarConstants.TMAGIC ); - m_name = new StringBuffer(); - m_linkName = new StringBuffer(); - - String user = System.getProperty( "user.name", "" ); - if( user.length() > 31 ) - { - user = user.substring( 0, 31 ); - } - - m_userName = new StringBuffer( user ); - m_groupName = new StringBuffer( "" ); - } - - /** - * Set this entry's group id. - * - * @param groupId This entry's new group id. - */ - public void setGroupId( final int groupId ) - { - m_groupId = groupId; - } - - /** - * Set this entry's group name. - * - * @param groupName This entry's new group name. - */ - public void setGroupName( final String groupName ) - { - m_groupName = new StringBuffer( groupName ); - } - - /** - * Set this entry's modification time. The parameter passed to this method - * is in "Java time". - * - * @param time This entry's new modification time. - */ - public void setModTime( final long time ) - { - m_modTime = time / 1000; - } - - /** - * Set this entry's modification time. - * - * @param time This entry's new modification time. - */ - public void setModTime( final Date time ) - { - m_modTime = time.getTime() / 1000; - } - - /** - * Set the mode for this entry - * - * @param mode The new Mode value - */ - public void setMode( final int mode ) - { - m_mode = mode; - } - - /** - * Set this entry's name. - * - * @param name This entry's new name. - */ - public void setName( final String name ) - { - m_name = new StringBuffer( name ); - } - - /** - * Set this entry's file size. - * - * @param size This entry's new file size. - */ - public void setSize( final long size ) - { - m_size = size; - } - - /** - * Set this entry's user id. - * - * @param userId This entry's new user id. - */ - public void setUserId( final int userId ) - { - m_userID = userId; - } - - /** - * Set this entry's user name. - * - * @param userName This entry's new user name. - */ - public void setUserName( final String userName ) - { - m_userName = new StringBuffer( userName ); - } - - /** - * If this entry represents a file, and the file is a directory, return an - * array of TarEntries for this entry's children. - * - * @return An array of TarEntry's for this entry's children. - */ - public TarEntry[] getDirectoryEntries() - { - if( null == m_file || !m_file.isDirectory() ) - { - return new TarEntry[ 0 ]; - } - - final String[] list = m_file.list(); - final TarEntry[] result = new TarEntry[ list.length ]; - - for( int i = 0; i < list.length; ++i ) - { - result[ i ] = new TarEntry( new File( m_file, list[ i ] ) ); - } - - return result; - } - - /** - * Get this entry's file. - * - * @return This entry's file. - */ - public File getFile() - { - return m_file; - } - - /** - * Get this entry's group id. - * - * @return This entry's group id. - */ - public int getGroupId() - { - return m_groupId; - } - - /** - * Get this entry's group name. - * - * @return This entry's group name. - */ - public String getGroupName() - { - return m_groupName.toString(); - } - - /** - * Set this entry's modification time. - * - * @return The ModTime value - */ - public Date getModTime() - { - return new Date( m_modTime * 1000 ); - } - - /** - * Get this entry's mode. - * - * @return This entry's mode. - */ - public int getMode() - { - return m_mode; - } - - /** - * Get this entry's name. - * - * @return This entry's name. - */ - public String getName() - { - return m_name.toString(); - } - - /** - * Get this entry's file size. - * - * @return This entry's file size. - */ - public long getSize() - { - return m_size; - } - - /** - * Get this entry's checksum. - * - * @return This entry's checksum. - */ - public int getCheckSum() - { - return m_checkSum; - } - - /** - * Get this entry's user id. - * - * @return This entry's user id. - */ - public int getUserId() - { - return m_userID; - } - - /** - * Get this entry's user name. - * - * @return This entry's user name. - */ - public String getUserName() - { - return m_userName.toString(); - } - - /** - * Determine if the given entry is a descendant of this entry. Descendancy - * is determined by the name of the descendant starting with this entry's - * name. - * - * @param desc Entry to be checked as a descendent of - * @return True if entry is a descendant of - */ - public boolean isDescendent( final TarEntry desc ) - { - return desc.getName().startsWith( getName() ); - } - - /** - * Return whether or not this entry represents a directory. - * - * @return True if this entry is a directory. - */ - public boolean isDirectory() - { - if( m_file != null ) - { - return m_file.isDirectory(); - } - - if( m_linkFlag == TarConstants.LF_DIR ) - { - return true; - } - - if( getName().endsWith( "/" ) ) - { - return true; - } - - return false; - } - - /** - * Indicate if this entry is a GNU long name block - * - * @return true if this is a long name extension provided by GNU tar - */ - public boolean isGNULongNameEntry() - { - return m_linkFlag == TarConstants.LF_GNUTYPE_LONGNAME && - m_name.toString().equals( TarConstants.GNU_LONGLINK ); - } - - /** - * Determine if the two entries are equal. Equality is determined by the - * header names being equal. - * - * @param other Entry to be checked for equality. - * @return True if the entries are equal. - */ - public boolean equals( final TarEntry other ) - { - return getName().equals( other.getName() ); - } - - /** - * Parse an entry's header information from a header buffer. - * - * @param header The tar entry header buffer to get information from. - */ - private void parseTarHeader( final byte[] header ) - { - int offset = 0; - - m_name = TarUtils.parseName( header, offset, NAMELEN ); - offset += NAMELEN; - m_mode = (int)TarUtils.parseOctal( header, offset, TarConstants.MODELEN ); - offset += TarConstants.MODELEN; - m_userID = (int)TarUtils.parseOctal( header, offset, TarConstants.UIDLEN ); - offset += TarConstants.UIDLEN; - m_groupId = (int)TarUtils.parseOctal( header, offset, TarConstants.GIDLEN ); - offset += TarConstants.GIDLEN; - m_size = TarUtils.parseOctal( header, offset, TarConstants.SIZELEN ); - offset += TarConstants.SIZELEN; - m_modTime = TarUtils.parseOctal( header, offset, TarConstants.MODTIMELEN ); - offset += TarConstants.MODTIMELEN; - m_checkSum = (int)TarUtils.parseOctal( header, offset, TarConstants.CHKSUMLEN ); - offset += TarConstants.CHKSUMLEN; - m_linkFlag = header[ offset++ ]; - m_linkName = TarUtils.parseName( header, offset, NAMELEN ); - offset += NAMELEN; - m_magic = TarUtils.parseName( header, offset, TarConstants.MAGICLEN ); - offset += TarConstants.MAGICLEN; - m_userName = TarUtils.parseName( header, offset, TarConstants.UNAMELEN ); - offset += TarConstants.UNAMELEN; - m_groupName = TarUtils.parseName( header, offset, TarConstants.GNAMELEN ); - offset += TarConstants.GNAMELEN; - m_devMajor = (int)TarUtils.parseOctal( header, offset, TarConstants.DEVLEN ); - offset += TarConstants.DEVLEN; - m_devMinor = (int)TarUtils.parseOctal( header, offset, TarConstants.DEVLEN ); - } - - /** - * Write an entry's header information to a header buffer. - * - * @param buffer The tar entry header buffer to fill in. - */ - public void writeEntryHeader( final byte[] buffer ) - { - int offset = 0; - - offset = TarUtils.getNameBytes( m_name, buffer, offset, NAMELEN ); - offset = TarUtils.getOctalBytes( m_mode, buffer, offset, TarConstants.MODELEN ); - offset = TarUtils.getOctalBytes( m_userID, buffer, offset, TarConstants.UIDLEN ); - offset = TarUtils.getOctalBytes( m_groupId, buffer, offset, TarConstants.GIDLEN ); - offset = TarUtils.getLongOctalBytes( m_size, buffer, offset, TarConstants.SIZELEN ); - offset = TarUtils.getLongOctalBytes( m_modTime, buffer, offset, TarConstants.MODTIMELEN ); - - final int checkSumOffset = offset; - for( int i = 0; i < TarConstants.CHKSUMLEN; ++i ) - { - buffer[ offset++ ] = (byte)' '; - } - - buffer[ offset++ ] = m_linkFlag; - offset = TarUtils.getNameBytes( m_linkName, buffer, offset, NAMELEN ); - offset = TarUtils.getNameBytes( m_magic, buffer, offset, TarConstants.MAGICLEN ); - offset = TarUtils.getNameBytes( m_userName, buffer, offset, TarConstants.UNAMELEN ); - offset = TarUtils.getNameBytes( m_groupName, buffer, offset, TarConstants.GNAMELEN ); - offset = TarUtils.getOctalBytes( m_devMajor, buffer, offset, TarConstants.DEVLEN ); - offset = TarUtils.getOctalBytes( m_devMinor, buffer, offset, TarConstants.DEVLEN ); - - while( offset < buffer.length ) - { - buffer[ offset++ ] = 0; - } - - final long checkSum = TarUtils.computeCheckSum( buffer ); - TarUtils.getCheckSumOctalBytes( checkSum, buffer, checkSumOffset, TarConstants.CHKSUMLEN ); - } -} diff --git a/proposal/myrmidon/src/java/org/apache/aut/tar/TarInputStream.java b/proposal/myrmidon/src/java/org/apache/aut/tar/TarInputStream.java deleted file mode 100644 index 06200d9f3..000000000 --- a/proposal/myrmidon/src/java/org/apache/aut/tar/TarInputStream.java +++ /dev/null @@ -1,419 +0,0 @@ -/* - * Copyright (C) The Apache Software Foundation. All rights reserved. - * - * This software is published under the terms of the Apache Software License - * version 1.1, a copy of which has been included with this distribution in - * the LICENSE.txt file. - */ -package org.apache.aut.tar; - -import java.io.FilterInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; - -/** - * The TarInputStream reads a UNIX tar archive as an InputStream. methods are - * provided to position at each successive entry in the archive, and the read - * each entry as a normal input stream using read(). - * - * @author Timothy Gerard Endres - * @author Stefano Mazzocchi - * @author Peter Donald - */ -public class TarInputStream - extends FilterInputStream -{ - private TarBuffer m_buffer; - private TarEntry m_currEntry; - private boolean m_debug; - private int m_entryOffset; - private int m_entrySize; - private boolean m_hasHitEOF; - private byte[] m_oneBuf; - private byte[] m_readBuf; - - public TarInputStream( final InputStream input ) - { - this( input, TarBuffer.DEFAULT_BLKSIZE, TarBuffer.DEFAULT_RCDSIZE ); - } - - public TarInputStream( final InputStream input, final int blockSize ) - { - this( input, blockSize, TarBuffer.DEFAULT_RCDSIZE ); - } - - public TarInputStream( final InputStream input, - final int blockSize, - final int recordSize ) - { - super( input ); - - m_buffer = new TarBuffer( input, blockSize, recordSize ); - m_oneBuf = new byte[ 1 ]; - } - - /** - * Sets the debugging flag. - * - * @param debug The new Debug value - */ - public void setDebug( final boolean debug ) - { - m_debug = debug; - m_buffer.setDebug( debug ); - } - - /** - * Get the next entry in this tar archive. This will skip over any remaining - * data in the current entry, if there is one, and place the input stream at - * the header of the next entry, and read the header and instantiate a new - * TarEntry from the header bytes and return that entry. If there are no - * more entries in the archive, null will be returned to indicate that the - * end of the archive has been reached. - * - * @return The next TarEntry in the archive, or null. - * @exception IOException Description of Exception - */ - public TarEntry getNextEntry() - throws IOException - { - if( m_hasHitEOF ) - { - return null; - } - - if( m_currEntry != null ) - { - final int numToSkip = m_entrySize - m_entryOffset; - - if( m_debug ) - { - final String message = "TarInputStream: SKIP currENTRY '" + - m_currEntry.getName() + "' SZ " + m_entrySize + - " OFF " + m_entryOffset + " skipping " + numToSkip + " bytes"; - debug( message ); - } - - if( numToSkip > 0 ) - { - skip( numToSkip ); - } - - m_readBuf = null; - } - - final byte[] headerBuf = m_buffer.readRecord(); - if( headerBuf == null ) - { - if( m_debug ) - { - debug( "READ NULL RECORD" ); - } - m_hasHitEOF = true; - } - else if( m_buffer.isEOFRecord( headerBuf ) ) - { - if( m_debug ) - { - debug( "READ EOF RECORD" ); - } - m_hasHitEOF = true; - } - - if( m_hasHitEOF ) - { - m_currEntry = null; - } - else - { - m_currEntry = new TarEntry( headerBuf ); - - if( !( headerBuf[ 257 ] == 'u' && headerBuf[ 258 ] == 's' && - headerBuf[ 259 ] == 't' && headerBuf[ 260 ] == 'a' && - headerBuf[ 261 ] == 'r' ) ) - { - //Must be v7Format - } - - if( m_debug ) - { - final String message = "TarInputStream: SET CURRENTRY '" + - m_currEntry.getName() + "' size = " + m_currEntry.getSize(); - debug( message ); - } - - m_entryOffset = 0; - - // REVIEW How do we resolve this discrepancy?! - m_entrySize = (int)m_currEntry.getSize(); - } - - if( null != m_currEntry && m_currEntry.isGNULongNameEntry() ) - { - // read in the name - final StringBuffer longName = new StringBuffer(); - final byte[] buffer = new byte[ 256 ]; - int length = 0; - while( ( length = read( buffer ) ) >= 0 ) - { - final String str = new String( buffer, 0, length ); - longName.append( str ); - } - getNextEntry(); - m_currEntry.setName( longName.toString() ); - } - - return m_currEntry; - } - - /** - * Get the record size being used by this stream's TarBuffer. - * - * @return The TarBuffer record size. - */ - public int getRecordSize() - { - return m_buffer.getRecordSize(); - } - - /** - * Get the available data that can be read from the current entry in the - * archive. This does not indicate how much data is left in the entire - * archive, only in the current entry. This value is determined from the - * entry's size header field and the amount of data already read from the - * current entry. - * - * @return The number of available bytes for the current entry. - * @exception IOException Description of Exception - */ - public int available() - throws IOException - { - return m_entrySize - m_entryOffset; - } - - /** - * Closes this stream. Calls the TarBuffer's close() method. - */ - public void close() - throws IOException - { - m_buffer.close(); - } - - /** - * Copies the contents of the current tar archive entry directly into an - * output stream. - * - * @param output The OutputStream into which to write the entry's data. - * @exception IOException Description of Exception - */ - public void copyEntryContents( final OutputStream output ) - throws IOException - { - final byte[] buffer = new byte[ 32 * 1024 ]; - while( true ) - { - final int numRead = read( buffer, 0, buffer.length ); - if( numRead == -1 ) - { - break; - } - - output.write( buffer, 0, numRead ); - } - } - - /** - * Since we do not support marking just yet, we do nothing. - * - * @param markLimit The limit to mark. - */ - public void mark( int markLimit ) - { - } - - /** - * Since we do not support marking just yet, we return false. - * - * @return False. - */ - public boolean markSupported() - { - return false; - } - - /** - * Reads a byte from the current tar archive entry. This method simply calls - * read( byte[], int, int ). - * - * @return The byte read, or -1 at EOF. - * @exception IOException Description of Exception - */ - public int read() - throws IOException - { - final int num = read( m_oneBuf, 0, 1 ); - if( num == -1 ) - { - return num; - } - else - { - return (int)m_oneBuf[ 0 ]; - } - } - - /** - * Reads bytes from the current tar archive entry. This method simply calls - * read( byte[], int, int ). - * - * @param buffer The buffer into which to place bytes read. - * @return The number of bytes read, or -1 at EOF. - * @exception IOException Description of Exception - */ - public int read( final byte[] buffer ) - throws IOException - { - return read( buffer, 0, buffer.length ); - } - - /** - * Reads bytes from the current tar archive entry. This method is aware of - * the boundaries of the current entry in the archive and will deal with - * them as if they were this stream's start and EOF. - * - * @param buffer The buffer into which to place bytes read. - * @param offset The offset at which to place bytes read. - * @param count The number of bytes to read. - * @return The number of bytes read, or -1 at EOF. - */ - public int read( final byte[] buffer, - final int offset, - final int count ) - throws IOException - { - int position = offset; - int numToRead = count; - int totalRead = 0; - - if( m_entryOffset >= m_entrySize ) - { - return -1; - } - - if( ( numToRead + m_entryOffset ) > m_entrySize ) - { - numToRead = ( m_entrySize - m_entryOffset ); - } - - if( null != m_readBuf ) - { - final int size = - ( numToRead > m_readBuf.length ) ? m_readBuf.length : numToRead; - - System.arraycopy( m_readBuf, 0, buffer, position, size ); - - if( size >= m_readBuf.length ) - { - m_readBuf = null; - } - else - { - final int newLength = m_readBuf.length - size; - final byte[] newBuffer = new byte[ newLength ]; - - System.arraycopy( m_readBuf, size, newBuffer, 0, newLength ); - - m_readBuf = newBuffer; - } - - totalRead += size; - numToRead -= size; - position += size; - } - - while( numToRead > 0 ) - { - final byte[] rec = m_buffer.readRecord(); - if( null == rec ) - { - // Unexpected EOF! - final String message = - "unexpected EOF with " + numToRead + " bytes unread"; - throw new IOException( message ); - } - - int size = numToRead; - final int recordLength = rec.length; - - if( recordLength > size ) - { - System.arraycopy( rec, 0, buffer, position, size ); - - m_readBuf = new byte[ recordLength - size ]; - - System.arraycopy( rec, size, m_readBuf, 0, recordLength - size ); - } - else - { - size = recordLength; - - System.arraycopy( rec, 0, buffer, position, recordLength ); - } - - totalRead += size; - numToRead -= size; - position += size; - } - - m_entryOffset += totalRead; - - return totalRead; - } - - /** - * Since we do not support marking just yet, we do nothing. - */ - public void reset() - { - } - - /** - * Skip bytes in the input buffer. This skips bytes in the current entry's - * data, not the entire archive, and will stop at the end of the current - * entry's data if the number to skip extends beyond that point. - * - * @param numToSkip The number of bytes to skip. - */ - public void skip( final int numToSkip ) - throws IOException - { - // REVIEW - // This is horribly inefficient, but it ensures that we - // properly skip over bytes via the TarBuffer... - // - final byte[] skipBuf = new byte[ 8 * 1024 ]; - int num = numToSkip; - while( num > 0 ) - { - final int count = ( num > skipBuf.length ) ? skipBuf.length : num; - final int numRead = read( skipBuf, 0, count ); - if( numRead == -1 ) - { - break; - } - - num -= numRead; - } - } - - protected void debug( final String message ) - { - if( m_debug ) - { - System.err.println( message ); - } - } -} diff --git a/proposal/myrmidon/src/java/org/apache/aut/tar/TarOutputStream.java b/proposal/myrmidon/src/java/org/apache/aut/tar/TarOutputStream.java deleted file mode 100644 index dc86f1369..000000000 --- a/proposal/myrmidon/src/java/org/apache/aut/tar/TarOutputStream.java +++ /dev/null @@ -1,329 +0,0 @@ -/* - * Copyright (C) The Apache Software Foundation. All rights reserved. - * - * This software is published under the terms of the Apache Software License - * version 1.1, a copy of which has been included with this distribution in - * the LICENSE.txt file. - */ -package org.apache.aut.tar; - -import java.io.FilterOutputStream; -import java.io.IOException; -import java.io.OutputStream; - -/** - * The TarOutputStream writes a UNIX tar archive as an OutputStream. Methods are - * provided to put entries, and then write their contents by writing to this - * stream using write(). - * - * @author Timothy Gerard Endres time@ice.com - * @author Peter Donald - */ -public class TarOutputStream - extends FilterOutputStream -{ - public final static int LONGFILE_ERROR = 0; - public final static int LONGFILE_TRUNCATE = 1; - public final static int LONGFILE_GNU = 2; - - private int m_longFileMode = LONGFILE_ERROR; - private byte[] m_assemBuf; - private int m_assemLen; - private TarBuffer m_buffer; - private int m_currBytes; - private int m_currSize; - - private byte[] m_oneBuf; - private byte[] m_recordBuf; - - public TarOutputStream( final OutputStream output ) - { - this( output, TarBuffer.DEFAULT_BLKSIZE, TarBuffer.DEFAULT_RCDSIZE ); - } - - public TarOutputStream( final OutputStream output, final int blockSize ) - { - this( output, blockSize, TarBuffer.DEFAULT_RCDSIZE ); - } - - public TarOutputStream( final OutputStream output, - final int blockSize, - final int recordSize ) - { - super( output ); - - m_buffer = new TarBuffer( output, blockSize, recordSize ); - m_assemLen = 0; - m_assemBuf = new byte[ recordSize ]; - m_recordBuf = new byte[ recordSize ]; - m_oneBuf = new byte[ 1 ]; - } - - /** - * Sets the debugging flag in this stream's TarBuffer. - * - * @param debug The new BufferDebug value - */ - public void setBufferDebug( boolean debug ) - { - m_buffer.setDebug( debug ); - } - - public void setLongFileMode( final int longFileMode ) - { - m_longFileMode = longFileMode; - } - - /** - * Get the record size being used by this stream's TarBuffer. - * - * @return The TarBuffer record size. - */ - public int getRecordSize() - { - return m_buffer.getRecordSize(); - } - - /** - * Ends the TAR archive and closes the underlying OutputStream. This means - * that finish() is called followed by calling the TarBuffer's close(). - * - * @exception IOException Description of Exception - */ - public void close() - throws IOException - { - finish(); - m_buffer.close(); - } - - /** - * Close an entry. This method MUST be called for all file entries that - * contain data. The reason is that we must buffer data written to the - * stream in order to satisfy the buffer's record based writes. Thus, there - * may be data fragments still being assembled that must be written to the - * output stream before this entry is closed and the next entry written. - * - * @exception IOException Description of Exception - */ - public void closeEntry() - throws IOException - { - if( m_assemLen > 0 ) - { - for( int i = m_assemLen; i < m_assemBuf.length; ++i ) - { - m_assemBuf[ i ] = 0; - } - - m_buffer.writeRecord( m_assemBuf ); - - m_currBytes += m_assemLen; - m_assemLen = 0; - } - - if( m_currBytes < m_currSize ) - { - final String message = "entry closed at '" + m_currBytes + - "' before the '" + m_currSize + - "' bytes specified in the header were written"; - throw new IOException( message ); - } - } - - /** - * Ends the TAR archive without closing the underlying OutputStream. The - * result is that the EOF record of nulls is written. - * - * @exception IOException Description of Exception - */ - public void finish() - throws IOException - { - writeEOFRecord(); - } - - /** - * Put an entry on the output stream. This writes the entry's header record - * and positions the output stream for writing the contents of the entry. - * Once this method is called, the stream is ready for calls to write() to - * write the entry's contents. Once the contents are written, closeEntry() - * MUST be called to ensure that all buffered data is completely - * written to the output stream. - * - * @param entry The TarEntry to be written to the archive. - * @exception IOException Description of Exception - */ - public void putNextEntry( final TarEntry entry ) - throws IOException - { - if( entry.getName().length() >= TarEntry.NAMELEN ) - { - - if( m_longFileMode == LONGFILE_GNU ) - { - // create a TarEntry for the LongLink, the contents - // of which are the entry's name - final TarEntry longLinkEntry = - new TarEntry( TarConstants.GNU_LONGLINK, - TarConstants.LF_GNUTYPE_LONGNAME ); - - longLinkEntry.setSize( entry.getName().length() + 1 ); - putNextEntry( longLinkEntry ); - write( entry.getName().getBytes() ); - write( 0 ); - closeEntry(); - } - else if( m_longFileMode != LONGFILE_TRUNCATE ) - { - final String message = "file name '" + entry.getName() + - "' is too long ( > " + TarEntry.NAMELEN + " bytes)"; - throw new IOException( message ); - } - } - - entry.writeEntryHeader( m_recordBuf ); - m_buffer.writeRecord( m_recordBuf ); - - m_currBytes = 0; - - if( entry.isDirectory() ) - { - m_currSize = 0; - } - else - { - m_currSize = (int)entry.getSize(); - } - } - - /** - * Writes a byte to the current tar archive entry. This method simply calls - * read( byte[], int, int ). - * - * @param data The byte written. - * @exception IOException Description of Exception - */ - public void write( final int data ) - throws IOException - { - m_oneBuf[ 0 ] = (byte)data; - - write( m_oneBuf, 0, 1 ); - } - - /** - * Writes bytes to the current tar archive entry. This method simply calls - * write( byte[], int, int ). - * - * @param buffer The buffer to write to the archive. - */ - public void write( final byte[] buffer ) - throws IOException - { - write( buffer, 0, buffer.length ); - } - - /** - * Writes bytes to the current tar archive entry. This method is aware of - * the current entry and will throw an exception if you attempt to write - * bytes past the length specified for the current entry. The method is also - * (painfully) aware of the record buffering required by TarBuffer, and - * manages buffers that are not a multiple of recordsize in length, - * including assembling records from small buffers. - * - * @param buffer The buffer to write to the archive. - * @param offset The offset in the buffer from which to get bytes. - * @param count The number of bytes to write. - */ - public void write( final byte[] buffer, - final int offset, - final int count ) - throws IOException - { - int position = offset; - int numToWrite = count; - if( ( m_currBytes + numToWrite ) > m_currSize ) - { - final String message = "request to write '" + numToWrite + - "' bytes exceeds size in header of '" + m_currSize + "' bytes"; - throw new IOException( message ); - // - // We have to deal with assembly!!! - // The programmer can be writing little 32 byte chunks for all - // we know, and we must assemble complete records for writing. - // REVIEW Maybe this should be in TarBuffer? Could that help to - // eliminate some of the buffer copying. - // - } - - if( m_assemLen > 0 ) - { - if( ( m_assemLen + numToWrite ) >= m_recordBuf.length ) - { - final int length = m_recordBuf.length - m_assemLen; - - System.arraycopy( m_assemBuf, 0, m_recordBuf, 0, - m_assemLen ); - System.arraycopy( buffer, position, m_recordBuf, - m_assemLen, length ); - m_buffer.writeRecord( m_recordBuf ); - - m_currBytes += m_recordBuf.length; - position += length; - numToWrite -= length; - m_assemLen = 0; - } - else - { - System.arraycopy( buffer, position, m_assemBuf, m_assemLen, - numToWrite ); - - position += numToWrite; - m_assemLen += numToWrite; - numToWrite -= numToWrite; - } - } - - // - // When we get here we have EITHER: - // o An empty "assemble" buffer. - // o No bytes to write (numToWrite == 0) - // - while( numToWrite > 0 ) - { - if( numToWrite < m_recordBuf.length ) - { - System.arraycopy( buffer, position, m_assemBuf, m_assemLen, - numToWrite ); - - m_assemLen += numToWrite; - - break; - } - - m_buffer.writeRecord( buffer, position ); - - int num = m_recordBuf.length; - - m_currBytes += num; - numToWrite -= num; - position += num; - } - } - - /** - * Write an EOF (end of archive) record to the tar archive. An EOF record - * consists of a record of all zeros. - */ - private void writeEOFRecord() - throws IOException - { - for( int i = 0; i < m_recordBuf.length; ++i ) - { - m_recordBuf[ i ] = 0; - } - - m_buffer.writeRecord( m_recordBuf ); - } -} diff --git a/proposal/myrmidon/src/java/org/apache/aut/tar/TarUtils.java b/proposal/myrmidon/src/java/org/apache/aut/tar/TarUtils.java deleted file mode 100644 index 2e608444e..000000000 --- a/proposal/myrmidon/src/java/org/apache/aut/tar/TarUtils.java +++ /dev/null @@ -1,224 +0,0 @@ -/* - * Copyright (C) The Apache Software Foundation. All rights reserved. - * - * This software is published under the terms of the Apache Software License - * version 1.1, a copy of which has been included with this distribution in - * the LICENSE.txt file. - */ -package org.apache.aut.tar; - -/** - * This class provides static utility methods to work with byte streams. - * - * @author Timothy Gerard Endres - * @author Stefano Mazzocchi - */ -class TarUtils -{ - /** - * Parse the checksum octal integer from a header buffer. - * - * @param offset The offset into the buffer from which to parse. - * @param length The number of header bytes to parse. - * @param value Description of Parameter - * @param buf Description of Parameter - * @return The integer value of the entry's checksum. - */ - public static int getCheckSumOctalBytes( final long value, - final byte[] buf, - final int offset, - final int length ) - { - getOctalBytes( value, buf, offset, length ); - - buf[ offset + length - 1 ] = (byte)' '; - buf[ offset + length - 2 ] = 0; - - return offset + length; - } - - /** - * Parse an octal long integer from a header buffer. - * - * @param offset The offset into the buffer from which to parse. - * @param length The number of header bytes to parse. - * @param value Description of Parameter - * @param buf Description of Parameter - * @return The long value of the octal bytes. - */ - public static int getLongOctalBytes( final long value, - final byte[] buf, - final int offset, - final int length ) - { - byte[] temp = new byte[ length + 1 ]; - - getOctalBytes( value, temp, 0, length + 1 ); - System.arraycopy( temp, 0, buf, offset, length ); - - return offset + length; - } - - /** - * Determine the number of bytes in an entry name. - * - * @param offset The offset into the buffer from which to parse. - * @param length The number of header bytes to parse. - * @param name Description of Parameter - * @param buf Description of Parameter - * @return The number of bytes in a header's entry name. - */ - public static int getNameBytes( final StringBuffer name, - final byte[] buffer, - final int offset, - final int length ) - { - int i; - - for( i = 0; i < length && i < name.length(); ++i ) - { - buffer[ offset + i ] = (byte)name.charAt( i ); - } - - for( ; i < length; ++i ) - { - buffer[ offset + i ] = 0; - } - - return offset + length; - } - - /** - * Parse an octal integer from a header buffer. - * - * @param offset The offset into the buffer from which to parse. - * @param length The number of header bytes to parse. - * @return The integer value of the octal bytes. - */ - public static int getOctalBytes( final long value, - final byte[] buffer, - final int offset, - final int length ) - { - int idx = length - 1; - - buffer[ offset + idx ] = 0; - --idx; - buffer[ offset + idx ] = (byte)' '; - --idx; - - if( value == 0 ) - { - buffer[ offset + idx ] = (byte)'0'; - --idx; - } - else - { - long val = value; - while( idx >= 0 && val > 0 ) - { - buffer[ offset + idx ] = (byte)( (byte)'0' + (byte)( val & 7 ) ); - val = val >> 3; - idx--; - } - } - - while( idx >= 0 ) - { - buffer[ offset + idx ] = (byte)' '; - idx--; - } - - return offset + length; - } - - /** - * Compute the checksum of a tar entry header. - * - * @param buf The tar entry's header buffer. - * @return The computed checksum. - */ - public static long computeCheckSum( final byte[] buffer ) - { - long sum = 0; - - for( int i = 0; i < buffer.length; ++i ) - { - sum += 255 & buffer[ i ]; - } - - return sum; - } - - /** - * Parse an entry name from a header buffer. - * - * @param header The header buffer from which to parse. - * @param offset The offset into the buffer from which to parse. - * @param length The number of header bytes to parse. - * @return The header's entry name. - */ - public static StringBuffer parseName( final byte[] header, - final int offset, - final int length ) - { - StringBuffer result = new StringBuffer( length ); - int end = offset + length; - - for( int i = offset; i < end; ++i ) - { - if( header[ i ] == 0 ) - { - break; - } - - result.append( (char)header[ i ] ); - } - - return result; - } - - /** - * Parse an octal string from a header buffer. This is used for the file - * permission mode value. - * - * @param header The header buffer from which to parse. - * @param offset The offset into the buffer from which to parse. - * @param length The number of header bytes to parse. - * @return The long value of the octal string. - */ - public static long parseOctal( final byte[] header, - final int offset, - final int length ) - { - long result = 0; - boolean stillPadding = true; - int end = offset + length; - - for( int i = offset; i < end; ++i ) - { - if( header[ i ] == 0 ) - { - break; - } - - if( header[ i ] == (byte)' ' || header[ i ] == '0' ) - { - if( stillPadding ) - { - continue; - } - - if( header[ i ] == (byte)' ' ) - { - break; - } - } - - stillPadding = false; - result = ( result << 3 ) + ( header[ i ] - '0' ); - } - - return result; - } -} diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Tar.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Tar.java index f5d5150bb..f13288525 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Tar.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Tar.java @@ -13,12 +13,10 @@ import java.io.FileOutputStream; import java.io.IOException; import java.util.ArrayList; import java.util.Iterator; -import org.apache.aut.tar.TarEntry; -import org.apache.aut.tar.TarOutputStream; import org.apache.avalon.excalibur.io.IOUtil; +import org.apache.avalon.excalibur.tar.TarEntry; +import org.apache.avalon.excalibur.tar.TarOutputStream; import org.apache.myrmidon.api.TaskException; -import org.apache.myrmidon.api.AbstractTask; -import org.apache.myrmidon.api.TaskContext; import org.apache.tools.todo.taskdefs.MatchingTask; import org.apache.tools.todo.types.ScannerUtil; import org.apache.tools.todo.types.SourceFileScanner; diff --git a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Untar.java b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Untar.java index 09e814529..530e79348 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Untar.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/archive/Untar.java @@ -10,11 +10,10 @@ package org.apache.tools.todo.taskdefs.archive; import java.io.File; import java.io.FileInputStream; import java.io.IOException; -import org.apache.aut.tar.TarEntry; -import org.apache.aut.tar.TarInputStream; import org.apache.avalon.excalibur.io.IOUtil; +import org.apache.avalon.excalibur.tar.TarEntry; +import org.apache.avalon.excalibur.tar.TarInputStream; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.todo.taskdefs.archive.Expand; /** * Untar a file. Heavily based on the Expand task.