From: Salvador Fandiño <sfandino@yahoo.com>
Date: Sat, 25 Feb 2006 11:14:20 +0000 (+0100)
Subject: [patch] dumping tied globs without FILENO method on the debugger fails
X-Git-Tag: upstream/5.16.3~18404
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=bef1d2845fb0db7845d14820c48acfde8ab087fe;p=platform%2Fupstream%2Fperl.git

[patch] dumping tied globs without FILENO method on the debugger fails
Message-ID: <20060225101254.726.qmail@lists.develooper.com>

p4raw-id: //depot/perl@27342
---

diff --git a/lib/dumpvar.pl b/lib/dumpvar.pl
index 43e107ff5f..fa5b4dfb47 100644
--- a/lib/dumpvar.pl
+++ b/lib/dumpvar.pl
@@ -282,14 +282,14 @@ sub unwrap {
       if ($globPrint) {
 	$s += 3;
        dumpglob($s, "{$$v}", $$v, 1, $m-1);
-      } elsif (defined ($fileno = fileno($v))) {
+      } elsif (defined ($fileno = eval {fileno($v)})) {
 	print( (' ' x ($s+3)) .  "FileHandle({$$v}) => fileno($fileno)\n" );
       }
     } elsif (ref \$v eq 'GLOB') {
       # Raw glob (again?)
       if ($globPrint) {
        dumpglob($s, "{$v}", $v, 1, $m-1) if $globPrint;
-      } elsif (defined ($fileno = fileno(\$v))) {
+      } elsif (defined ($fileno = eval {fileno(\$v)})) {
 	print( (' ' x $s) .  "FileHandle({$v}) => fileno($fileno)\n" );
       }
     }
@@ -368,7 +368,7 @@ sub dumpglob {
       unwrap(\%entry,3+$off,$m) ;
       print( (' ' x $off) .  ")\n" );
     }
-    if (defined ($fileno = fileno(*entry))) {
+    if (defined ($fileno = eval{fileno(*entry)})) {
       print( (' ' x $off) .  "FileHandle($key) => fileno($fileno)\n" );
     }
     if ($all) {