skip test if db doesn't have null key support

[p5sagit/p5-mst-13.2.git] / lib / Term / Cap.pm

diff --git a/lib/Term/Cap.pm b/lib/Term/Cap.pm
index 388f0ed..0954000 100644 (file)
--- a/lib/Term/Cap.pm
+++ b/lib/Term/Cap.pm
@@ -104,10 +104,11 @@ as C<$self-E<gt>{TERMCAP}>.
 sub termcap_path { ## private
     my @termcap_path;
     # $TERMCAP, if it's a filespec
-    push(@termcap_path, $ENV{TERMCAP}) if ((exists $ENV{TERMCAP}) &&
-                                           ($ENV{TERMCAP} =~ /^\//
-                                           or $^O eq 'os2' and
-                                           $ENV{TERMCAP} =~ /^[a-z]:\//i));
+    push(@termcap_path, $ENV{TERMCAP})
+       if ((exists $ENV{TERMCAP}) &&
+           (($^O eq 'os2' || $^O eq 'MSWin32' || $^O eq 'dos')
+            ? $ENV{TERMCAP} =~ /^[a-z]:[\\\/]/is
+            : $ENV{TERMCAP} =~ /^\//s));
     if ((exists $ENV{TERMPATH}) && ($ENV{TERMPATH})) {
        # Add the users $TERMPATH
        push(@termcap_path, split(/(:|\s+)/, $ENV{TERMPATH}))
@@ -156,7 +157,7 @@ sub Tgetent { ## public -- static method
     my $foo = (exists $ENV{TERMCAP} ? $ENV{TERMCAP} : '');
 
     # $entry is the extracted termcap entry
-    if (($foo !~ m:^/:) && ($foo =~ m/(^|\|)${termpat}[:|]/)) {
+    if (($foo !~ m:^/:s) && ($foo =~ m/(^|\|)${termpat}[:|]/s)) {
        $entry = $foo;
     }