PAX Extract file fix Pull#2

src/FileInfo.php

@@ -74,10 +74,11 @@ public static function fromPath($path, $as = '')
     }
 
     /**
-     * @return int
+     * @return int the filesize. always 0 for directories
      */
     public function getSize()
     {
+        if($this->isdir) return 0;
         return $this->size;
     }
 
@@ -340,4 +341,4 @@ public function match($include = '', $exclude = '')
 
 class FileInfoException extends \Exception
 {
-}
+}

src/Tar.php

@@ -573,12 +573,19 @@ protected function parseHeader($block)
         // Handle Long-Link entries from GNU Tar
         if ($return['typeflag'] == 'L') {
             // following data block(s) is the filename
-            $filename = trim($this->readbytes(ceil($header['size'] / 512) * 512));
+            $filename = trim($this->readbytes(ceil($return['size'] / 512) * 512));
             // next block is the real header
             $block  = $this->readbytes(512);
             $return = $this->parseHeader($block);
+
             // overwrite the filename
             $return['filename'] = $filename;
+        }elseif ($return['typeflag'] == 'x') {
+            // following data block(s) is the filename
+            $filename = trim($this->readbytes(ceil($return['size'] / 512) * 512));
+            // next block is the real header
+            $block  = $this->readbytes(512);
+            $return = $this->parseHeader($block);
         }
 
         return $return;

tests/tar.test.php

@@ -186,7 +186,38 @@ public function test_dogfood()
             unlink($archive);
         }
     }
+
+	/**
+     * Extract the prebuilt tar files with PAX headers
+     */
+    public function test_tarpaxextract()
+    {
+        $dir = dirname(__FILE__).'/tar';
+        $out = sys_get_temp_dir().'/dwtartest'.md5(time());
+
+        foreach ($this->extensions as $ext) {
+            $tar  = new Tar();
+            $file = "$dir/pax_test.$ext";
 
+            $tar->open($file);
+            $list = $tar->extract($out);
+
+            clearstatcache();
+
+            $this->assertFileExists($out.'/4слайд-1.jpg', "Extracted $file");
+            $this->assertEquals(15251, filesize($out.'/4слайд-1.jpg'), "Extracted $file");
+
+            $this->assertFileExists($out.'/4слайд-2.jpg', "Extracted $file");
+            $this->assertEquals(16671, filesize($out.'/4слайд-2.jpg'), "Extracted $file");
+
+            $this->assertFileExists($out.'/4слайд.jpg', "Extracted $file");
+            $this->assertEquals(214949, filesize($out.'/4слайд.jpg'), "Extracted $file");
+
+
+            self::rdelete($out);
+        }
+    }
+
     /**
      * Extract the prebuilt tar files
      */