Tune further the OS detection of CGI.

p4raw-id: //depot/perl@8086

1 files changed, 6 insertions, 8 deletions

diff --git a/lib/CGI.pm b/lib/CGI.pm
index f49b618074..617c605b85 100644
--- a/lib/CGI.pm
+++ b/lib/CGI.pm
@@ -107,19 +107,17 @@ unless ($OS) {
 	$OS = $Config::Config{'osname'};
     }
 }
-if ($OS=~/win32/i) {
+if ($OS =~ /^MSWin/i) {
   $OS = 'WINDOWS';
-} elsif ($OS=~/vms/i) {
+} elsif ($OS =~ /^VMS/i) {
   $OS = 'VMS';
-} elsif ($OS=~/bsdos/i) {
-  $OS = 'UNIX';
-} elsif ($OS=~/dos/i) {
+} elsif ($OS =~ /^dos/i) {
   $OS = 'DOS';
-} elsif ($OS=~/^MacOS$/i) {
+} elsif ($OS =~ /^MacOS/i) {
     $OS = 'MACINTOSH';
-} elsif ($OS=~/os2/i) {
+} elsif ($OS =~ /^os2/i) {
     $OS = 'OS2';
-} elsif ($OS=~/epoc/) {
+} elsif ($OS =~ /^epoc/i) {
     $OS = 'EPOC';
 } else {
     $OS = 'UNIX';