From 360d1da529af0b1a467a1cb9aafc94076fab02ea Mon Sep 17 00:00:00 2001 From: Stig Bakken Date: Thu, 3 Apr 2003 23:11:50 +0000 Subject: [PATCH] * windows bugfix --- pear/OS/Guess.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pear/OS/Guess.php b/pear/OS/Guess.php index 92a52ef116..959476d69a 100644 --- a/pear/OS/Guess.php +++ b/pear/OS/Guess.php @@ -123,7 +123,15 @@ class OS_Guess $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 @@ class OS_Guess { if (strcspn($fragment, '*?') < strlen($fragment)) { $reg = '^' . str_replace(array('*', '?', '/'), array('.*', '.', '\\/'), $fragment) . '$'; - return eregi($preg, $value); + return eregi($reg, $value); } return ($fragment == '*' || !strcasecmp($fragment, $value)); } -- 2.50.1