aboutsummaryrefslogtreecommitdiff
path: root/textproc
diff options
context:
space:
mode:
authorPeter Pentchev <roam@FreeBSD.org>2003-12-13 05:47:02 +0000
committerPeter Pentchev <roam@FreeBSD.org>2003-12-13 05:47:02 +0000
commit571f16bbe3cc12ed37fa925fe16d591c960cc68d (patch)
tree6d07fc22c7d040d87c337b7d5d344273b3f3c129 /textproc
parent24a534b4578363c43981d545f3ece1cc428217bc (diff)
downloadports-571f16bbe3cc12ed37fa925fe16d591c960cc68d.tar.gz
ports-571f16bbe3cc12ed37fa925fe16d591c960cc68d.zip
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
Notes
Notes: svn path=/head/; revision=95710
Diffstat (limited to 'textproc')
-rw-r--r--textproc/texi2html/files/patch-texi2html.pl51
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 000000000000..f3660d0a9bb6
--- /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