fernando/luos
1
0
Fork 0
Code Releases Activity

Updating PEAR Tar class - for uncompressing problems in PHP ver > 5.4.x

Browse Source
This commit is contained in:
Erik Amaru Ortiz
2014-03-20 12:34:57 -04:00
parent 288578532c
commit 5d08e8d808
1 changed files with 893 additions and 815 deletions
Download Patch File Download Diff File Expand all files Collapse all files

220
gulliver/thirdparty/pear/Archive/Tar.php vendored
View File

@@ -30,30 +30,28 @@
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
*
* @category File_Formats * @category File_Formats
* @package Archive_Tar * @package Archive_Tar
* @author Vincent Blavet <vincent@phpconcept.net> * @author Vincent Blavet <vincent@phpconcept.net>
* @copyright 1997-2008 The Authors * @copyright 1997-2010 The Authors
* @license http://www.opensource.org/licenses/bsd-license.php New BSD License * @license http://www.opensource.org/licenses/bsd-license.php New BSD License
* @version CVS: $Id: Tar.php 295988 2010-03-09 08:39:37Z mrook $ * @version CVS: $Id$
* @link http://pear.php.net/package/Archive_Tar * @link http://pear.php.net/package/Archive_Tar
*/ */
require_once 'PEAR.php'; require_once 'PEAR.php';
define('ARCHIVE_TAR_ATT_SEPARATOR', 90001);
define ('ARCHIVE_TAR_ATT_SEPARATOR', 90001); define('ARCHIVE_TAR_END_BLOCK', pack("a512", ''));
define ('ARCHIVE_TAR_END_BLOCK', pack("a512", ''));
/** /**
* Creates a (compressed) Tar archive * Creates a (compressed) Tar archive
* *
* @author Vincent Blavet <vincent@phpconcept.net> * @package Archive_Tar
* @version $Revision: 295988 $ * @author Vincent Blavet <vincent@phpconcept.net>
* @license http://www.opensource.org/licenses/bsd-license.php New BSD License * @license http://www.opensource.org/licenses/bsd-license.php New BSD License
* @package Archive_Tar * @version $Revision$
*/ */
class Archive_Tar extends PEAR class Archive_Tar extends PEAR
{ {
/** /**
@@ -91,6 +89,11 @@ class Archive_Tar extends PEAR
*/ */
var $_ignore_regexp=''; var $_ignore_regexp='';
/**
* @var object PEAR_Error object
*/
var $error_object=null;
// {{{ constructor // {{{ constructor
/** /**
* Archive_Tar Class constructor. This flavour of the constructor only * Archive_Tar Class constructor. This flavour of the constructor only
@@ -104,6 +107,7 @@ class Archive_Tar extends PEAR
* parameter indicates if gzip or bz2 compression * parameter indicates if gzip or bz2 compression
* is required. For compatibility reason the * is required. For compatibility reason the
* boolean value 'true' means 'gz'. * boolean value 'true' means 'gz'.
*
* @access public * @access public
*/ */
function Archive_Tar($p_tarname, $p_compress = null) function Archive_Tar($p_tarname, $p_compress = null)
@@ -200,6 +204,7 @@ class Archive_Tar extends PEAR
* @param array $p_filelist An array of filenames and directory names, or a * @param array $p_filelist An array of filenames and directory names, or a
* single string with names separated by a single * single string with names separated by a single
* blank space. * blank space.
*
* @return true on success, false on error. * @return true on success, false on error.
* @see createModify() * @see createModify()
* @access public * @access public
@@ -222,6 +227,7 @@ class Archive_Tar extends PEAR
* @param array $p_filelist An array of filenames and directory names, or a * @param array $p_filelist An array of filenames and directory names, or a
* single string with names separated by a single * single string with names separated by a single
* blank space. * blank space.
*
* @return true on success, false on error. * @return true on success, false on error.
* @see createModify() * @see createModify()
* @access public * @access public
@@ -233,9 +239,9 @@ class Archive_Tar extends PEAR
// }}} // }}}
// {{{ extract() // {{{ extract()
function extract($p_path='') function extract($p_path='', $p_preserve=false)
{ {
return $this->extractModify($p_path, ''); return $this->extractModify($p_path, '', $p_preserve);
} }
// }}} // }}}
@@ -288,6 +294,7 @@ class Archive_Tar extends PEAR
* @param string $p_remove_dir A string which contains a path to be * @param string $p_remove_dir A string which contains a path to be
* removed from the memorized path of each * removed from the memorized path of each
* element in the list, when relevant. * element in the list, when relevant.
*
* @return boolean true on success, false on error. * @return boolean true on success, false on error.
* @access public * @access public
* @see addModify() * @see addModify()
@@ -361,6 +368,7 @@ class Archive_Tar extends PEAR
* removed from the memorized path of * removed from the memorized path of
* each element in the list, when * each element in the list, when
* relevant. * relevant.
*
* @return true on success, false on error. * @return true on success, false on error.
* @access public * @access public
*/ */
@@ -399,10 +407,13 @@ class Archive_Tar extends PEAR
* with the string. * with the string.
* @param string $p_string The content of the file added in * @param string $p_string The content of the file added in
* the archive. * the archive.
* @param int $p_datetime A custom date/time (unix timestamp)
* for the file (optional).
*
* @return true on success, false on error. * @return true on success, false on error.
* @access public * @access public
*/ */
function addString($p_filename, $p_string) function addString($p_filename, $p_string, $p_datetime = false)
{ {
$v_result = true; $v_result = true;
@@ -417,7 +428,7 @@ class Archive_Tar extends PEAR
return false; return false;
// Need to check the get back to the temporary file ? .... // Need to check the get back to the temporary file ? ....
$v_result = $this->_addString($p_filename, $p_string); $v_result = $this->_addString($p_filename, $p_string, $p_datetime);
$this->_writeFooter(); $this->_writeFooter();
@@ -457,18 +468,20 @@ class Archive_Tar extends PEAR
* @param string $p_remove_path Part of the memorized path that can be * @param string $p_remove_path Part of the memorized path that can be
* removed if present at the beginning of * removed if present at the beginning of
* the file/dir path. * the file/dir path.
* @param boolean $p_preserve Preserve user/group ownership of files
*
* @return boolean true on success, false on error. * @return boolean true on success, false on error.
* @access public * @access public
* @see extractList() * @see extractList()
*/ */
function extractModify($p_path, $p_remove_path) function extractModify($p_path, $p_remove_path, $p_preserve=false)
{ {
$v_result = true; $v_result = true;
$v_list_detail = array(); $v_list_detail = array();
if ($v_result = $this->_openRead()) { if ($v_result = $this->_openRead()) {
$v_result = $this->_extractList($p_path, $v_list_detail, $v_result = $this->_extractList($p_path, $v_list_detail,
"complete", 0, $p_remove_path); "complete", 0, $p_remove_path, $p_preserve);
$this->_close(); $this->_close();
} }
@@ -480,7 +493,9 @@ class Archive_Tar extends PEAR
/** /**
* This method extract from the archive one file identified by $p_filename. * This method extract from the archive one file identified by $p_filename.
* The return value is a string with the file content, or NULL on error. * The return value is a string with the file content, or NULL on error.
*
* @param string $p_filename The path of the file to extract in a string. * @param string $p_filename The path of the file to extract in a string.
*
* @return a string with the file content or NULL. * @return a string with the file content or NULL.
* @access public * @access public
*/ */
@@ -490,7 +505,7 @@ class Archive_Tar extends PEAR
$v_result = $this->_extractInString($p_filename); $v_result = $this->_extractInString($p_filename);
$this->_close(); $this->_close();
} else { } else {
$v_result = NULL; $v_result = null;
} }
return $v_result; return $v_result;
@@ -504,6 +519,7 @@ class Archive_Tar extends PEAR
* in the directory indicated by the optional $p_path parameter. * in the directory indicated by the optional $p_path parameter.
* If indicated the $p_remove_path can be used in the same way as it is * If indicated the $p_remove_path can be used in the same way as it is
* used in extractModify() method. * used in extractModify() method.
*
* @param array $p_filelist An array of filenames and directory names, * @param array $p_filelist An array of filenames and directory names,
* or a single string with names separated * or a single string with names separated
* by a single blank space. * by a single blank space.
@@ -512,11 +528,13 @@ class Archive_Tar extends PEAR
* @param string $p_remove_path Part of the memorized path that can be * @param string $p_remove_path Part of the memorized path that can be
* removed if present at the beginning of * removed if present at the beginning of
* the file/dir path. * the file/dir path.
* @param boolean $p_preserve Preserve user/group ownership of files
*
* @return true on success, false on error. * @return true on success, false on error.
* @access public * @access public
* @see extractModify() * @see extractModify()
*/ */
function extractList($p_filelist, $p_path='', $p_remove_path='') function extractList($p_filelist, $p_path='', $p_remove_path='', $p_preserve=false)
{ {
$v_result = true; $v_result = true;
$v_list_detail = array(); $v_list_detail = array();
@@ -532,7 +550,7 @@ class Archive_Tar extends PEAR
if ($v_result = $this->_openRead()) { if ($v_result = $this->_openRead()) {
$v_result = $this->_extractList($p_path, $v_list_detail, "partial", $v_result = $this->_extractList($p_path, $v_list_detail, "partial",
$v_list, $p_remove_path); $v_list, $p_remove_path, $p_preserve);
$this->_close(); $this->_close();
} }
@@ -545,7 +563,9 @@ class Archive_Tar extends PEAR
* This method set specific attributes of the archive. It uses a variable * This method set specific attributes of the archive. It uses a variable
* list of parameters, in the format attribute code + attribute values : * list of parameters, in the format attribute code + attribute values :
* $arch->setAttribute(ARCHIVE_TAR_ATT_SEPARATOR, ','); * $arch->setAttribute(ARCHIVE_TAR_ATT_SEPARATOR, ',');
*
* @param mixed $argv variable list of attributes and values * @param mixed $argv variable list of attributes and values
*
* @return true on success, false on error. * @return true on success, false on error.
* @access public * @access public
*/ */
@@ -599,7 +619,9 @@ class Archive_Tar extends PEAR
* This method sets the regular expression for ignoring files and directories * This method sets the regular expression for ignoring files and directories
* at import, for example: * at import, for example:
* $arch->setIgnoreRegexp("#CVS|\.svn#"); * $arch->setIgnoreRegexp("#CVS|\.svn#");
*
* @param string $regexp regular expression defining which files or directories to ignore * @param string $regexp regular expression defining which files or directories to ignore
*
* @access public * @access public
*/ */
function setIgnoreRegexp($regexp) function setIgnoreRegexp($regexp)
@@ -613,7 +635,9 @@ class Archive_Tar extends PEAR
* This method sets the regular expression for ignoring all files and directories * This method sets the regular expression for ignoring all files and directories
* matching the filenames in the array list at import, for example: * matching the filenames in the array list at import, for example:
* $arch->setIgnoreList(array('CVS', '.svn', 'bin/tool')); * $arch->setIgnoreList(array('CVS', '.svn', 'bin/tool'));
*
* @param array $list a list of file or directory names to ignore * @param array $list a list of file or directory names to ignore
*
* @access public * @access public
*/ */
function setIgnoreList($list) function setIgnoreList($list)
@@ -627,23 +651,21 @@ class Archive_Tar extends PEAR
// {{{ _error() // {{{ _error()
function _error($p_message) function _error($p_message)
{ {
// ----- To be completed $this->error_object = &$this->raiseError($p_message);
$this->raiseError($p_message);
} }
// }}} // }}}
// {{{ _warning() // {{{ _warning()
function _warning($p_message) function _warning($p_message)
{ {
// ----- To be completed $this->error_object = &$this->raiseError($p_message);
$this->raiseError($p_message);
} }
// }}} // }}}
// {{{ _isArchive() // {{{ _isArchive()
function _isArchive($p_filename=NULL) function _isArchive($p_filename=null)
{ {
if ($p_filename == NULL) { if ($p_filename == null) {
$p_filename = $this->_tarname; $p_filename = $this->_tarname;
} }
clearstatcache(); clearstatcache();
@@ -654,15 +676,17 @@ class Archive_Tar extends PEAR
// {{{ _openWrite() // {{{ _openWrite()
function _openWrite() function _openWrite()
{ {
if ($this->_compress_type == 'gz') if ($this->_compress_type == 'gz' && function_exists('gzopen'))
$this->_file = @gzopen($this->_tarname, "wb9"); $this->_file = @gzopen($this->_tarname, "wb9");
else if ($this->_compress_type == 'bz2') else if ($this->_compress_type == 'bz2' && function_exists('bzopen'))
$this->_file = @bzopen($this->_tarname, "w"); $this->_file = @bzopen($this->_tarname, "w");
else if ($this->_compress_type == 'none') else if ($this->_compress_type == 'none')
$this->_file = @fopen($this->_tarname, "wb"); $this->_file = @fopen($this->_tarname, "wb");
else else {
$this->_error('Unknown or missing compression type (' $this->_error('Unknown or missing compression type ('
.$this->_compress_type.')'); .$this->_compress_type.')');
return false;
}
if ($this->_file == 0) { if ($this->_file == 0) {
$this->_error('Unable to open in write mode \'' $this->_error('Unable to open in write mode \''
@@ -707,15 +731,17 @@ class Archive_Tar extends PEAR
// ----- File to open if the normal Tar file // ----- File to open if the normal Tar file
$v_filename = $this->_tarname; $v_filename = $this->_tarname;
if ($this->_compress_type == 'gz') if ($this->_compress_type == 'gz' && function_exists('gzopen'))
$this->_file = @gzopen($v_filename, "rb"); $this->_file = @gzopen($v_filename, "rb");
else if ($this->_compress_type == 'bz2') else if ($this->_compress_type == 'bz2' && function_exists('bzopen'))
$this->_file = @bzopen($v_filename, "r"); $this->_file = @bzopen($v_filename, "r");
else if ($this->_compress_type == 'none') else if ($this->_compress_type == 'none')
$this->_file = @fopen($v_filename, "rb"); $this->_file = @fopen($v_filename, "rb");
else else {
$this->_error('Unknown or missing compression type (' $this->_error('Unknown or missing compression type ('
.$this->_compress_type.')'); .$this->_compress_type.')');
return false;
}
if ($this->_file == 0) { if ($this->_file == 0) {
$this->_error('Unable to open in read mode \''.$v_filename.'\''); $this->_error('Unable to open in read mode \''.$v_filename.'\'');
@@ -737,9 +763,11 @@ class Archive_Tar extends PEAR
return false; return false;
} else if ($this->_compress_type == 'none') } else if ($this->_compress_type == 'none')
$this->_file = @fopen($this->_tarname, "r+b"); $this->_file = @fopen($this->_tarname, "r+b");
else else {
$this->_error('Unknown or missing compression type (' $this->_error('Unknown or missing compression type ('
.$this->_compress_type.')'); .$this->_compress_type.')');
return false;
}
if ($this->_file == 0) { if ($this->_file == 0) {
$this->_error('Unable to open in read/write mode \'' $this->_error('Unable to open in read/write mode \''
@@ -917,19 +945,13 @@ class Archive_Tar extends PEAR
if ($v_filename == '') if ($v_filename == '')
continue; continue;
if($v_filename == $p_remove_dir.'/plugin.singleton')
continue;
if($v_filename == $p_remove_dir.'/ee')
continue;
// ----- ignore files and directories matching the ignore regular expression // ----- ignore files and directories matching the ignore regular expression
if ($this->_ignore_regexp && preg_match($this->_ignore_regexp, '/'.$v_filename)) { if ($this->_ignore_regexp && preg_match($this->_ignore_regexp, '/'.$v_filename)) {
$this->_warning("File '$v_filename' ignored"); $this->_warning("File '$v_filename' ignored");
continue; continue;
} }
if (!file_exists($v_filename)) { if (!file_exists($v_filename) && !is_link($v_filename)) {
$this->_warning("File '$v_filename' does not exist"); $this->_warning("File '$v_filename' does not exist");
continue; continue;
} }
@@ -1030,7 +1052,7 @@ class Archive_Tar extends PEAR
// }}} // }}}
// {{{ _addString() // {{{ _addString()
function _addString($p_filename, $p_string) function _addString($p_filename, $p_string, $p_datetime = false)
{ {
if (!$this->_file) { if (!$this->_file) {
$this->_error('Invalid file descriptor'); $this->_error('Invalid file descriptor');
@@ -1045,8 +1067,13 @@ class Archive_Tar extends PEAR
// ----- Calculate the stored filename // ----- Calculate the stored filename
$p_filename = $this->_translateWinPath($p_filename, false);; $p_filename = $this->_translateWinPath($p_filename, false);;
// ----- If datetime is not specified, set current time
if ($p_datetime === false) {
$p_datetime = time();
}
if (!$this->_writeHeaderBlock($p_filename, strlen($p_string), if (!$this->_writeHeaderBlock($p_filename, strlen($p_string),
time(), 384, "", 0, 0)) $p_datetime, 384, "", 0, 0))
return false; return false;
$i=0; $i=0;
@@ -1329,10 +1356,20 @@ class Archive_Tar extends PEAR
for ($i=156; $i<512; $i++) for ($i=156; $i<512; $i++)
$v_checksum+=ord(substr($v_binary_data,$i,1)); $v_checksum+=ord(substr($v_binary_data,$i,1));
$v_data = unpack("a100filename/a8mode/a8uid/a8gid/a12size/a12mtime/" if (version_compare(PHP_VERSION,"5.5.0-dev")<0) {
."a8checksum/a1typeflag/a100link/a6magic/a2version/" $fmt = "a100filename/a8mode/a8uid/a8gid/a12size/a12mtime/" .
."a32uname/a32gname/a8devmajor/a8devminor", "a8checksum/a1typeflag/a100link/a6magic/a2version/" .
$v_binary_data); "a32uname/a32gname/a8devmajor/a8devminor/a131prefix";
} else {
$fmt = "Z100filename/Z8mode/Z8uid/Z8gid/Z12size/Z12mtime/" .
"Z8checksum/Z1typeflag/Z100link/Z6magic/Z2version/" .
"Z32uname/Z32gname/Z8devmajor/Z8devminor/Z131prefix";
}
$v_data = unpack($fmt, $v_binary_data);
if (strlen($v_data["prefix"]) > 0) {
$v_data["filename"] = "$v_data[prefix]/$v_data[filename]";
}
// ----- Extract the checksum // ----- Extract the checksum
$v_header['checksum'] = OctDec(trim($v_data['checksum'])); $v_header['checksum'] = OctDec(trim($v_data['checksum']));
@@ -1384,6 +1421,7 @@ class Archive_Tar extends PEAR
* Detect and report a malicious file name * Detect and report a malicious file name
* *
* @param string $file * @param string $file
*
* @return bool * @return bool
* @access private * @access private
*/ */
@@ -1434,9 +1472,11 @@ class Archive_Tar extends PEAR
// {{{ _extractInString() // {{{ _extractInString()
/** /**
* This method extract from the archive one file identified by $p_filename. * This method extract from the archive one file identified by $p_filename.
* The return value is a string with the file content, or NULL on error. * The return value is a string with the file content, or null on error.
*
* @param string $p_filename The path of the file to extract in a string. * @param string $p_filename The path of the file to extract in a string.
* @return a string with the file content or NULL. *
* @return a string with the file content or null.
* @access private * @access private
*/ */
function _extractInString($p_filename) function _extractInString($p_filename)
@@ -1446,7 +1486,7 @@ class Archive_Tar extends PEAR
While (strlen($v_binary_data = $this->_readBlock()) != 0) While (strlen($v_binary_data = $this->_readBlock()) != 0)
{ {
if (!$this->_readHeader($v_binary_data, $v_header)) if (!$this->_readHeader($v_binary_data, $v_header))
return NULL; return null;
if ($v_header['filename'] == '') if ($v_header['filename'] == '')
continue; continue;
@@ -1454,14 +1494,14 @@ class Archive_Tar extends PEAR
// ----- Look for long filename // ----- Look for long filename
if ($v_header['typeflag'] == 'L') { if ($v_header['typeflag'] == 'L') {
if (!$this->_readLongHeader($v_header)) if (!$this->_readLongHeader($v_header))
return NULL; return null;
} }
if ($v_header['filename'] == $p_filename) { if ($v_header['filename'] == $p_filename) {
if ($v_header['typeflag'] == "5") { if ($v_header['typeflag'] == "5") {
$this->_error('Unable to extract in string a directory ' $this->_error('Unable to extract in string a directory '
.'entry {'.$v_header['filename'].'}'); .'entry {'.$v_header['filename'].'}');
return NULL; return null;
} else { } else {
$n = floor($v_header['size']/512); $n = floor($v_header['size']/512);
for ($i=0; $i<$n; $i++) { for ($i=0; $i<$n; $i++) {
@@ -1479,13 +1519,13 @@ class Archive_Tar extends PEAR
} }
} }
return NULL; return null;
} }
// }}} // }}}
// {{{ _extractList() // {{{ _extractList()
function _extractList($p_path, &$p_list_detail, $p_mode, function _extractList($p_path, &$p_list_detail, $p_mode,
$p_file_list, $p_remove_path) $p_file_list, $p_remove_path, $p_preserve=false)
{ {
$v_result=true; $v_result=true;
$v_nb = 0; $v_nb = 0;
@@ -1506,16 +1546,16 @@ class Archive_Tar extends PEAR
switch ($p_mode) { switch ($p_mode) {
case "complete" : case "complete" :
$v_extract_all = TRUE; $v_extract_all = true;
$v_listing = FALSE; $v_listing = false;
break; break;
case "partial" : case "partial" :
$v_extract_all = FALSE; $v_extract_all = false;
$v_listing = FALSE; $v_listing = false;
break; break;
case "list" : case "list" :
$v_extract_all = FALSE; $v_extract_all = false;
$v_listing = TRUE; $v_listing = true;
break; break;
default : default :
$this->_error('Invalid extract mode ('.$p_mode.')'); $this->_error('Invalid extract mode ('.$p_mode.')');
@@ -1553,29 +1593,33 @@ class Archive_Tar extends PEAR
if ((strlen($v_header['filename']) > strlen($p_file_list[$i])) if ((strlen($v_header['filename']) > strlen($p_file_list[$i]))
&& (substr($v_header['filename'], 0, strlen($p_file_list[$i])) && (substr($v_header['filename'], 0, strlen($p_file_list[$i]))
== $p_file_list[$i])) { == $p_file_list[$i])) {
$v_extract_file = TRUE; $v_extract_file = true;
break; break;
} }
} }
// ----- It is a file, so compare the file names // ----- It is a file, so compare the file names
elseif ($p_file_list[$i] == $v_header['filename']) { elseif ($p_file_list[$i] == $v_header['filename']) {
$v_extract_file = TRUE; $v_extract_file = true;
break; break;
} }
} }
} else { } else {
$v_extract_file = TRUE; $v_extract_file = true;
} }
// ----- Look if this file need to be extracted // ----- Look if this file need to be extracted
if (($v_extract_file) && (!$v_listing)) if (($v_extract_file) && (!$v_listing))
{ {
if (($p_remove_path != '') if (($p_remove_path != '')
&& (substr($v_header['filename'], 0, $p_remove_path_size) && (substr($v_header['filename'].'/', 0, $p_remove_path_size)
== $p_remove_path)) == $p_remove_path)) {
$v_header['filename'] = substr($v_header['filename'], $v_header['filename'] = substr($v_header['filename'],
$p_remove_path_size); $p_remove_path_size);
if( $v_header['filename'] == '' ){
continue;
}
}
if (($p_path != './') && ($p_path != '/')) { if (($p_path != './') && ($p_path != '/')) {
while (substr($p_path, -1) == '/') while (substr($p_path, -1) == '/')
$p_path = substr($p_path, 0, strlen($p_path)-1); $p_path = substr($p_path, 0, strlen($p_path)-1);
@@ -1653,6 +1697,11 @@ class Archive_Tar extends PEAR
@fclose($v_dest_file); @fclose($v_dest_file);
if ($p_preserve) {
@chown($v_header['filename'], $v_header['uid']);
@chgrp($v_header['filename'], $v_header['gid']);
}
// ----- Change the file mode, mtime // ----- Change the file mode, mtime
@touch($v_header['filename'], $v_header['mtime']); @touch($v_header['filename'], $v_header['mtime']);
if ($v_header['mode'] & 0111) { if ($v_header['mode'] & 0111) {
@@ -1664,10 +1713,17 @@ class Archive_Tar extends PEAR
// ----- Check the file size // ----- Check the file size
clearstatcache(); clearstatcache();
if (filesize($v_header['filename']) != $v_header['size']) { if (!is_file($v_header['filename'])) {
$this->_error('Extracted file '.$v_header['filename']
.'does not exist. Archive may be corrupted.');
return false;
}
$filesize = filesize($v_header['filename']);
if ($filesize != $v_header['size']) {
$this->_error('Extracted file '.$v_header['filename'] $this->_error('Extracted file '.$v_header['filename']
.' does not have the correct file size \'' .' does not have the correct file size \''
.filesize($v_header['filename']) .$filesize
.'\' ('.$v_header['size'] .'\' ('.$v_header['size']
.' expected). Archive may be corrupted.'); .' expected). Archive may be corrupted.');
return false; return false;
@@ -1740,12 +1796,20 @@ class Archive_Tar extends PEAR
} }
if ($this->_compress_type == 'gz') { if ($this->_compress_type == 'gz') {
$end_blocks = 0;
while (!@gzeof($v_temp_tar)) { while (!@gzeof($v_temp_tar)) {
$v_buffer = @gzread($v_temp_tar, 512); $v_buffer = @gzread($v_temp_tar, 512);
if ($v_buffer == ARCHIVE_TAR_END_BLOCK) { if ($v_buffer == ARCHIVE_TAR_END_BLOCK || strlen($v_buffer) == 0) {
$end_blocks++;
// do not copy end blocks, we will re-make them // do not copy end blocks, we will re-make them
// after appending // after appending
continue; continue;
} elseif ($end_blocks > 0) {
for ($i = 0; $i < $end_blocks; $i++) {
$this->_writeBlock(ARCHIVE_TAR_END_BLOCK);
}
$end_blocks = 0;
} }
$v_binary_data = pack("a512", $v_buffer); $v_binary_data = pack("a512", $v_buffer);
$this->_writeBlock($v_binary_data); $this->_writeBlock($v_binary_data);
@@ -1754,9 +1818,19 @@ class Archive_Tar extends PEAR
@gzclose($v_temp_tar); @gzclose($v_temp_tar);
} }
elseif ($this->_compress_type == 'bz2') { elseif ($this->_compress_type == 'bz2') {
$end_blocks = 0;
while (strlen($v_buffer = @bzread($v_temp_tar, 512)) > 0) { while (strlen($v_buffer = @bzread($v_temp_tar, 512)) > 0) {
if ($v_buffer == ARCHIVE_TAR_END_BLOCK) { if ($v_buffer == ARCHIVE_TAR_END_BLOCK || strlen($v_buffer) == 0) {
$end_blocks++;
// do not copy end blocks, we will re-make them
// after appending
continue; continue;
} elseif ($end_blocks > 0) {
for ($i = 0; $i < $end_blocks; $i++) {
$this->_writeBlock(ARCHIVE_TAR_END_BLOCK);
}
$end_blocks = 0;
} }
$v_binary_data = pack("a512", $v_buffer); $v_binary_data = pack("a512", $v_buffer);
$this->_writeBlock($v_binary_data); $this->_writeBlock($v_binary_data);
@@ -1818,7 +1892,7 @@ class Archive_Tar extends PEAR
* *
* @param string $p_dir directory to check * @param string $p_dir directory to check
* *
* @return bool TRUE if the directory exists or was created * @return bool true if the directory exists or was created
*/ */
function _dirCheck($p_dir) function _dirCheck($p_dir)
{ {
@@ -1887,7 +1961,11 @@ class Archive_Tar extends PEAR
} }
} }
} }
if (defined('OS_WINDOWS') && OS_WINDOWS) {
$v_result = strtr($v_result, '\\', '/'); $v_result = strtr($v_result, '\\', '/');
}
return $v_result; return $v_result;
} }