[5494] forcibly abort after 7 cycles

[karl]

Revision: 5494
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5494
Author:   karl
Date:     2014-04-27 22:29:02 +0000 (Sun, 27 Apr 2014)
Log Message:
-----------
forcibly abort after 7 cycles

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/util/texi2dvi

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2014-04-26 20:49:10 UTC (rev 5493)
+++ trunk/ChangeLog     2014-04-27 22:29:02 UTC (rev 5494)
@@ -1,3 +1,8 @@
+2014-04-27  Karl Berry  <address@hidden>
+
+       * util/texi2dvi (max_iters): change from -1 to 7.  Infinite
+       loops are bad.  Report from Marius Hofert, 25 Apr 2014 08:10:44.
+
 2014-04-26  Gavin Smith  <address@hidden>
 
        * info/t/file-nodes.sh, info/t/dir-file-node.sh: New tests.

Modified: trunk/util/texi2dvi
===================================================================
--- trunk/util/texi2dvi 2014-04-26 20:49:10 UTC (rev 5493)
+++ trunk/util/texi2dvi 2014-04-27 22:29:02 UTC (rev 5494)
@@ -52,7 +52,7 @@
 expand=false    # true for expansion via makeinfo
 includes=
 line_error=true # pass --file-line-error to TeX
-max_iters=-1    # keep going forever
+max_iters=7     # when to quit
 oname=          # --output
 out_lang=dvi
 quiet=false     # let the tools' message be displayed
@@ -358,7 +358,7 @@
                          defaults to TEXI2DVI_BUILD_DIRECTORY [$build_dir]
   --mostly-clean       remove the auxiliary files and directories
                          but not the output
-  --max-iterations=N   don't process files more than N times
+  --max-iterations=N   don't process files more than N times [$max_iters]
 
 The MODE specifies where the TeX compilation takes place, and, as a
 consequence, how auxiliary files are treated.  The build mode
@@ -1110,7 +1110,8 @@
               && grep '^\\bibdata' "$in_noext.aux") ) \
         >&6 2>&1; \
   then
-    for f in `generated_files_get "$in_noext" bibaux_file_p`; do
+    bibtex_aux=`generated_files_get "$in_noext" bibaux_file_p`
+    for f in $bibtex_aux; do
       run $bibtex "$f"
     done
   fi
@@ -1261,9 +1262,9 @@
 
     xref_files_save
 
-    # We run bibtex first, because I can see reasons for the indexes
-    # to change after bibtex is run, but I see no reason for the
-    # converse.
+    # We run bibtex first, because it's more likely for the indexes
+    # to change after bibtex is run than the reverse, though either
+    # would be rare.
     run_bibtex
     run_index
     run_core_conversion
@@ -1696,7 +1697,6 @@
       ;;
   esac
 
-  # This recognizes --quark as --quiet.  Oh well.
   case "$1" in
     -@ ) escape=@;;
     -~ ) catcode_special=false;;