fmtutil: check for infinite loop only in mktexfmt mode to allow for

multiple defined format/engine combinations


git-svn-id: svn://tug.org/texlive/trunk@16487 c570f23f-e606-0410-a88d-b1316a301751

14 files changed, 56 insertions, 14 deletions

diff --git a/Master/bin/alpha-linux/fmtutil b/Master/bin/alpha-linux/fmtutil
index 7b212f0e212..f12885629e2 100755
--- a/Master/bin/alpha-linux/fmtutil
+++ b/Master/bin/alpha-linux/fmtutil
@@ -58,7 +58,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 progname=fmtutil
 argv0=$0
-version=20091009.0222
+version=20091223.1047
 
 cnf=fmtutil.cnf   # name of the config file
 export PATH
@@ -714,6 +714,9 @@ run_initex()
   rm -f $fmtfile
 
   # Check for infinite recursion before running the iniTeX:
+  # We do this check only if we are running in mktexfmt mode
+  # otherwise double format definitions will create an infinite loop, too
+  $mktexfmtMode || mktexfmt_loop=
   case :$mktexfmt_loop: in
   *:"$format/$engine":*)
     abort "Infinite recursion detected, giving up!" ;;
diff --git a/Master/bin/amd64-freebsd/fmtutil b/Master/bin/amd64-freebsd/fmtutil
index 7b212f0e212..f12885629e2 100755
--- a/Master/bin/amd64-freebsd/fmtutil
+++ b/Master/bin/amd64-freebsd/fmtutil
@@ -58,7 +58,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 progname=fmtutil
 argv0=$0
-version=20091009.0222
+version=20091223.1047
 
 cnf=fmtutil.cnf   # name of the config file
 export PATH
@@ -714,6 +714,9 @@ run_initex()
   rm -f $fmtfile
 
   # Check for infinite recursion before running the iniTeX:
+  # We do this check only if we are running in mktexfmt mode
+  # otherwise double format definitions will create an infinite loop, too
+  $mktexfmtMode || mktexfmt_loop=
   case :$mktexfmt_loop: in
   *:"$format/$engine":*)
     abort "Infinite recursion detected, giving up!" ;;
diff --git a/Master/bin/i386-cygwin/fmtutil b/Master/bin/i386-cygwin/fmtutil
index 7b212f0e212..f12885629e2 100755
--- a/Master/bin/i386-cygwin/fmtutil
+++ b/Master/bin/i386-cygwin/fmtutil
@@ -58,7 +58,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 progname=fmtutil
 argv0=$0
-version=20091009.0222
+version=20091223.1047
 
 cnf=fmtutil.cnf   # name of the config file
 export PATH
@@ -714,6 +714,9 @@ run_initex()
   rm -f $fmtfile
 
   # Check for infinite recursion before running the iniTeX:
+  # We do this check only if we are running in mktexfmt mode
+  # otherwise double format definitions will create an infinite loop, too
+  $mktexfmtMode || mktexfmt_loop=
   case :$mktexfmt_loop: in
   *:"$format/$engine":*)
     abort "Infinite recursion detected, giving up!" ;;
diff --git a/Master/bin/i386-freebsd/fmtutil b/Master/bin/i386-freebsd/fmtutil
index 7b212f0e212..f12885629e2 100755
--- a/Master/bin/i386-freebsd/fmtutil
+++ b/Master/bin/i386-freebsd/fmtutil
@@ -58,7 +58,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 progname=fmtutil
 argv0=$0
-version=20091009.0222
+version=20091223.1047
 
 cnf=fmtutil.cnf   # name of the config file
 export PATH
@@ -714,6 +714,9 @@ run_initex()
   rm -f $fmtfile
 
   # Check for infinite recursion before running the iniTeX:
+  # We do this check only if we are running in mktexfmt mode
+  # otherwise double format definitions will create an infinite loop, too
+  $mktexfmtMode || mktexfmt_loop=
   case :$mktexfmt_loop: in
   *:"$format/$engine":*)
     abort "Infinite recursion detected, giving up!" ;;
diff --git a/Master/bin/i386-linux/fmtutil b/Master/bin/i386-linux/fmtutil
index 7b212f0e212..f12885629e2 100755
--- a/Master/bin/i386-linux/fmtutil
+++ b/Master/bin/i386-linux/fmtutil
@@ -58,7 +58,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 progname=fmtutil
 argv0=$0
-version=20091009.0222
+version=20091223.1047
 
 cnf=fmtutil.cnf   # name of the config file
 export PATH
@@ -714,6 +714,9 @@ run_initex()
   rm -f $fmtfile
 
   # Check for infinite recursion before running the iniTeX:
+  # We do this check only if we are running in mktexfmt mode
+  # otherwise double format definitions will create an infinite loop, too
+  $mktexfmtMode || mktexfmt_loop=
   case :$mktexfmt_loop: in
   *:"$format/$engine":*)
     abort "Infinite recursion detected, giving up!" ;;
diff --git a/Master/bin/i386-netbsd/fmtutil b/Master/bin/i386-netbsd/fmtutil
index 7b212f0e212..f12885629e2 100755
--- a/Master/bin/i386-netbsd/fmtutil
+++ b/Master/bin/i386-netbsd/fmtutil
@@ -58,7 +58,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 progname=fmtutil
 argv0=$0
-version=20091009.0222
+version=20091223.1047
 
 cnf=fmtutil.cnf   # name of the config file
 export PATH
@@ -714,6 +714,9 @@ run_initex()
   rm -f $fmtfile
 
   # Check for infinite recursion before running the iniTeX:
+  # We do this check only if we are running in mktexfmt mode
+  # otherwise double format definitions will create an infinite loop, too
+  $mktexfmtMode || mktexfmt_loop=
   case :$mktexfmt_loop: in
   *:"$format/$engine":*)
     abort "Infinite recursion detected, giving up!" ;;
diff --git a/Master/bin/i386-solaris/fmtutil b/Master/bin/i386-solaris/fmtutil
index 7b212f0e212..f12885629e2 100755
--- a/Master/bin/i386-solaris/fmtutil
+++ b/Master/bin/i386-solaris/fmtutil
@@ -58,7 +58,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 progname=fmtutil
 argv0=$0
-version=20091009.0222
+version=20091223.1047
 
 cnf=fmtutil.cnf   # name of the config file
 export PATH
@@ -714,6 +714,9 @@ run_initex()
   rm -f $fmtfile
 
   # Check for infinite recursion before running the iniTeX:
+  # We do this check only if we are running in mktexfmt mode
+  # otherwise double format definitions will create an infinite loop, too
+  $mktexfmtMode || mktexfmt_loop=
   case :$mktexfmt_loop: in
   *:"$format/$engine":*)
     abort "Infinite recursion detected, giving up!" ;;
diff --git a/Master/bin/mips-irix/fmtutil b/Master/bin/mips-irix/fmtutil
index 7b212f0e212..f12885629e2 100755
--- a/Master/bin/mips-irix/fmtutil
+++ b/Master/bin/mips-irix/fmtutil
@@ -58,7 +58,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 progname=fmtutil
 argv0=$0
-version=20091009.0222
+version=20091223.1047
 
 cnf=fmtutil.cnf   # name of the config file
 export PATH
@@ -714,6 +714,9 @@ run_initex()
   rm -f $fmtfile
 
   # Check for infinite recursion before running the iniTeX:
+  # We do this check only if we are running in mktexfmt mode
+  # otherwise double format definitions will create an infinite loop, too
+  $mktexfmtMode || mktexfmt_loop=
   case :$mktexfmt_loop: in
   *:"$format/$engine":*)
     abort "Infinite recursion detected, giving up!" ;;
diff --git a/Master/bin/powerpc-aix/fmtutil b/Master/bin/powerpc-aix/fmtutil
index 7b212f0e212..f12885629e2 100755
--- a/Master/bin/powerpc-aix/fmtutil
+++ b/Master/bin/powerpc-aix/fmtutil
@@ -58,7 +58,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 progname=fmtutil
 argv0=$0
-version=20091009.0222
+version=20091223.1047
 
 cnf=fmtutil.cnf   # name of the config file
 export PATH
@@ -714,6 +714,9 @@ run_initex()
   rm -f $fmtfile
 
   # Check for infinite recursion before running the iniTeX:
+  # We do this check only if we are running in mktexfmt mode
+  # otherwise double format definitions will create an infinite loop, too
+  $mktexfmtMode || mktexfmt_loop=
   case :$mktexfmt_loop: in
   *:"$format/$engine":*)
     abort "Infinite recursion detected, giving up!" ;;
diff --git a/Master/bin/powerpc-linux/fmtutil b/Master/bin/powerpc-linux/fmtutil
index 7b212f0e212..f12885629e2 100755
--- a/Master/bin/powerpc-linux/fmtutil
+++ b/Master/bin/powerpc-linux/fmtutil
@@ -58,7 +58,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 progname=fmtutil
 argv0=$0
-version=20091009.0222
+version=20091223.1047
 
 cnf=fmtutil.cnf   # name of the config file
 export PATH
@@ -714,6 +714,9 @@ run_initex()
   rm -f $fmtfile
 
   # Check for infinite recursion before running the iniTeX:
+  # We do this check only if we are running in mktexfmt mode
+  # otherwise double format definitions will create an infinite loop, too
+  $mktexfmtMode || mktexfmt_loop=
   case :$mktexfmt_loop: in
   *:"$format/$engine":*)
     abort "Infinite recursion detected, giving up!" ;;
diff --git a/Master/bin/sparc-linux/fmtutil b/Master/bin/sparc-linux/fmtutil
index 7b212f0e212..f12885629e2 100755
--- a/Master/bin/sparc-linux/fmtutil
+++ b/Master/bin/sparc-linux/fmtutil
@@ -58,7 +58,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 progname=fmtutil
 argv0=$0
-version=20091009.0222
+version=20091223.1047
 
 cnf=fmtutil.cnf   # name of the config file
 export PATH
@@ -714,6 +714,9 @@ run_initex()
   rm -f $fmtfile
 
   # Check for infinite recursion before running the iniTeX:
+  # We do this check only if we are running in mktexfmt mode
+  # otherwise double format definitions will create an infinite loop, too
+  $mktexfmtMode || mktexfmt_loop=
   case :$mktexfmt_loop: in
   *:"$format/$engine":*)
     abort "Infinite recursion detected, giving up!" ;;
diff --git a/Master/bin/sparc-solaris/fmtutil b/Master/bin/sparc-solaris/fmtutil
index 7b212f0e212..f12885629e2 100755
--- a/Master/bin/sparc-solaris/fmtutil
+++ b/Master/bin/sparc-solaris/fmtutil
@@ -58,7 +58,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 progname=fmtutil
 argv0=$0
-version=20091009.0222
+version=20091223.1047
 
 cnf=fmtutil.cnf   # name of the config file
 export PATH
@@ -714,6 +714,9 @@ run_initex()
   rm -f $fmtfile
 
   # Check for infinite recursion before running the iniTeX:
+  # We do this check only if we are running in mktexfmt mode
+  # otherwise double format definitions will create an infinite loop, too
+  $mktexfmtMode || mktexfmt_loop=
   case :$mktexfmt_loop: in
   *:"$format/$engine":*)
     abort "Infinite recursion detected, giving up!" ;;
diff --git a/Master/bin/universal-darwin/fmtutil b/Master/bin/universal-darwin/fmtutil
index 7b212f0e212..f12885629e2 100755
--- a/Master/bin/universal-darwin/fmtutil
+++ b/Master/bin/universal-darwin/fmtutil
@@ -58,7 +58,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 progname=fmtutil
 argv0=$0
-version=20091009.0222
+version=20091223.1047
 
 cnf=fmtutil.cnf   # name of the config file
 export PATH
@@ -714,6 +714,9 @@ run_initex()
   rm -f $fmtfile
 
   # Check for infinite recursion before running the iniTeX:
+  # We do this check only if we are running in mktexfmt mode
+  # otherwise double format definitions will create an infinite loop, too
+  $mktexfmtMode || mktexfmt_loop=
   case :$mktexfmt_loop: in
   *:"$format/$engine":*)
     abort "Infinite recursion detected, giving up!" ;;
diff --git a/Master/bin/x86_64-linux/fmtutil b/Master/bin/x86_64-linux/fmtutil
index 7b212f0e212..f12885629e2 100755
--- a/Master/bin/x86_64-linux/fmtutil
+++ b/Master/bin/x86_64-linux/fmtutil
@@ -58,7 +58,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 progname=fmtutil
 argv0=$0
-version=20091009.0222
+version=20091223.1047
 
 cnf=fmtutil.cnf   # name of the config file
 export PATH
@@ -714,6 +714,9 @@ run_initex()
   rm -f $fmtfile
 
   # Check for infinite recursion before running the iniTeX:
+  # We do this check only if we are running in mktexfmt mode
+  # otherwise double format definitions will create an infinite loop, too
+  $mktexfmtMode || mktexfmt_loop=
   case :$mktexfmt_loop: in
   *:"$format/$engine":*)
     abort "Infinite recursion detected, giving up!" ;;