[Octave-bug-tracker] [bug #62648] build problem with texinfo>6.8

[Arun Giridhar]

Follow-up Comment #8, bug #62648 (project octave):

This WIP change should prevent the infinite loops from happening:


diff -r 870036573716 doc/interpreter/mk-qthelp.pl
--- a/doc/interpreter/mk-qthelp.pl      Mon Nov 07 16:50:39 2022 -0500
+++ b/doc/interpreter/mk-qthelp.pl      Fri Nov 11 08:13:45 2022 -0500
@@ -26,8 +26,12 @@ if ($#ARGV != 1)
 open (my $HTML, "<", $htmlfname) or die "Unable to open $htmlfname";
 
 # Skip through preamble of file to find start of list
-while (($_ = <$HTML>) !~ /^<div class="contents">/ ) {;}
-while (($_ = <$HTML>) !~ /^<ul class="no-bullet">/ ) {;}
+$_ = <$HTML>;
+while (defined($_) && (!eof($_)) && ($_ !~ /^<div class="contents">/ )) {;}
+die("Texinfo version mismatch -- fix in progress") if (eof($_));
+$_ = <$HTML>;
+while (defined($_) && (!eof($_)) && ($_ !~ /^<ul class="no-bullet">/ )) {;}
+die("Texinfo version mismatch -- fix in progress") if (eof($_));
 
 $level = 0;
 while (<$HTML>)
@@ -68,7 +72,9 @@ die "Failed to parse index.html" if ($le
 open ($HTML, "<", $htmlfname) or die "Unable to open $htmlfname";
 
 # Skip through preamble of file to find start of list
-while (($_ = <$HTML>) !~ /^<table class="index-fn/ ) {;}
+$_ = <$HTML>;
+while (defined($_) && (!eof($_)) && ($_ !~ /^<table class="index-fn/ )) {;}
+die("Texinfo version mismatch -- fix in progress") if (eof($_));
 
 while (<$HTML>)
 {




    _______________________________________________________

Reply to this item at:

  <https://savannah.gnu.org/bugs/?62648>

_______________________________________________
Message sent via Savannah
https://savannah.gnu.org/