php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-21 15:08:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Rewrote infoFromTgzFile() (Stig, no more "pedantic" :-)

Browse Source 
- Added <description> tag for package.xml
- Temporal fix arround php bug #14744 and temp files cleaning
This commit is contained in:
Tomas V.V.Cox
2001-12-28 19:27:08 +00:00
parent ae1a702501
commit 6b0ac4420c
1 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pear/PEAR/Common.php
+29 -22
View File
@@ -67,6 +67,8 @@ class PEAR_Common extends PEAR
function PEAR_Common()
{
$GLOBALS['_PEAR_Common_tempfiles'] = array();
$this->_tempfiles =& $GLOBALS['_PEAR_Common_tempfiles'];
$this->PEAR();
}
@@ -75,8 +77,11 @@ class PEAR_Common extends PEAR
function _PEAR_Common()
{
while (is_array($this->_tempfiles) &&
$file = array_shift($this->_tempfiles))
// doesn't work due to bug #14744
//$tempfiles = $this->_tempfiles;
$tempfiles =& $GLOBALS['_PEAR_Common_tempfiles'];
while (is_array($tempfiles) &&
$file = array_shift($tempfiles))
{
if (@is_dir($file)) {
System::rm("-rf $file");
@@ -211,6 +216,9 @@ class PEAR_Common extends PEAR
case 'summary':
$this->pkginfo['summary'] = $data;
break;
case 'description':
$this->pkginfo['description'] = $data;
break;
case 'user':
$this->current_maintainer['handle'] = $data;
break;
@@ -387,33 +395,32 @@ class PEAR_Common extends PEAR
/**
* Returns info from a tgz pear package
* (experimental)
*/
function infoFromTgzFile($file, $pedantic = true)
function infoFromTgzFile($file)
{
if ($pedantic) {
// XXX Fixme: Only allows file in the current dir
$file = basename($file);
}
if (!@is_file($file)) {
return $this->raiseError('no tar file supplied');
return $this->raiseError('tgz :: could not open file');
}
// Assume the decompressed dir name
if ($pedantic && ($pos = strrpos($file, '.')) === false) {
return $this->raiseError('file doesn\'t follow the package name convention');
}
$pkgdir = substr($file, 0, $pos);
$xml = $pkgdir . DIRECTORY_SEPARATOR . 'package.xml';
$tar = new Archive_Tar($file, true);
if (!$tar->extractList($xml)) {
return $this->raiseError('could not extract the package.xml file');
$content = $tar->listContent();
if (!is_array($content)) {
return $this->raiseError('tgz :: could not get contents of package');
}
$info = $this->infoFromDescriptionFile($xml);
unlink($xml);
return $info;
}
$xml = null;
foreach ($content as $file) {
$name = $file['filename'];
if (ereg('^.*/package.xml$', $name, $match)) {
$xml = $match[0];
}
}
$tmpdir = System::mkTemp('-d pear');
$this->addTempFile($tmpdir);
if (!$xml || !$tar->extractList($xml, $tmpdir)) {
return $this->raiseError('tgz :: could not extract the package.xml file');
}
return $this->infoFromDescriptionFile("$tmpdir/$xml");
// }}}
}
}
?>