If we use @{[]} (a.k.a. baby-cart) interpolation, we got warnings

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

diff --git a/lib/Term/Cap.pm b/lib/Term/Cap.pm
index 0e34d7a..b71c51c 100644 (file)
--- a/lib/Term/Cap.pm
+++ b/lib/Term/Cap.pm
@@ -1,12 +1,23 @@
 package Term::Cap;
 
-use Carp;
+# Since the debugger uses Term::ReadLine which uses Term::Cap, we want
+# to load as few modules as possible.  This includes Carp.pm.
+sub carp {
+    require Carp;
+    goto &Carp::carp;
+}
+
+sub croak {
+    require Carp;
+    goto &Carp::croak;
+}
+
 use strict;
 
 use vars qw($VERSION $VMS_TERMCAP);
 use vars qw($termpat $state $first $entry);
 
-$VERSION = '1.06';
+$VERSION = '1.09';
 
 # Version undef: Thu Dec 14 20:02:42 CST 1995 by sanders@bsdi.com
 # Version 1.00:  Thu Nov 30 23:34:29 EST 2000 by schwern@pobox.com
@@ -26,6 +37,16 @@ $VERSION = '1.06';
 # Version 1.06:  Thu Dec  6 18:43:22 GMT 2001
 #       Preload the default VMS termcap from Charles Lane
 #       Don't carp at setting OSPEED unless warnings are on.
+# Version 1.07:  Wed Jan  2 21:35:09 GMT 2002
+#       Sanity check on infocmp output from Norton Allen
+#       Repaired INSTALLDIRS thanks to Michael Schwern
+# Version 1.08:  Sat Sep 28 11:33:15 BST 2002
+#       Late loading of 'Carp' as per Michael Schwern
+# Version 1.09:  Tue Apr 20 12:06:51 BST 2004
+#       Merged in changes from and to Core
+#       Core (Fri Aug 30 14:15:55 CEST 2002):
+#       Cope with comments lines from 'infocmp' from Brendan O'Dea
+#       Allow for EBCDIC in Tgoto magic test.
 
 # TODO:
 # support Berkeley DB termcaps
@@ -213,10 +234,15 @@ sub Tgetent { ## public -- static method
           $entry = $VMS_TERMCAP;
         }
         else {
-           eval
-           {
-            $entry = `infocmp -C 2>/dev/null`
-                    if grep { -x "$_/infocmp" } split /:/, $ENV{PATH};
+           if ( grep { -x "$_/infocmp" } split /:/, $ENV{PATH} ) {
+              eval
+              {
+                my $tmp = `infocmp -C 2>/dev/null`;
+                $tmp =~ s/^#.*\n//gm; # remove comments
+                if (( $tmp !~ m%^/%s ) && ( $tmp =~ /(^|\|)${termpat}[:|]/s)) {
+                   $entry = $tmp;
+                }
+              };
            }
         }
     }