cvs: php4 /pear/OS Guess.php
| From: | Stig Bakken | Date: | Thu, 03 Apr 2003 23:11:50 +0000 |
| Subject: | cvs: php4 /pear/OS Guess.php | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-9726@lists.php.net to get a copy of this message | ||
ssb Thu Apr 3 18:11:50 2003 EDT
Modified files:
/php4/pear/OS Guess.php
Log:
* windows bugfix
Index: php4/pear/OS/Guess.php
diff -u php4/pear/OS/Guess.php:1.8 php4/pear/OS/Guess.php:1.9
--- php4/pear/OS/Guess.php:1.8 Tue Mar 18 07:06:06 2003
+++ php4/pear/OS/Guess.php Thu Apr 3 18:11:50 2003
@@ -17,7 +17,7 @@
// | |
// +----------------------------------------------------------------------+
//
-// $Id: Guess.php,v 1.8 2003/03/18 12:06:06 ssb Exp $
+// $Id: Guess.php,v 1.9 2003/04/03 23:11:50 ssb Exp $
// {{{ uname examples
@@ -123,7 +123,15 @@
$release = "$parts[3].$parts[2]";
break;
case 'Windows':
- $release = $parts[3];
+ switch ($parts[1]) {
+ case '95/98':
+ $release = '9x';
+ break;
+ default:
+ $release = $parts[1];
+ break;
+ }
+ $cpu = 'i386';
break;
case 'Linux':
$extra = $this->_detectGlibcVersion();
@@ -241,7 +249,7 @@
{
if (strcspn($fragment, '*?') < strlen($fragment)) {
$reg = '^' . str_replace(array('*', '?', '/'),
array('.*', '.', '\\/'), $fragment) . '$';
- return eregi($preg, $value);
+ return eregi($reg, $value);
}
return ($fragment == '*' || !strcasecmp($fragment, $value));
}