texlive[50646] Build/source/texk/web2c/lib: Improve to record

[commits+kakuto at tug.org]

Revision: 50646
          http://tug.org/svn/texlive?view=revision&revision=50646
Author:   kakuto
Date:     2019-03-29 23:34:10 +0100 (Fri, 29 Mar 2019)
Log Message:
-----------
Improve to record texmf.cnf. (ptex and friends, and w32 only).

Modified Paths:
--------------
    trunk/Build/source/texk/web2c/lib/ChangeLog
    trunk/Build/source/texk/web2c/lib/openclose.c
    trunk/Build/source/texk/web2c/lib/texmfmp.c

Modified: trunk/Build/source/texk/web2c/lib/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/lib/ChangeLog	2019-03-29 22:13:05 UTC (rev 50645)
+++ trunk/Build/source/texk/web2c/lib/ChangeLog	2019-03-29 22:34:10 UTC (rev 50646)
@@ -1,3 +1,10 @@
+2019-03-30  Akira Kakuto  <kakuto at w32tex.org>
+
+	* texmfmp.c: Improve to record texmf.cnf. (ptex and friends,
+	and w32 only).
+	* openclose.c: Remove "static" in order to use relevant
+	functions externally. (w32 only).
+
 2019-03-23  Akira Kakuto  <kakuto at w32tex.org>
 
 	* texmfmp.c: On windows, xetex and pdftex did not record

Modified: trunk/Build/source/texk/web2c/lib/openclose.c
===================================================================
--- trunk/Build/source/texk/web2c/lib/openclose.c	2019-03-29 22:13:05 UTC (rev 50645)
+++ trunk/Build/source/texk/web2c/lib/openclose.c	2019-03-29 22:34:10 UTC (rev 50646)
@@ -43,7 +43,7 @@
   return ret;
 }
 
-static FILE *f_fsyscp_fopen(const char *filename, const char *mode)
+FILE *f_fsyscp_fopen(const char *filename, const char *mode)
 {
   if(!file_system_codepage)
     return fopen(filename, mode);
@@ -51,7 +51,7 @@
   return fsyscp_fopen(filename, mode);
 }
 
-static FILE *f_fsyscp_xfopen(const char *filename, const char *mode)
+FILE *f_fsyscp_xfopen(const char *filename, const char *mode)
 {
   if(!file_system_codepage)
     return xfopen(filename, mode);

Modified: trunk/Build/source/texk/web2c/lib/texmfmp.c
===================================================================
--- trunk/Build/source/texk/web2c/lib/texmfmp.c	2019-03-29 22:13:05 UTC (rev 50645)
+++ trunk/Build/source/texk/web2c/lib/texmfmp.c	2019-03-29 22:34:10 UTC (rev 50646)
@@ -744,9 +744,16 @@
      after the start of kpathsea due to special initializations.
      Therefore we record texmf.cnf here. */
   if (recorder_enabled) {
-    string p = kpse_find_file ("texmf.cnf", kpse_cnf_format, 0);
-    if (p)
-      recorder_record_input (p);
+    string *p = kpse_find_file_generic ("texmf.cnf", kpse_cnf_format, 0, 1);
+    if (p && *p) {
+      string *pp = p;
+      while (*p) {
+        recorder_record_input (*p);
+        free (*p);
+        p++;
+      }
+      free (pp);
+    }
   }
 #endif /* IS_pTeX || (...) */