cvs: pear /PHP_Archive Archive.php

cellog Sat May 19 19:23:26 2007 UTC

Modified files:
/pear/PHP_Archive Archive.php
Log:
fix opendir() and stat of a non-existent directory

http://cvs.php.net/viewvc.cgi/pear/P...&diff_format=u
Index: pear/PHP_Archive/Archive.php
diff -u pear/PHP_Archive/Archive.php:1.39 pear/PHP_Archive/Archive.php:1.40
--- pear/PHP_Archive/Archive.php:1.39 Fri May 18 03:49:36 2007
+++ pear/PHP_Archive/Archive.php Sat May 19 19:23:26 2007
@@ -19,7 +19,7 @@
* @author Davey Shafik <davey@synapticmedia.net>
* @author Greg Beaver <cellog@php.net>
* @link http://www.synapticmedia.net Synaptic Media
- * @version $Id: Archive.php,v 1.39 2007/05/18 03:49:36 cellog Exp $
+ * @version $Id: Archive.php,v 1.40 2007/05/19 19:23:26 cellog Exp $
* @package PHP_Archive
* @category PHP
*/
@@ -857,6 +857,22 @@
$this->_setCurrentFile($file);
$isdir = false;
} else {
+ do {
+ $isdir = false;
+ if ($file == '/') {
+ break;
+ }
+ foreach (self::$_manifest[$this->_archiveName] as $path => $info) {
+ if (strpos($path, $file) === 0) {
+ if (strlen($path) > strlen($file) &&
+ $path[strlen($file)] == '/') {
+ break 2;
+ }
+ }
+ }
+ // no files exist and no directories match this string
+ return false;
+ } while (false);
$isdir = true;
}
} else {
@@ -934,11 +950,11 @@
} elseif (strpos($file, $path) === 0) {
$fname = substr($file, strlen($path) + 1);
if (strpos($fname, '/')) {
+ // this is a directory
$a = explode('/', $fname);
$this->_dirFiles[array_shift($a)] = true;
- } elseif (strlen($file) != strlen($path)) {
- // if the two match exactly, the path searched for was
- // not a directory, but was a file.
+ } elseif ($file[strlen($path)] == '/') {
+ // this is a file
$this->_dirFiles[$fname] = true;
}
}