Fix double 'BZBZ' magic string regression in bzip2 archives

Commit ce4bf4c introduced a regression where archives created with
plexus-archiver would only be opened by plexus-archiver and no other tool. In
similar fashion plexus-archiver was unable to extract proper archives because it
removed "BZ" magic header before passing the stream to commons-compress

Signed-off-by: Kristian Rosenvold <[email protected]>

Author: Stanislav Ochotnicky

src/main/java/org/codehaus/plexus/archiver/bzip2/BZip2Compressor.java

@@ -44,8 +44,6 @@ public void compress()
         {
             BufferedOutputStream bos =
                 new BufferedOutputStream( new FileOutputStream( getDestFile() ) );
-            bos.write( 'B' );
-            bos.write( 'Z' );
             zOut = new BZip2CompressorOutputStream( bos );
             compress( getSource(), zOut );
         }

src/main/java/org/codehaus/plexus/archiver/bzip2/BZip2UnArchiver.java

@@ -94,16 +94,6 @@ protected void execute()
     public static BZip2CompressorInputStream getBZip2InputStream( InputStream bis )
         throws IOException
     {
-        int b = bis.read();
-        if ( b != 'B' )
-        {
-            return null;
-        }
-        b = bis.read();
-        if ( b != 'Z' )
-        {
-            return null;
-        }
         return new BZip2CompressorInputStream( bis );
     }
 

src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java

@@ -631,8 +631,6 @@ private OutputStream compress( final OutputStream ostream )
             }
             else if ( BZIP2.equals( value ) )
             {
-                ostream.write( 'B' );
-                ostream.write( 'Z' );
                 return new BZip2CompressorOutputStream( ostream );
             }
             return ostream;

src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java

@@ -192,14 +192,6 @@ private InputStream decompress( final File file, final InputStream istream )
             }
             else if ( BZIP2.equals( value ) )
             {
-                final char[] magic = new char[]{'B', 'Z'};
-                for ( int i = 0; i < magic.length; i++ )
-                {
-                    if ( istream.read() != magic[ i ] )
-                    {
-                        throw new ArchiverException( "Invalid bz2 file." + file.toString() );
-                    }
-                }
                 return new BZip2CompressorInputStream( istream );
             }
             return istream;