* a little more "windows robust" when looking for package.xml

stigsb · stigsb · commit 693204265e39 · 2002-11-26T01:38:48.000Z
diff --git a/pear/PEAR/Common.php b/pear/PEAR/Common.php
@@ -696,26 +696,28 @@ function _pkginfo_cdata_1_0($xp, $data)
     function infoFromTgzFile($file)
     {
         if (!@is_file($file)) {
-            return $this->raiseError("tgz :: could not open file \"$file\"");
+            return $this->raiseError("could not open file \"$file\"");
         }
         $tar = new Archive_Tar($file);
         $content = $tar->listContent();
         if (!is_array($content)) {
-            return $this->raiseError("tgz :: could not get contents of package \"$file\"");
+            return $this->raiseError("could not get contents of package \"$file\"");
         }
         $xml = null;
         foreach ($content as $file) {
             $name = $file['filename'];
             if ($name == 'package.xml') {
                 $xml = $name;
-            } elseif (ereg('^.*/package.xml$', $name, $match)) {
+                break;
+            } elseif (ereg('package.xml$', $name, $match)) {
                 $xml = $match[0];
+                break;
             }
         }
         $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->raiseError('could not extract the package.xml file');
         }
         return $this->infoFromDescriptionFile("$tmpdir/$xml");
     }

Original file line number	Diff line number	Diff line change
`@@ -696,26 +696,28 @@ function _pkginfo_cdata_1_0($xp, $data)`
`696`	`696`	`function infoFromTgzFile($file)`
`697`	`697`	`{`
`698`	`698`	`if (!@is_file($file)) {`
`699`		`- return $this->raiseError("tgz :: could not open file \"$file\"");`
	`699`	`+ return $this->raiseError("could not open file \"$file\"");`
`700`	`700`	`}`
`701`	`701`	`$tar = new Archive_Tar($file);`
`702`	`702`	`$content = $tar->listContent();`
`703`	`703`	`if (!is_array($content)) {`
`704`		`- return $this->raiseError("tgz :: could not get contents of package \"$file\"");`
	`704`	`+ return $this->raiseError("could not get contents of package \"$file\"");`
`705`	`705`	`}`
`706`	`706`	`$xml = null;`
`707`	`707`	`foreach ($content as $file) {`
`708`	`708`	`$name = $file['filename'];`
`709`	`709`	`if ($name == 'package.xml') {`
`710`	`710`	`$xml = $name;`
`711`		`- } elseif (ereg('^.*/package.xml$', $name, $match)) {`
	`711`	`+ break;`
	`712`	`+ } elseif (ereg('package.xml$', $name, $match)) {`
`712`	`713`	`$xml = $match[0];`
	`714`	`+ break;`
`713`	`715`	`}`
`714`	`716`	`}`
`715`	`717`	`$tmpdir = System::mkTemp('-d pear');`
`716`	`718`	`$this->addTempFile($tmpdir);`
`717`	`719`	`if (!$xml \|\| !$tar->extractList($xml, $tmpdir)) {`
`718`		`- return $this->raiseError('tgz :: could not extract the package.xml file');`
	`720`	`+ return $this->raiseError('could not extract the package.xml file');`
`719`	`721`	`}`
`720`	`722`	`return $this->infoFromDescriptionFile("$tmpdir/$xml");`
`721`	`723`	`}`