Change 13441 by jhi@alpha on 2001/12/03 17:15:52
Subject: [PATCH lib/Term/Cap.pm] was Re: [PATCH] Shared hash keys
From: Jonathan Stowe <[EMAIL PROTECTED]>
Date: Mon, 3 Dec 2001 15:48:38 +0000 (GMT)
Message-ID: <[EMAIL PROTECTED]>
Affected files ...
.... //depot/perl/lib/Term/Cap.pm#19 edit
Differences ...
==== //depot/perl/lib/Term/Cap.pm#19 (text) ====
Index: perl/lib/Term/Cap.pm
--- perl/lib/Term/Cap.pm.~1~ Mon Dec 3 10:30:05 2001
+++ perl/lib/Term/Cap.pm Mon Dec 3 10:30:05 2001
@@ -1,10 +1,12 @@
package Term::Cap;
use Carp;
+use strict;
use vars qw($VERSION);
+use vars qw($termpat $state $first $entry);
-$VERSION = '1.03';
+$VERSION = '1.05';
# Version undef: Thu Dec 14 20:02:42 CST 1995 by [EMAIL PROTECTED]
# Version 1.00: Thu Nov 30 23:34:29 EST 2000 by [EMAIL PROTECTED]
@@ -19,6 +21,9 @@
# VMS Support from Charles Lane <[EMAIL PROTECTED]>
# Version 1.04: Thu Nov 29 16:22:03 GMT 2001
# Fixed warnings in test
+# Version 1.05: Mon Dec 3 15:33:49 GMT 2001
+# Don't try to fall back on infocmp if it's not there. From chromatic.
+#
# TODO:
# support Berkeley DB termcaps
@@ -189,17 +194,17 @@
# last resort--fake up a termcap from terminfo
local $ENV{TERM} = $term;
- if ( $^O eq 'VMS' ) {
- chomp(my @entry = <DATA>);
- $entry = join '', @entry;
- }
- else {
- eval
- {
- $entry = `infocmp -C 2>/dev/null`;
- }
- }
-
+ if ( $^O eq 'VMS' ) {
+ chomp(my @entry = <DATA>);
+ $entry = join '', @entry;
+ }
+ else {
+ eval
+ {
+ $entry = `infocmp -C 2>/dev/null`
+ if grep { -x "$_/infocmp" } split /:/, $ENV{PATH};
+ }
+ }
}
croak "Can't find a valid termcap file" unless @termcap_path || $entry;
End of Patch.
