diff options
author | roam <roam@FreeBSD.org> | 2003-12-13 05:47:02 +0000 |
---|---|---|
committer | roam <roam@FreeBSD.org> | 2003-12-13 05:47:02 +0000 |
commit | 3f089dcc060298bb091a870165c18480f461b87a (patch) | |
tree | 66a5056ffcdb282a876ca7c44469f9302e31318e /textproc/texi2html | |
parent | 0e2a89a8d7e2968e1e06296a837d8d56c1763bb5 (diff) | |
download | FreeBSD-ports-3f089dcc060298bb091a870165c18480f461b87a.zip FreeBSD-ports-3f089dcc060298bb091a870165c18480f461b87a.tar.gz |
Remove a couple of symbolic reference abuses: the texi2html developers
had left one that made Perl 5.00503 very unhappy. Create and use
filehandles The Right Way(tm) instead of using the 'no strict refs' bandaid.
Prompted by: kris
Diffstat (limited to 'textproc/texi2html')
-rw-r--r-- | textproc/texi2html/files/patch-texi2html.pl | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/textproc/texi2html/files/patch-texi2html.pl b/textproc/texi2html/files/patch-texi2html.pl new file mode 100644 index 0000000..f3660d0a --- /dev/null +++ b/textproc/texi2html/files/patch-texi2html.pl @@ -0,0 +1,51 @@ +--- texi2html.pl.old Sat Dec 13 07:39:45 2003 ++++ texi2html.pl Sat Dec 13 07:40:11 2003 +@@ -174,7 +174,6 @@ + $ext + $extensions + $failed +- $fh_name + $file + $first_index_chapter + $first_line +@@ -4127,25 +4126,22 @@ + sub open + { + my($name) = @_; ++ local *FH; + +- ++$fh_name; +- no strict "refs"; +- if (open($fh_name, $name)) ++ if (open(*FH, $name)) + { +- unshift(@fhs, $fh_name); ++ unshift(@fhs, *FH); + } + else + { + warn "$ERROR Can't read file $name: $!\n"; + } +- use strict "refs"; + } + + sub init_input + { + @fhs = (); # hold the file handles to read + @input_spool = (); # spooled lines to read +- $fh_name = 'FH000'; + &open($docu); + } + +@@ -4420,9 +4416,8 @@ + if ($style =~ /^\&/) + { # custom + $style = $'; +- no strict "refs"; +- $text = &$style($text, $texi_style); +- use strict "refs"; ++ eval "\$text = &$style(\$text, \$texi_style)"; ++ die $@ if $@; + } + elsif ($style) + { # good style |