do not log \openout files for original (ini)tex

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

11 files changed, 47 insertions, 23 deletions

diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index 364bb21abc6..62726b7aff0 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,5 +1,9 @@
 2019-08-09  Karl Berry  <karl@freefriends.org>
 
+	* texmf.cnf (log_openout): new configuration variable, true
+	by default for all but tex and initex, to remove one technical
+	trip incompatibility. Report from David Fuchs.
+
 	* cnf.c,
 	* progname.h,
 	* tex-file.c,
diff --git a/Build/source/texk/kpathsea/texmf.cnf b/Build/source/texk/kpathsea/texmf.cnf
index 6d858529b69..76f92254edb 100644
--- a/Build/source/texk/kpathsea/texmf.cnf
+++ b/Build/source/texk/kpathsea/texmf.cnf
@@ -695,6 +695,12 @@ parse_first_line = t
 parse_first_line.tex = f
 parse_first_line.initex = f
 
+% Normally we mention files created by \openout in the log file,
+% but again, trip-compatibility forbids this for (ini)tex.
+log_openout = t
+log_openout.tex = f
+log_openout.initex = f
+
 % Control file:line:error style messages.
 file_line_error_style = f
 
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index f2a59c147ef..09a97d0c381 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,12 @@
+2019-08-09  Karl Berry  <karl@freefriends.org>
+
+	* tex.ch (53.1374): only log \openout files if the log_openout
+	config value is true. Report from David Fuchs.
+	* cpascal.h (texmfyes): #define texmf_yesno, for web visibility.
+	* triptest.test: no need to remove \openout lines since they are
+	no longer written.
+	* triptrap/trip.diffs: update.
+
 2019-08-06  Karl Berry  <karl@freefriends.org>
 
 	* texmfmp-help.h (ALEPHHELP, EPTEXHELP, ETEXHELP, EUPTEXHELP,
diff --git a/Build/source/texk/web2c/cpascal.h b/Build/source/texk/web2c/cpascal.h
index 60374d8ec01..ccebfc5f901 100644
--- a/Build/source/texk/web2c/cpascal.h
+++ b/Build/source/texk/web2c/cpascal.h
@@ -285,6 +285,7 @@ typedef const unsigned char *const_w2custring;
 #define kpsesrccompile	kpse_src_compile
 #define recorderchangefilename	recorder_change_filename
 #define recorderenabled	recorder_enabled
+#define texmfyesno      texmf_yesno
 
 /* We need a new type for the argument parsing, too.  */
 typedef struct option getoptstruct;
diff --git a/Build/source/texk/web2c/lib/ChangeLog b/Build/source/texk/web2c/lib/ChangeLog
index 521081517f6..e2c07edff47 100644
--- a/Build/source/texk/web2c/lib/ChangeLog
+++ b/Build/source/texk/web2c/lib/ChangeLog
@@ -1,5 +1,8 @@
 2019-08-09  Karl Berry  <karl@freefriends.org>
 
+	* texmfmp.c (texmf_yesno): no longer static, since we call it
+	from tex.ch.
+
 	* texmfmp.c: doc fixes; most "fixme"s were nothing that we ever
 	need to fix at this late date.
 
diff --git a/Build/source/texk/web2c/lib/texmfmp.c b/Build/source/texk/web2c/lib/texmfmp.c
index 7a281d24760..6f704ab7ca1 100644
--- a/Build/source/texk/web2c/lib/texmfmp.c
+++ b/Build/source/texk/web2c/lib/texmfmp.c
@@ -709,8 +709,10 @@ static void parse_options (int, string *);
 /* Try to figure out if we have been given a filename. */
 static string get_input_file_name (void);
 
-/* Get a true/false value for a variable from texmf.cnf and the environment. */
-static boolean
+/* Get a true/false value for a variable from texmf.cnf and the
+   environment.  Not static because we call it from tex.ch.  */
+
+boolean
 texmf_yesno(const_string var)
 {
   string value = kpse_var_value (var);
diff --git a/Build/source/texk/web2c/tex.ch b/Build/source/texk/web2c/tex.ch
index d02d6e62b29..6c4fadf8357 100644
--- a/Build/source/texk/web2c/tex.ch
+++ b/Build/source/texk/web2c/tex.ch
@@ -4391,7 +4391,7 @@ var j:small_number; {write stream number}
         prompt_file_name("output file name",".tex");
       write_open[j]:=true;
       {If on first line of input, log file is not ready yet, so don't log.}
-      if log_opened then begin
+      if log_opened and texmf_yesno('log_openout') then begin
         old_setting:=selector;
         if (tracing_online<=0) then
           selector:=log_only  {Show what we're doing in the log file.}
diff --git a/Build/source/texk/web2c/triptest.test b/Build/source/texk/web2c/triptest.test
index f14003495ff..c0c3165be2f 100755
--- a/Build/source/texk/web2c/triptest.test
+++ b/Build/source/texk/web2c/triptest.test
@@ -20,7 +20,6 @@ mkdir a b
 cat >filter <<-\_EOF
 	s,^\*\*(\./trip\.tex ##,** \&trip  trip \
 	(trip.tex ##,
-	/^\\openout.*/,/^$/d
 	s/ (TeX Live 20[^)]*)//
 	s/(preloaded format=tex)/(INITEX)/
 	s/format=trip [^)][^)]*)/format=trip)/
diff --git a/Build/source/texk/web2c/triptrap/trip.diffs b/Build/source/texk/web2c/triptrap/trip.diffs
index e5b0d45dd36..639ff619a6c 100644
--- a/Build/source/texk/web2c/triptrap/trip.diffs
+++ b/Build/source/texk/web2c/triptrap/trip.diffs
@@ -44,62 +44,57 @@
 < (trip.tex ##
 ---
 > (./trip.tex ##
-58a59,62
-> \openout0 = `8terminal.tex'.
-> 
-> \openout10 = `tripos.tex'.
-> 
-1405c1409
+1405c1405
 < \vbox(16383.99998+0.0)x1000.0, glue set 16342.0fil
 ---
 > \vbox(16383.99998+0.0)x1000.0, glue set 16341.99998fil
-1954c1958
+1954c1954
 < (tripos.tex
 ---
 > (./tripos.tex
-2018c2022
+2018c2018
 < \vbox(16383.99998+1.0)x100.0, glue set 16239.0fil
 ---
 > \vbox(16383.99998+1.0)x100.0, glue set 16238.99998fil
-2533c2537
+2533c2533
 < \vbox(16383.99998+0.0)x20.0, glue set 16331.0fil
 ---
 > \vbox(16383.99998+0.0)x20.0, glue set 16330.99998fil
-3326c3330
+3326c3326
 < \vbox(10000.0+2.0)x28.0, glue set 9737.58789fil
 ---
 > \vbox(10000.0+2.0)x28.0, glue set 9737.58742fil
-3864c3868
+3864c3864
 < \vbox(16383.99998+2.0)x100.0, glue set 16318.0fil
 ---
 > \vbox(16383.99998+2.0)x100.0, glue set 16317.99997fil
-4034c4038
+4034c4034
 < \vbox(16383.99998+0.0)x8236.0, glue set 16344.0fil
 ---
 > \vbox(16383.99998+0.0)x8236.0, glue set 16343.99998fil
-4420c4424
+4420c4420
 < \vbox(16383.99998+0.0)x100.0, glue set 16332.0fil
 ---
 > \vbox(16383.99998+0.0)x100.0, glue set 16331.99998fil
-4742c4746
+4742c4742
 < \vbox(16383.99998+0.0)x205.12613, glue set 16344.0fil
 ---
 > \vbox(16383.99998+0.0)x205.12613, glue set 16343.99998fil
-6380c6384
+6380c6380
 < (tripos.tex
 ---
 > (./tripos.tex
-7296,7297c7300,7301
+7296,7297c7296,7297
 <  47 strings out of 1674
 <  253 string characters out of 8354
 ---
 >  44 strings out of 1629
->  261 string characters out of 15394
-7299c7303
+>  261 string characters out of 15395
+7299c7299
 <  372 multiletter control sequences out of 2100
 ---
 >  372 multiletter control sequences out of 15000+0
-7301c7305
+7301c7301
 <  2 hyphenation exceptions out of 307
 ---
 >  1 hyphenation exception out of 659
diff --git a/Build/source/texk/web2c/web2c/ChangeLog b/Build/source/texk/web2c/web2c/ChangeLog
index 897e0b51804..35e35a8e3cf 100644
--- a/Build/source/texk/web2c/web2c/ChangeLog
+++ b/Build/source/texk/web2c/web2c/ChangeLog
@@ -1,3 +1,7 @@
+2019-08-09  Karl Berry  <karl@freefriends.org>
+
+	* web2c.defines (texmfyes): new function.
+
 2018-11-11  Andreas Scherer  <https://ascherer.github.io>
 
 	* fixwrites.c (main): check return value from fgets.
diff --git a/Build/source/texk/web2c/web2c/texmf.defines b/Build/source/texk/web2c/web2c/texmf.defines
index 4a624aced2a..d00b9113c36 100644
--- a/Build/source/texk/web2c/web2c/texmf.defines
+++ b/Build/source/texk/web2c/web2c/texmf.defines
@@ -33,6 +33,7 @@
 @define function roundfraction ();
 @define function roundunscaled ();
 @define function runsystem ();
+@define function texmfyesno ();
 @define function wopenin ();
 @define function wopenout ();