texlive[51510] Build/source/texk/web2c: lib/texmfmp.c: fix for
commits+hironobu at tug.org
commits+hironobu at tug.org
Sun Jun 30 15:42:49 CEST 2019
Revision: 51510
http://tug.org/svn/texlive?view=revision&revision=51510
Author: hironobu
Date: 2019-06-30 15:42:49 +0200 (Sun, 30 Jun 2019)
Log Message:
-----------
lib/texmfmp.c: fix for \filedump of XeTeX
Modified Paths:
--------------
trunk/Build/source/texk/web2c/Makefile.in
trunk/Build/source/texk/web2c/lib/ChangeLog
trunk/Build/source/texk/web2c/lib/texmfmp.c
trunk/Build/source/texk/web2c/xetexdir/ChangeLog
trunk/Build/source/texk/web2c/xetexdir/am/xetex.am
Added Paths:
-----------
trunk/Build/source/texk/web2c/xetexdir/tests/filedump.log
trunk/Build/source/texk/web2c/xetexdir/tests/filedump.tex
trunk/Build/source/texk/web2c/xetexdir/xetex-filedump.test
Modified: trunk/Build/source/texk/web2c/Makefile.in
===================================================================
--- trunk/Build/source/texk/web2c/Makefile.in 2019-06-29 23:53:35 UTC (rev 51509)
+++ trunk/Build/source/texk/web2c/Makefile.in 2019-06-30 13:42:49 UTC (rev 51510)
@@ -3101,56 +3101,58 @@
xetexdir/COPYING xetexdir/NEWS xetexdir/image/README \
xetexdir/unicode-char-prep.pl xetexdir/xewebmac.tex \
$(xetex_tests) xetexdir/tests/bug73.log \
- xetexdir/tests/bug73.tex omegaware/README omegaware/ChangeLog \
- $(odvicopy_sources) $(odvitype_sources) omegaware/ofm2opl.web \
- omegaware/ofm2opl.up omegaware/ofm2opl.ch \
- omegaware/opl2ofm.web omegaware/opl2ofm.up \
- omegaware/opl2ofm.ch $(otangle_sources) omegaware/ovf2ovp.web \
- omegaware/ovf2ovp.up omegaware/ovf2ovp.ch \
- omegaware/ovp2ovf.web omegaware/ovp2ovf.up \
- omegaware/ovp2ovf.ch $(OTANGLE_tests) $(OMFONTS_tests) \
- omegaware/tests/badofm.ofm omegaware/tests/badopl.opl \
- omegaware/tests/badovf.ofm omegaware/tests/badovf.ovf \
- omegaware/tests/badovp.ovp omegaware/tests/charwd-r.pl \
- omegaware/tests/charwd-v.vpl omegaware/tests/check.ofm \
- omegaware/tests/check.opl omegaware/tests/checked.opl \
- omegaware/tests/level1.opl omegaware/tests/ligall.opl \
- omegaware/tests/ligbch.opl omegaware/tests/ligbdy.opl \
- omegaware/tests/ligblb.opl omegaware/tests/ligblv.opl \
- omegaware/tests/ligblv.ovp omegaware/tests/ligloop1.ofm \
- omegaware/tests/ligloop1.opl omegaware/tests/ligloop2.opl \
- omegaware/tests/liguse.opl omegaware/tests/liguse1.opl \
- omegaware/tests/liguse2.opl omegaware/tests/ofontd1.dvi \
- omegaware/tests/ofontd1.typ omegaware/tests/ofontd2.dvi \
- omegaware/tests/ofontd2.typ omegaware/tests/ofontd3.dvi \
- omegaware/tests/ofontd3.typ omegaware/tests/ofontr1.vf \
- omegaware/tests/ofontr2.ovf omegaware/tests/ofontr3.ovf \
- omegaware/tests/ofontv4.vf omegaware/tests/ofontv5.ovf \
- omegaware/tests/ofontv6.ovf omegaware/tests/ofontd0.dtl \
- omegaware/tests/ofontd0.dvi omegaware/tests/ofontd0.typ \
- omegaware/tests/ofontr0.tfm omegaware/tests/ofontr1.tfm \
- omegaware/tests/ofontr2.ofm omegaware/tests/ofontr3.ofm \
- omegaware/tests/ofontv4.tfm omegaware/tests/ofontv5.ofm \
- omegaware/tests/ofontv6.ofm omegaware/tests/ofontr0.pl \
- omegaware/tests/ofontr1.pl omegaware/tests/ofontr1.vpl \
- omegaware/tests/ofontr2.opl omegaware/tests/ofontr2.ovp \
- omegaware/tests/ofontr3.opl omegaware/tests/ofontr3.ovp \
- omegaware/tests/ofontv4.pl omegaware/tests/ofontv4.vpl \
- omegaware/tests/ofontv5.opl omegaware/tests/ofontv5.ovp \
- omegaware/tests/ofontv6.opl omegaware/tests/ofontv6.ovp \
- omegaware/tests/Cherokee.pl omegaware/tests/OCherokee.ovp \
- omegaware/tests/inbmp.opl omegaware/tests/overbmp.opl \
- omegaware/tests/overbmp.ovp omegaware/tests/realnum.opl \
- omegaware/tests/realnum.out omegaware/tests/repeat.opl \
- omegaware/tests/repeated.opl omegaware/tests/sample.out \
- omegaware/tests/sample.ovp omegaware/tests/sample0-h.opl \
- omegaware/tests/shorten.opl omegaware/tests/specialhex.ovp \
- omegaware/tests/vrepeat0.ofm omegaware/tests/vrepeat0.opl \
- omegaware/tests/vrepeat1.ofm omegaware/tests/vrepeat1.opl \
- omegaware/tests/vrepeat1.ovf omegaware/tests/vrepeat1.ovp \
- omegaware/tests/arabicr.pl omegaware/tests/arabic.ovp \
- $(aleph_web_srcs) $(aleph_ch_srcs) alephdir/ChangeLog \
- alephdir/aleph.defines alephdir/aleph.version $(aleph_tests) \
+ xetexdir/tests/bug73.tex xetexdir/tests/filedump.log \
+ xetexdir/tests/filedump.tex omegaware/README \
+ omegaware/ChangeLog $(odvicopy_sources) $(odvitype_sources) \
+ omegaware/ofm2opl.web omegaware/ofm2opl.up \
+ omegaware/ofm2opl.ch omegaware/opl2ofm.web \
+ omegaware/opl2ofm.up omegaware/opl2ofm.ch $(otangle_sources) \
+ omegaware/ovf2ovp.web omegaware/ovf2ovp.up \
+ omegaware/ovf2ovp.ch omegaware/ovp2ovf.web \
+ omegaware/ovp2ovf.up omegaware/ovp2ovf.ch $(OTANGLE_tests) \
+ $(OMFONTS_tests) omegaware/tests/badofm.ofm \
+ omegaware/tests/badopl.opl omegaware/tests/badovf.ofm \
+ omegaware/tests/badovf.ovf omegaware/tests/badovp.ovp \
+ omegaware/tests/charwd-r.pl omegaware/tests/charwd-v.vpl \
+ omegaware/tests/check.ofm omegaware/tests/check.opl \
+ omegaware/tests/checked.opl omegaware/tests/level1.opl \
+ omegaware/tests/ligall.opl omegaware/tests/ligbch.opl \
+ omegaware/tests/ligbdy.opl omegaware/tests/ligblb.opl \
+ omegaware/tests/ligblv.opl omegaware/tests/ligblv.ovp \
+ omegaware/tests/ligloop1.ofm omegaware/tests/ligloop1.opl \
+ omegaware/tests/ligloop2.opl omegaware/tests/liguse.opl \
+ omegaware/tests/liguse1.opl omegaware/tests/liguse2.opl \
+ omegaware/tests/ofontd1.dvi omegaware/tests/ofontd1.typ \
+ omegaware/tests/ofontd2.dvi omegaware/tests/ofontd2.typ \
+ omegaware/tests/ofontd3.dvi omegaware/tests/ofontd3.typ \
+ omegaware/tests/ofontr1.vf omegaware/tests/ofontr2.ovf \
+ omegaware/tests/ofontr3.ovf omegaware/tests/ofontv4.vf \
+ omegaware/tests/ofontv5.ovf omegaware/tests/ofontv6.ovf \
+ omegaware/tests/ofontd0.dtl omegaware/tests/ofontd0.dvi \
+ omegaware/tests/ofontd0.typ omegaware/tests/ofontr0.tfm \
+ omegaware/tests/ofontr1.tfm omegaware/tests/ofontr2.ofm \
+ omegaware/tests/ofontr3.ofm omegaware/tests/ofontv4.tfm \
+ omegaware/tests/ofontv5.ofm omegaware/tests/ofontv6.ofm \
+ omegaware/tests/ofontr0.pl omegaware/tests/ofontr1.pl \
+ omegaware/tests/ofontr1.vpl omegaware/tests/ofontr2.opl \
+ omegaware/tests/ofontr2.ovp omegaware/tests/ofontr3.opl \
+ omegaware/tests/ofontr3.ovp omegaware/tests/ofontv4.pl \
+ omegaware/tests/ofontv4.vpl omegaware/tests/ofontv5.opl \
+ omegaware/tests/ofontv5.ovp omegaware/tests/ofontv6.opl \
+ omegaware/tests/ofontv6.ovp omegaware/tests/Cherokee.pl \
+ omegaware/tests/OCherokee.ovp omegaware/tests/inbmp.opl \
+ omegaware/tests/overbmp.opl omegaware/tests/overbmp.ovp \
+ omegaware/tests/realnum.opl omegaware/tests/realnum.out \
+ omegaware/tests/repeat.opl omegaware/tests/repeated.opl \
+ omegaware/tests/sample.out omegaware/tests/sample.ovp \
+ omegaware/tests/sample0-h.opl omegaware/tests/shorten.opl \
+ omegaware/tests/specialhex.ovp omegaware/tests/vrepeat0.ofm \
+ omegaware/tests/vrepeat0.opl omegaware/tests/vrepeat1.ofm \
+ omegaware/tests/vrepeat1.opl omegaware/tests/vrepeat1.ovf \
+ omegaware/tests/vrepeat1.ovp omegaware/tests/arabicr.pl \
+ omegaware/tests/arabic.ovp $(aleph_web_srcs) $(aleph_ch_srcs) \
+ alephdir/ChangeLog alephdir/aleph.defines \
+ alephdir/aleph.version $(aleph_tests) \
synctexdir/synctex_parser_c-auto.h synctexdir/ChangeLog \
synctexdir/README.txt synctexdir/synctex_parser_readme.txt \
synctexdir/synctex_parser_version.txt synctexdir/tests \
@@ -3229,7 +3231,8 @@
test-15.xref $(nodist_libluatex_sources) luaimage.* \
luajitimage.* $(nodist_xetex_SOURCES) xetex.web xetex.ch \
xetex-web2c xetex.p xetex.pool xetex-tangle bug73.fmt \
- bug73.log bug73.out bug73.tex $(omegaware_programs:=.c) \
+ bug73.log bug73.out bug73.tex filedump.log filedump.out \
+ filedump.tex $(omegaware_programs:=.c) \
$(omegaware_programs:=.h) $(omegaware_programs:=.p) \
$(omegaware_programs:=-web2c) ofm2opl.web opl2ofm.web \
ovf2ovp.web ovp2ovf.web omegaware/bad*.* \
@@ -4738,6 +4741,7 @@
# XeTeX Tests
#
xetex_tests = \
+ xetexdir/xetex-filedump.test \
xetexdir/xetex-bug73.test \
xetexdir/xetex.test
@@ -18776,7 +18780,7 @@
xetex.ch: tie$(EXEEXT) $(xetex_ch_srcs)
$(tie_c) $(xetex_ch_srcs)
$(libxetex_a_OBJECTS): $(libxetex_prereq)
-xetexdir/xetex-bug73.log xetexdir/xetex.log: xetex$(EXEEXT)
+xetexdir/xetex-filedump.log xetexdir/xetex-bug73.log xetexdir/xetex.log: xetex$(EXEEXT)
odvicopy.c odvicopy.h: odvicopy-web2c
@$(web2c) odvicopy
odvicopy-web2c: odvicopy.p $(web2c_depend)
Modified: trunk/Build/source/texk/web2c/lib/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/lib/ChangeLog 2019-06-29 23:53:35 UTC (rev 51509)
+++ trunk/Build/source/texk/web2c/lib/ChangeLog 2019-06-30 13:42:49 UTC (rev 51510)
@@ -1,3 +1,10 @@
+2019-06-30 Hironori Kitagawa <h_kitagawa2001 at yahoo.co.jp>
+
+ * texmfmp.c (getfiledump): Change readbuffer to unsigned char*.
+ Without this change, xetexdir/tests/filedump.tex ends up with
+ "!error: snprintf failed: file ../../../texk/web2c/lib/texmfmp.c"
+ (XeTeX only).
+
2019-05-14 Akira Kakuto <kakuto at w32tex.org>
* texmfmp.c: Support non-ascii file names in special cases
Modified: trunk/Build/source/texk/web2c/lib/texmfmp.c
===================================================================
--- trunk/Build/source/texk/web2c/lib/texmfmp.c 2019-06-29 23:53:35 UTC (rev 51509)
+++ trunk/Build/source/texk/web2c/lib/texmfmp.c 2019-06-30 13:42:49 UTC (rev 51510)
@@ -3324,7 +3324,8 @@
FILE *f;
int read, i;
#if defined(XeTeX)
- char *readbuffer, strbuf[3];
+ unsigned char *readbuffer;
+ char strbuf[3];
int j, k;
#else
poolpointer data_ptr;
@@ -3364,7 +3365,7 @@
return;
}
#if defined(XeTeX)
- readbuffer = (char *)xmalloc (length + 1);
+ readbuffer = (unsigned char *)xmalloc (length + 1);
read = fread(readbuffer, sizeof(char), length, f);
fclose(f);
for (j = 0; j < read; j++) {
Modified: trunk/Build/source/texk/web2c/xetexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/xetexdir/ChangeLog 2019-06-29 23:53:35 UTC (rev 51509)
+++ trunk/Build/source/texk/web2c/xetexdir/ChangeLog 2019-06-30 13:42:49 UTC (rev 51510)
@@ -1,3 +1,8 @@
+2019-06-30 Hironori Kitagawa <h_kitagawa2001 at yahoo.co.jp>
+
+ * xetex-filedump.test, filedump.tex, filedump.log: New tests.
+ * am/xetex.am: Adjusted for new test.
+
2019-05-30 Khaled Hosny <dr.khaled.hosny at gmail.com>
* XeTeXLayoutInterface.cpp: Do not use hb-icu if HarfBuzz
Modified: trunk/Build/source/texk/web2c/xetexdir/am/xetex.am
===================================================================
--- trunk/Build/source/texk/web2c/xetexdir/am/xetex.am 2019-06-29 23:53:35 UTC (rev 51509)
+++ trunk/Build/source/texk/web2c/xetexdir/am/xetex.am 2019-06-30 13:42:49 UTC (rev 51510)
@@ -200,9 +200,10 @@
# XeTeX Tests
#
xetex_tests = \
+ xetexdir/xetex-filedump.test \
xetexdir/xetex-bug73.test \
xetexdir/xetex.test
-xetexdir/xetex-bug73.log xetexdir/xetex.log: xetex$(EXEEXT)
+xetexdir/xetex-filedump.log xetexdir/xetex-bug73.log xetexdir/xetex.log: xetex$(EXEEXT)
EXTRA_DIST += $(xetex_tests)
@@ -213,3 +214,7 @@
## xetex-bug73.test
EXTRA_DIST += xetexdir/tests/bug73.log xetexdir/tests/bug73.tex
DISTCLEANFILES += bug73.fmt bug73.log bug73.out bug73.tex
+
+## xetex-filedump.test
+EXTRA_DIST += xetexdir/tests/filedump.log xetexdir/tests/filedump.tex
+DISTCLEANFILES += filedump.log filedump.out filedump.tex
Added: trunk/Build/source/texk/web2c/xetexdir/tests/filedump.log
===================================================================
--- trunk/Build/source/texk/web2c/xetexdir/tests/filedump.log (rev 0)
+++ trunk/Build/source/texk/web2c/xetexdir/tests/filedump.log 2019-06-30 13:42:49 UTC (rev 51510)
@@ -0,0 +1,5 @@
+ restricted \write18 enabled.
+ %&-line parsing enabled.
+**filedump
+(./filedump.tex 25C2AA0A5C636174636F6465605C7B3D310A5C63 )
+No pages of output.
Property changes on: trunk/Build/source/texk/web2c/xetexdir/tests/filedump.log
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Build/source/texk/web2c/xetexdir/tests/filedump.tex
===================================================================
--- trunk/Build/source/texk/web2c/xetexdir/tests/filedump.tex (rev 0)
+++ trunk/Build/source/texk/web2c/xetexdir/tests/filedump.tex 2019-06-30 13:42:49 UTC (rev 51510)
@@ -0,0 +1,5 @@
+%ª
+\catcode`\{=1
+\catcode`\}=2
+\message{\filedump length 20{\jobname.tex}}
+\end
Property changes on: trunk/Build/source/texk/web2c/xetexdir/tests/filedump.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Build/source/texk/web2c/xetexdir/xetex-filedump.test
===================================================================
--- trunk/Build/source/texk/web2c/xetexdir/xetex-filedump.test (rev 0)
+++ trunk/Build/source/texk/web2c/xetexdir/xetex-filedump.test 2019-06-30 13:42:49 UTC (rev 51510)
@@ -0,0 +1,22 @@
+#! /bin/sh -vx
+# Copyright 2019 Karl Berry <tex-live at tug.org>
+# You may freely use, modify and/or distribute this file.
+
+LC_ALL=C; export LC_ALL; LANGUAGE=C; export LANGUAGE
+
+TEXMFCNF=$srcdir/../kpathsea;export TEXMFCNF
+TEXINPUTS=.:$srcdir/tests; export TEXINPUTS
+TEXFORMATS=.; export TEXFORMATS
+
+# get same filename in log
+rm -f filedump.tex
+$LN_S $srcdir/xetexdir/tests/filedump.tex .
+
+#exit 77
+
+./xetex -ini filedump || exit 1
+
+sed 1d filedump.log >filedump.out
+
+diff $srcdir/xetexdir/tests/filedump.log filedump.out || exit 1
+
Property changes on: trunk/Build/source/texk/web2c/xetexdir/xetex-filedump.test
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
More information about the tex-live-commits
mailing list