update the fmtutil to fix the space in dir bug

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

14 files changed, 170 insertions, 40 deletions

diff --git a/Master/bin/alpha-linux/fmtutil b/Master/bin/alpha-linux/fmtutil
index 47d3af7247a..8f35dfdec0f 100755
--- a/Master/bin/alpha-linux/fmtutil
+++ b/Master/bin/alpha-linux/fmtutil
@@ -29,6 +29,7 @@
 
 ###############################################################################
 # program history:
+#   further changes in texk/tetex/ChangeLog.
 #   2007-01-04  patch by JK to support $engine subdir (enabled by default)
 #   Fr Apr  8 19:15:05 CEST 2005 cleanup now has an argument for the return code
 #   Do Mar 02 10:42:31 CET 2006 add tmpdir to TEXFORMATS
@@ -83,7 +84,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 progname=fmtutil
 argv0=$0
-version=1168729197 # seconds since `00:00:00 1970-01-01 UTC'
+version=1205513038 # seconds since `00:00:00 1970-01-01 UTC'
                    # date '+%s' (with GNU date)
 
 cnf=fmtutil.cnf   # name of the config file
@@ -678,6 +679,15 @@ run_initex()
   esac
 
   rm -f $fmtfile
+
+  # Check for infinite recursion before running the iniTeX:
+  case :$mktexfmt_loop: in
+  *:"$format":*)
+    abort "Infinite recursion detected, giving up!" ;;
+  esac
+  mktexfmt_loop=$mktexfmt_loop:$format
+  export mktexfmt_loop
+
   verboseMsg "$progname: running \`$engine -ini  $tcxflag $jobswitch $prgswitch $texargs' ..."
 
   # run in a subshell to get a local effect of TEXPOOL manipulation:
@@ -692,11 +702,11 @@ run_initex()
   else
     fulldestdir="$destdir"
   fi
-  mkdir -p $fulldestdir
+  mkdir -p "$fulldestdir"
   if test -f $fmtfile; then
     grep '^! ' $format.log >/dev/null 2>&1 &&
       log_failure "\`$engine -ini $tcxflag $jobswitch $prgswitch $texargs' possibly failed."
-    rm -f "$fulldestdir/$format.log"
+
     # We don't want user-interaction for the following "mv" commands:
     mv "$format.log" "$fulldestdir/$format.log" </dev/null
     if mv "$fmtfile" "$fulldestdir/$fmtfile" </dev/null; then
diff --git a/Master/bin/hppa-hpux/fmtutil b/Master/bin/hppa-hpux/fmtutil
index 47d3af7247a..8f35dfdec0f 100755
--- a/Master/bin/hppa-hpux/fmtutil
+++ b/Master/bin/hppa-hpux/fmtutil
@@ -29,6 +29,7 @@
 
 ###############################################################################
 # program history:
+#   further changes in texk/tetex/ChangeLog.
 #   2007-01-04  patch by JK to support $engine subdir (enabled by default)
 #   Fr Apr  8 19:15:05 CEST 2005 cleanup now has an argument for the return code
 #   Do Mar 02 10:42:31 CET 2006 add tmpdir to TEXFORMATS
@@ -83,7 +84,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 progname=fmtutil
 argv0=$0
-version=1168729197 # seconds since `00:00:00 1970-01-01 UTC'
+version=1205513038 # seconds since `00:00:00 1970-01-01 UTC'
                    # date '+%s' (with GNU date)
 
 cnf=fmtutil.cnf   # name of the config file
@@ -678,6 +679,15 @@ run_initex()
   esac
 
   rm -f $fmtfile
+
+  # Check for infinite recursion before running the iniTeX:
+  case :$mktexfmt_loop: in
+  *:"$format":*)
+    abort "Infinite recursion detected, giving up!" ;;
+  esac
+  mktexfmt_loop=$mktexfmt_loop:$format
+  export mktexfmt_loop
+
   verboseMsg "$progname: running \`$engine -ini  $tcxflag $jobswitch $prgswitch $texargs' ..."
 
   # run in a subshell to get a local effect of TEXPOOL manipulation:
@@ -692,11 +702,11 @@ run_initex()
   else
     fulldestdir="$destdir"
   fi
-  mkdir -p $fulldestdir
+  mkdir -p "$fulldestdir"
   if test -f $fmtfile; then
     grep '^! ' $format.log >/dev/null 2>&1 &&
       log_failure "\`$engine -ini $tcxflag $jobswitch $prgswitch $texargs' possibly failed."
-    rm -f "$fulldestdir/$format.log"
+
     # We don't want user-interaction for the following "mv" commands:
     mv "$format.log" "$fulldestdir/$format.log" </dev/null
     if mv "$fmtfile" "$fulldestdir/$fmtfile" </dev/null; then
diff --git a/Master/bin/i386-darwin/fmtutil b/Master/bin/i386-darwin/fmtutil
index 47d3af7247a..8f35dfdec0f 100755
--- a/Master/bin/i386-darwin/fmtutil
+++ b/Master/bin/i386-darwin/fmtutil
@@ -29,6 +29,7 @@
 
 ###############################################################################
 # program history:
+#   further changes in texk/tetex/ChangeLog.
 #   2007-01-04  patch by JK to support $engine subdir (enabled by default)
 #   Fr Apr  8 19:15:05 CEST 2005 cleanup now has an argument for the return code
 #   Do Mar 02 10:42:31 CET 2006 add tmpdir to TEXFORMATS
@@ -83,7 +84,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 progname=fmtutil
 argv0=$0
-version=1168729197 # seconds since `00:00:00 1970-01-01 UTC'
+version=1205513038 # seconds since `00:00:00 1970-01-01 UTC'
                    # date '+%s' (with GNU date)
 
 cnf=fmtutil.cnf   # name of the config file
@@ -678,6 +679,15 @@ run_initex()
   esac
 
   rm -f $fmtfile
+
+  # Check for infinite recursion before running the iniTeX:
+  case :$mktexfmt_loop: in
+  *:"$format":*)
+    abort "Infinite recursion detected, giving up!" ;;
+  esac
+  mktexfmt_loop=$mktexfmt_loop:$format
+  export mktexfmt_loop
+
   verboseMsg "$progname: running \`$engine -ini  $tcxflag $jobswitch $prgswitch $texargs' ..."
 
   # run in a subshell to get a local effect of TEXPOOL manipulation:
@@ -692,11 +702,11 @@ run_initex()
   else
     fulldestdir="$destdir"
   fi
-  mkdir -p $fulldestdir
+  mkdir -p "$fulldestdir"
   if test -f $fmtfile; then
     grep '^! ' $format.log >/dev/null 2>&1 &&
       log_failure "\`$engine -ini $tcxflag $jobswitch $prgswitch $texargs' possibly failed."
-    rm -f "$fulldestdir/$format.log"
+
     # We don't want user-interaction for the following "mv" commands:
     mv "$format.log" "$fulldestdir/$format.log" </dev/null
     if mv "$fmtfile" "$fulldestdir/$fmtfile" </dev/null; then
diff --git a/Master/bin/i386-freebsd/fmtutil b/Master/bin/i386-freebsd/fmtutil
index 47d3af7247a..8f35dfdec0f 100755
--- a/Master/bin/i386-freebsd/fmtutil
+++ b/Master/bin/i386-freebsd/fmtutil
@@ -29,6 +29,7 @@
 
 ###############################################################################
 # program history:
+#   further changes in texk/tetex/ChangeLog.
 #   2007-01-04  patch by JK to support $engine subdir (enabled by default)
 #   Fr Apr  8 19:15:05 CEST 2005 cleanup now has an argument for the return code
 #   Do Mar 02 10:42:31 CET 2006 add tmpdir to TEXFORMATS
@@ -83,7 +84,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 progname=fmtutil
 argv0=$0
-version=1168729197 # seconds since `00:00:00 1970-01-01 UTC'
+version=1205513038 # seconds since `00:00:00 1970-01-01 UTC'
                    # date '+%s' (with GNU date)
 
 cnf=fmtutil.cnf   # name of the config file
@@ -678,6 +679,15 @@ run_initex()
   esac
 
   rm -f $fmtfile
+
+  # Check for infinite recursion before running the iniTeX:
+  case :$mktexfmt_loop: in
+  *:"$format":*)
+    abort "Infinite recursion detected, giving up!" ;;
+  esac
+  mktexfmt_loop=$mktexfmt_loop:$format
+  export mktexfmt_loop
+
   verboseMsg "$progname: running \`$engine -ini  $tcxflag $jobswitch $prgswitch $texargs' ..."
 
   # run in a subshell to get a local effect of TEXPOOL manipulation:
@@ -692,11 +702,11 @@ run_initex()
   else
     fulldestdir="$destdir"
   fi
-  mkdir -p $fulldestdir
+  mkdir -p "$fulldestdir"
   if test -f $fmtfile; then
     grep '^! ' $format.log >/dev/null 2>&1 &&
       log_failure "\`$engine -ini $tcxflag $jobswitch $prgswitch $texargs' possibly failed."
-    rm -f "$fulldestdir/$format.log"
+
     # We don't want user-interaction for the following "mv" commands:
     mv "$format.log" "$fulldestdir/$format.log" </dev/null
     if mv "$fmtfile" "$fulldestdir/$fmtfile" </dev/null; then
diff --git a/Master/bin/i386-linux/fmtutil b/Master/bin/i386-linux/fmtutil
index 0cdb4347121..8f35dfdec0f 100755
--- a/Master/bin/i386-linux/fmtutil
+++ b/Master/bin/i386-linux/fmtutil
@@ -702,7 +702,7 @@ run_initex()
   else
     fulldestdir="$destdir"
   fi
-  mkdir -p $fulldestdir
+  mkdir -p "$fulldestdir"
   if test -f $fmtfile; then
     grep '^! ' $format.log >/dev/null 2>&1 &&
       log_failure "\`$engine -ini $tcxflag $jobswitch $prgswitch $texargs' possibly failed."
diff --git a/Master/bin/i386-openbsd/fmtutil b/Master/bin/i386-openbsd/fmtutil
index 47d3af7247a..8f35dfdec0f 100755
--- a/Master/bin/i386-openbsd/fmtutil
+++ b/Master/bin/i386-openbsd/fmtutil
@@ -29,6 +29,7 @@
 
 ###############################################################################
 # program history:
+#   further changes in texk/tetex/ChangeLog.
 #   2007-01-04  patch by JK to support $engine subdir (enabled by default)
 #   Fr Apr  8 19:15:05 CEST 2005 cleanup now has an argument for the return code
 #   Do Mar 02 10:42:31 CET 2006 add tmpdir to TEXFORMATS
@@ -83,7 +84,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 progname=fmtutil
 argv0=$0
-version=1168729197 # seconds since `00:00:00 1970-01-01 UTC'
+version=1205513038 # seconds since `00:00:00 1970-01-01 UTC'
                    # date '+%s' (with GNU date)
 
 cnf=fmtutil.cnf   # name of the config file
@@ -678,6 +679,15 @@ run_initex()
   esac
 
   rm -f $fmtfile
+
+  # Check for infinite recursion before running the iniTeX:
+  case :$mktexfmt_loop: in
+  *:"$format":*)
+    abort "Infinite recursion detected, giving up!" ;;
+  esac
+  mktexfmt_loop=$mktexfmt_loop:$format
+  export mktexfmt_loop
+
   verboseMsg "$progname: running \`$engine -ini  $tcxflag $jobswitch $prgswitch $texargs' ..."
 
   # run in a subshell to get a local effect of TEXPOOL manipulation:
@@ -692,11 +702,11 @@ run_initex()
   else
     fulldestdir="$destdir"
   fi
-  mkdir -p $fulldestdir
+  mkdir -p "$fulldestdir"
   if test -f $fmtfile; then
     grep '^! ' $format.log >/dev/null 2>&1 &&
       log_failure "\`$engine -ini $tcxflag $jobswitch $prgswitch $texargs' possibly failed."
-    rm -f "$fulldestdir/$format.log"
+
     # We don't want user-interaction for the following "mv" commands:
     mv "$format.log" "$fulldestdir/$format.log" </dev/null
     if mv "$fmtfile" "$fulldestdir/$fmtfile" </dev/null; then
diff --git a/Master/bin/i386-solaris/fmtutil b/Master/bin/i386-solaris/fmtutil
index 47d3af7247a..8f35dfdec0f 100755
--- a/Master/bin/i386-solaris/fmtutil
+++ b/Master/bin/i386-solaris/fmtutil
@@ -29,6 +29,7 @@
 
 ###############################################################################
 # program history:
+#   further changes in texk/tetex/ChangeLog.
 #   2007-01-04  patch by JK to support $engine subdir (enabled by default)
 #   Fr Apr  8 19:15:05 CEST 2005 cleanup now has an argument for the return code
 #   Do Mar 02 10:42:31 CET 2006 add tmpdir to TEXFORMATS
@@ -83,7 +84,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 progname=fmtutil
 argv0=$0
-version=1168729197 # seconds since `00:00:00 1970-01-01 UTC'
+version=1205513038 # seconds since `00:00:00 1970-01-01 UTC'
                    # date '+%s' (with GNU date)
 
 cnf=fmtutil.cnf   # name of the config file
@@ -678,6 +679,15 @@ run_initex()
   esac
 
   rm -f $fmtfile
+
+  # Check for infinite recursion before running the iniTeX:
+  case :$mktexfmt_loop: in
+  *:"$format":*)
+    abort "Infinite recursion detected, giving up!" ;;
+  esac
+  mktexfmt_loop=$mktexfmt_loop:$format
+  export mktexfmt_loop
+
   verboseMsg "$progname: running \`$engine -ini  $tcxflag $jobswitch $prgswitch $texargs' ..."
 
   # run in a subshell to get a local effect of TEXPOOL manipulation:
@@ -692,11 +702,11 @@ run_initex()
   else
     fulldestdir="$destdir"
   fi
-  mkdir -p $fulldestdir
+  mkdir -p "$fulldestdir"
   if test -f $fmtfile; then
     grep '^! ' $format.log >/dev/null 2>&1 &&
       log_failure "\`$engine -ini $tcxflag $jobswitch $prgswitch $texargs' possibly failed."
-    rm -f "$fulldestdir/$format.log"
+
     # We don't want user-interaction for the following "mv" commands:
     mv "$format.log" "$fulldestdir/$format.log" </dev/null
     if mv "$fmtfile" "$fulldestdir/$fmtfile" </dev/null; then
diff --git a/Master/bin/mips-irix/fmtutil b/Master/bin/mips-irix/fmtutil
index 47d3af7247a..8f35dfdec0f 100755
--- a/Master/bin/mips-irix/fmtutil
+++ b/Master/bin/mips-irix/fmtutil
@@ -29,6 +29,7 @@
 
 ###############################################################################
 # program history:
+#   further changes in texk/tetex/ChangeLog.
 #   2007-01-04  patch by JK to support $engine subdir (enabled by default)
 #   Fr Apr  8 19:15:05 CEST 2005 cleanup now has an argument for the return code
 #   Do Mar 02 10:42:31 CET 2006 add tmpdir to TEXFORMATS
@@ -83,7 +84,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 progname=fmtutil
 argv0=$0
-version=1168729197 # seconds since `00:00:00 1970-01-01 UTC'
+version=1205513038 # seconds since `00:00:00 1970-01-01 UTC'
                    # date '+%s' (with GNU date)
 
 cnf=fmtutil.cnf   # name of the config file
@@ -678,6 +679,15 @@ run_initex()
   esac
 
   rm -f $fmtfile
+
+  # Check for infinite recursion before running the iniTeX:
+  case :$mktexfmt_loop: in
+  *:"$format":*)
+    abort "Infinite recursion detected, giving up!" ;;
+  esac
+  mktexfmt_loop=$mktexfmt_loop:$format
+  export mktexfmt_loop
+
   verboseMsg "$progname: running \`$engine -ini  $tcxflag $jobswitch $prgswitch $texargs' ..."
 
   # run in a subshell to get a local effect of TEXPOOL manipulation:
@@ -692,11 +702,11 @@ run_initex()
   else
     fulldestdir="$destdir"
   fi
-  mkdir -p $fulldestdir
+  mkdir -p "$fulldestdir"
   if test -f $fmtfile; then
     grep '^! ' $format.log >/dev/null 2>&1 &&
       log_failure "\`$engine -ini $tcxflag $jobswitch $prgswitch $texargs' possibly failed."
-    rm -f "$fulldestdir/$format.log"
+
     # We don't want user-interaction for the following "mv" commands:
     mv "$format.log" "$fulldestdir/$format.log" </dev/null
     if mv "$fmtfile" "$fulldestdir/$fmtfile" </dev/null; then
diff --git a/Master/bin/powerpc-aix/fmtutil b/Master/bin/powerpc-aix/fmtutil
index 47d3af7247a..8f35dfdec0f 100755
--- a/Master/bin/powerpc-aix/fmtutil
+++ b/Master/bin/powerpc-aix/fmtutil
@@ -29,6 +29,7 @@
 
 ###############################################################################
 # program history:
+#   further changes in texk/tetex/ChangeLog.
 #   2007-01-04  patch by JK to support $engine subdir (enabled by default)
 #   Fr Apr  8 19:15:05 CEST 2005 cleanup now has an argument for the return code
 #   Do Mar 02 10:42:31 CET 2006 add tmpdir to TEXFORMATS
@@ -83,7 +84,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 progname=fmtutil
 argv0=$0
-version=1168729197 # seconds since `00:00:00 1970-01-01 UTC'
+version=1205513038 # seconds since `00:00:00 1970-01-01 UTC'
                    # date '+%s' (with GNU date)
 
 cnf=fmtutil.cnf   # name of the config file
@@ -678,6 +679,15 @@ run_initex()
   esac
 
   rm -f $fmtfile
+
+  # Check for infinite recursion before running the iniTeX:
+  case :$mktexfmt_loop: in
+  *:"$format":*)
+    abort "Infinite recursion detected, giving up!" ;;
+  esac
+  mktexfmt_loop=$mktexfmt_loop:$format
+  export mktexfmt_loop
+
   verboseMsg "$progname: running \`$engine -ini  $tcxflag $jobswitch $prgswitch $texargs' ..."
 
   # run in a subshell to get a local effect of TEXPOOL manipulation:
@@ -692,11 +702,11 @@ run_initex()
   else
     fulldestdir="$destdir"
   fi
-  mkdir -p $fulldestdir
+  mkdir -p "$fulldestdir"
   if test -f $fmtfile; then
     grep '^! ' $format.log >/dev/null 2>&1 &&
       log_failure "\`$engine -ini $tcxflag $jobswitch $prgswitch $texargs' possibly failed."
-    rm -f "$fulldestdir/$format.log"
+
     # We don't want user-interaction for the following "mv" commands:
     mv "$format.log" "$fulldestdir/$format.log" </dev/null
     if mv "$fmtfile" "$fulldestdir/$fmtfile" </dev/null; then
diff --git a/Master/bin/powerpc-darwin/fmtutil b/Master/bin/powerpc-darwin/fmtutil
index 47d3af7247a..8f35dfdec0f 100755
--- a/Master/bin/powerpc-darwin/fmtutil
+++ b/Master/bin/powerpc-darwin/fmtutil
@@ -29,6 +29,7 @@
 
 ###############################################################################
 # program history:
+#   further changes in texk/tetex/ChangeLog.
 #   2007-01-04  patch by JK to support $engine subdir (enabled by default)
 #   Fr Apr  8 19:15:05 CEST 2005 cleanup now has an argument for the return code
 #   Do Mar 02 10:42:31 CET 2006 add tmpdir to TEXFORMATS
@@ -83,7 +84,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 progname=fmtutil
 argv0=$0
-version=1168729197 # seconds since `00:00:00 1970-01-01 UTC'
+version=1205513038 # seconds since `00:00:00 1970-01-01 UTC'
                    # date '+%s' (with GNU date)
 
 cnf=fmtutil.cnf   # name of the config file
@@ -678,6 +679,15 @@ run_initex()
   esac
 
   rm -f $fmtfile
+
+  # Check for infinite recursion before running the iniTeX:
+  case :$mktexfmt_loop: in
+  *:"$format":*)
+    abort "Infinite recursion detected, giving up!" ;;
+  esac
+  mktexfmt_loop=$mktexfmt_loop:$format
+  export mktexfmt_loop
+
   verboseMsg "$progname: running \`$engine -ini  $tcxflag $jobswitch $prgswitch $texargs' ..."
 
   # run in a subshell to get a local effect of TEXPOOL manipulation:
@@ -692,11 +702,11 @@ run_initex()
   else
     fulldestdir="$destdir"
   fi
-  mkdir -p $fulldestdir
+  mkdir -p "$fulldestdir"
   if test -f $fmtfile; then
     grep '^! ' $format.log >/dev/null 2>&1 &&
       log_failure "\`$engine -ini $tcxflag $jobswitch $prgswitch $texargs' possibly failed."
-    rm -f "$fulldestdir/$format.log"
+
     # We don't want user-interaction for the following "mv" commands:
     mv "$format.log" "$fulldestdir/$format.log" </dev/null
     if mv "$fmtfile" "$fulldestdir/$fmtfile" </dev/null; then
diff --git a/Master/bin/powerpc-linux/fmtutil b/Master/bin/powerpc-linux/fmtutil
index 47d3af7247a..8f35dfdec0f 100755
--- a/Master/bin/powerpc-linux/fmtutil
+++ b/Master/bin/powerpc-linux/fmtutil
@@ -29,6 +29,7 @@
 
 ###############################################################################
 # program history:
+#   further changes in texk/tetex/ChangeLog.
 #   2007-01-04  patch by JK to support $engine subdir (enabled by default)
 #   Fr Apr  8 19:15:05 CEST 2005 cleanup now has an argument for the return code
 #   Do Mar 02 10:42:31 CET 2006 add tmpdir to TEXFORMATS
@@ -83,7 +84,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 progname=fmtutil
 argv0=$0
-version=1168729197 # seconds since `00:00:00 1970-01-01 UTC'
+version=1205513038 # seconds since `00:00:00 1970-01-01 UTC'
                    # date '+%s' (with GNU date)
 
 cnf=fmtutil.cnf   # name of the config file
@@ -678,6 +679,15 @@ run_initex()
   esac
 
   rm -f $fmtfile
+
+  # Check for infinite recursion before running the iniTeX:
+  case :$mktexfmt_loop: in
+  *:"$format":*)
+    abort "Infinite recursion detected, giving up!" ;;
+  esac
+  mktexfmt_loop=$mktexfmt_loop:$format
+  export mktexfmt_loop
+
   verboseMsg "$progname: running \`$engine -ini  $tcxflag $jobswitch $prgswitch $texargs' ..."
 
   # run in a subshell to get a local effect of TEXPOOL manipulation:
@@ -692,11 +702,11 @@ run_initex()
   else
     fulldestdir="$destdir"
   fi
-  mkdir -p $fulldestdir
+  mkdir -p "$fulldestdir"
   if test -f $fmtfile; then
     grep '^! ' $format.log >/dev/null 2>&1 &&
       log_failure "\`$engine -ini $tcxflag $jobswitch $prgswitch $texargs' possibly failed."
-    rm -f "$fulldestdir/$format.log"
+
     # We don't want user-interaction for the following "mv" commands:
     mv "$format.log" "$fulldestdir/$format.log" </dev/null
     if mv "$fmtfile" "$fulldestdir/$fmtfile" </dev/null; then
diff --git a/Master/bin/sparc-linux/fmtutil b/Master/bin/sparc-linux/fmtutil
index 47d3af7247a..8f35dfdec0f 100755
--- a/Master/bin/sparc-linux/fmtutil
+++ b/Master/bin/sparc-linux/fmtutil
@@ -29,6 +29,7 @@
 
 ###############################################################################
 # program history:
+#   further changes in texk/tetex/ChangeLog.
 #   2007-01-04  patch by JK to support $engine subdir (enabled by default)
 #   Fr Apr  8 19:15:05 CEST 2005 cleanup now has an argument for the return code
 #   Do Mar 02 10:42:31 CET 2006 add tmpdir to TEXFORMATS
@@ -83,7 +84,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 progname=fmtutil
 argv0=$0
-version=1168729197 # seconds since `00:00:00 1970-01-01 UTC'
+version=1205513038 # seconds since `00:00:00 1970-01-01 UTC'
                    # date '+%s' (with GNU date)
 
 cnf=fmtutil.cnf   # name of the config file
@@ -678,6 +679,15 @@ run_initex()
   esac
 
   rm -f $fmtfile
+
+  # Check for infinite recursion before running the iniTeX:
+  case :$mktexfmt_loop: in
+  *:"$format":*)
+    abort "Infinite recursion detected, giving up!" ;;
+  esac
+  mktexfmt_loop=$mktexfmt_loop:$format
+  export mktexfmt_loop
+
   verboseMsg "$progname: running \`$engine -ini  $tcxflag $jobswitch $prgswitch $texargs' ..."
 
   # run in a subshell to get a local effect of TEXPOOL manipulation:
@@ -692,11 +702,11 @@ run_initex()
   else
     fulldestdir="$destdir"
   fi
-  mkdir -p $fulldestdir
+  mkdir -p "$fulldestdir"
   if test -f $fmtfile; then
     grep '^! ' $format.log >/dev/null 2>&1 &&
       log_failure "\`$engine -ini $tcxflag $jobswitch $prgswitch $texargs' possibly failed."
-    rm -f "$fulldestdir/$format.log"
+
     # We don't want user-interaction for the following "mv" commands:
     mv "$format.log" "$fulldestdir/$format.log" </dev/null
     if mv "$fmtfile" "$fulldestdir/$fmtfile" </dev/null; then
diff --git a/Master/bin/sparc-solaris/fmtutil b/Master/bin/sparc-solaris/fmtutil
index 47d3af7247a..8f35dfdec0f 100755
--- a/Master/bin/sparc-solaris/fmtutil
+++ b/Master/bin/sparc-solaris/fmtutil
@@ -29,6 +29,7 @@
 
 ###############################################################################
 # program history:
+#   further changes in texk/tetex/ChangeLog.
 #   2007-01-04  patch by JK to support $engine subdir (enabled by default)
 #   Fr Apr  8 19:15:05 CEST 2005 cleanup now has an argument for the return code
 #   Do Mar 02 10:42:31 CET 2006 add tmpdir to TEXFORMATS
@@ -83,7 +84,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 progname=fmtutil
 argv0=$0
-version=1168729197 # seconds since `00:00:00 1970-01-01 UTC'
+version=1205513038 # seconds since `00:00:00 1970-01-01 UTC'
                    # date '+%s' (with GNU date)
 
 cnf=fmtutil.cnf   # name of the config file
@@ -678,6 +679,15 @@ run_initex()
   esac
 
   rm -f $fmtfile
+
+  # Check for infinite recursion before running the iniTeX:
+  case :$mktexfmt_loop: in
+  *:"$format":*)
+    abort "Infinite recursion detected, giving up!" ;;
+  esac
+  mktexfmt_loop=$mktexfmt_loop:$format
+  export mktexfmt_loop
+
   verboseMsg "$progname: running \`$engine -ini  $tcxflag $jobswitch $prgswitch $texargs' ..."
 
   # run in a subshell to get a local effect of TEXPOOL manipulation:
@@ -692,11 +702,11 @@ run_initex()
   else
     fulldestdir="$destdir"
   fi
-  mkdir -p $fulldestdir
+  mkdir -p "$fulldestdir"
   if test -f $fmtfile; then
     grep '^! ' $format.log >/dev/null 2>&1 &&
       log_failure "\`$engine -ini $tcxflag $jobswitch $prgswitch $texargs' possibly failed."
-    rm -f "$fulldestdir/$format.log"
+
     # We don't want user-interaction for the following "mv" commands:
     mv "$format.log" "$fulldestdir/$format.log" </dev/null
     if mv "$fmtfile" "$fulldestdir/$fmtfile" </dev/null; then
diff --git a/Master/bin/x86_64-linux/fmtutil b/Master/bin/x86_64-linux/fmtutil
index 47d3af7247a..8f35dfdec0f 100755
--- a/Master/bin/x86_64-linux/fmtutil
+++ b/Master/bin/x86_64-linux/fmtutil
@@ -29,6 +29,7 @@
 
 ###############################################################################
 # program history:
+#   further changes in texk/tetex/ChangeLog.
 #   2007-01-04  patch by JK to support $engine subdir (enabled by default)
 #   Fr Apr  8 19:15:05 CEST 2005 cleanup now has an argument for the return code
 #   Do Mar 02 10:42:31 CET 2006 add tmpdir to TEXFORMATS
@@ -83,7 +84,7 @@ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 progname=fmtutil
 argv0=$0
-version=1168729197 # seconds since `00:00:00 1970-01-01 UTC'
+version=1205513038 # seconds since `00:00:00 1970-01-01 UTC'
                    # date '+%s' (with GNU date)
 
 cnf=fmtutil.cnf   # name of the config file
@@ -678,6 +679,15 @@ run_initex()
   esac
 
   rm -f $fmtfile
+
+  # Check for infinite recursion before running the iniTeX:
+  case :$mktexfmt_loop: in
+  *:"$format":*)
+    abort "Infinite recursion detected, giving up!" ;;
+  esac
+  mktexfmt_loop=$mktexfmt_loop:$format
+  export mktexfmt_loop
+
   verboseMsg "$progname: running \`$engine -ini  $tcxflag $jobswitch $prgswitch $texargs' ..."
 
   # run in a subshell to get a local effect of TEXPOOL manipulation:
@@ -692,11 +702,11 @@ run_initex()
   else
     fulldestdir="$destdir"
   fi
-  mkdir -p $fulldestdir
+  mkdir -p "$fulldestdir"
   if test -f $fmtfile; then
     grep '^! ' $format.log >/dev/null 2>&1 &&
       log_failure "\`$engine -ini $tcxflag $jobswitch $prgswitch $texargs' possibly failed."
-    rm -f "$fulldestdir/$format.log"
+
     # We don't want user-interaction for the following "mv" commands:
     mv "$format.log" "$fulldestdir/$format.log" </dev/null
     if mv "$fmtfile" "$fulldestdir/$fmtfile" </dev/null; then