Skip to content

Commit 360d1da

Browse files
committed
* windows bugfix
1 parent e853217 commit 360d1da

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

pear/OS/Guess.php

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,15 @@ function parseSignature($uname = null)
123123
$release = "$parts[3].$parts[2]";
124124
break;
125125
case 'Windows':
126-
$release = $parts[3];
126+
switch ($parts[1]) {
127+
case '95/98':
128+
$release = '9x';
129+
break;
130+
default:
131+
$release = $parts[1];
132+
break;
133+
}
134+
$cpu = 'i386';
127135
break;
128136
case 'Linux':
129137
$extra = $this->_detectGlibcVersion();
@@ -241,7 +249,7 @@ function _matchFragment($fragment, $value)
241249
{
242250
if (strcspn($fragment, '*?') < strlen($fragment)) {
243251
$reg = '^' . str_replace(array('*', '?', '/'), array('.*', '.', '\\/'), $fragment) . '$';
244-
return eregi($preg, $value);
252+
return eregi($reg, $value);
245253
}
246254
return ($fragment == '*' || !strcasecmp($fragment, $value));
247255
}

0 commit comments

Comments
 (0)