summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/texk/tetex/ChangeLog5
-rwxr-xr-xBuild/source/texk/tetex/fmtutil5
-rwxr-xr-xMaster/bin/alpha-linux/fmtutil5
-rwxr-xr-xMaster/bin/amd64-freebsd/fmtutil5
-rwxr-xr-xMaster/bin/i386-cygwin/fmtutil5
-rwxr-xr-xMaster/bin/i386-freebsd/fmtutil5
-rwxr-xr-xMaster/bin/i386-linux/fmtutil5
-rwxr-xr-xMaster/bin/i386-netbsd/fmtutil5
-rwxr-xr-xMaster/bin/i386-solaris/fmtutil5
-rwxr-xr-xMaster/bin/mips-irix/fmtutil5
-rwxr-xr-xMaster/bin/powerpc-aix/fmtutil5
-rwxr-xr-xMaster/bin/powerpc-linux/fmtutil5
-rwxr-xr-xMaster/bin/sparc-linux/fmtutil5
-rwxr-xr-xMaster/bin/sparc-solaris/fmtutil5
-rwxr-xr-xMaster/bin/universal-darwin/fmtutil5
-rwxr-xr-xMaster/bin/x86_64-linux/fmtutil5
16 files changed, 65 insertions, 15 deletions
diff --git a/Build/source/texk/tetex/ChangeLog b/Build/source/texk/tetex/ChangeLog
index 493ab22b409..19f0acf74b1 100644
--- a/Build/source/texk/tetex/ChangeLog
+++ b/Build/source/texk/tetex/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-23 Norbert Preining <preining@logic.at>
+
+ * fmtutil: check for infinite loop only in mktexfmt mode so that
+ multiple defined format/engine combinations are accepted.
+
2009-10-24 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am (bin_links, man1_links):
diff --git a/Build/source/texk/tetex/fmtutil b/Build/source/texk/tetex/fmtutil
index 7b212f0e212..f12885629e2 100755
--- a/Build/source/texk/tetex/fmtutil
+++ b/Build/source/texk/tetex/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/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!" ;;