From 91f76858bb2e49d2a0e7e8703eee76902079f91e Mon Sep 17 00:00:00 2001 From: Andreas Scherer Date: Thu, 23 Apr 2020 12:16:07 +0000 Subject: [TIE] Push recent changes from tie.w to tie.w2c.ch. git-svn-id: svn://tug.org/texlive/trunk@54845 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/tiedir/ChangeLog | 2 +- Build/source/texk/web2c/tiedir/tie-w2c.ch | 14 +++++++++++++- Build/source/texk/web2c/tiedir/tie.w | 5 ++--- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/Build/source/texk/web2c/tiedir/ChangeLog b/Build/source/texk/web2c/tiedir/ChangeLog index 28d2e6b467f..bac1e04863c 100644 --- a/Build/source/texk/web2c/tiedir/ChangeLog +++ b/Build/source/texk/web2c/tiedir/ChangeLog @@ -1,6 +1,6 @@ 2018-01-18 Karl Berry - * tie.w (print, print_ln): printf %s instead of direct string + * tie-w2c.w (print, print_ln): printf %s instead of direct string (from Debian). 2014-02-12 Peter Breitenlohner diff --git a/Build/source/texk/web2c/tiedir/tie-w2c.ch b/Build/source/texk/web2c/tiedir/tie-w2c.ch index 37d5bd7b21d..0d1c4fbb44f 100644 --- a/Build/source/texk/web2c/tiedir/tie-w2c.ch +++ b/Build/source/texk/web2c/tiedir/tie-w2c.ch @@ -28,6 +28,18 @@ typedef char* string; /* we don't think that anyone needs more than 32 change files, @z +@x +@d print(a) fprintf(term_out,a) /* `|print|' means write on the terminal */ +@y +@d print(a) fprintf(term_out,"%s",a) /* `|print|' means write on the terminal */ +@z + +@x +@d print_ln(v) {fprintf(term_out,v);term_new_line;} +@y +@d print_ln(v) {fprintf(term_out,"%s",v);term_new_line;} +@z + @x -- add to global includes. #include @y @@ -163,4 +175,4 @@ int main (int argc, string *argv) @y default: /* Anything except spotless, troublesome, or fatal is a bug. */ case fatal: msg="That was a fatal error, my friend"; break; -@z \ No newline at end of file +@z diff --git a/Build/source/texk/web2c/tiedir/tie.w b/Build/source/texk/web2c/tiedir/tie.w index e40d487351b..380bfa91041 100644 --- a/Build/source/texk/web2c/tiedir/tie.w +++ b/Build/source/texk/web2c/tiedir/tie.w @@ -25,7 +25,6 @@ % also repaired loop control for end of changes test (92-09-24) % Version 2.4 included instead of when % used with ANSI-C (92-12-17) -% See ChangeLog for further changes. % Here is TeX material that gets inserted after \input cwebmac @@ -458,14 +457,14 @@ for terminating an output line and writing strings to the user. @^system dependencies@> @d term_out stdout -@d print(a) fprintf(term_out,"%s",a) /* `|print|' means write on the terminal */ +@d print(a) fprintf(term_out,a) /* `|print|' means write on the terminal */ @d print2(a,b) fprintf(term_out,a,b) /* same with two arguments */ @d print3(a,b,c) fprintf(term_out,a,b,c) /* same with three arguments */ @d print_c(v) fputc(v,term_out); /* print a single character */ @d new_line(v) fputc('\n',v) /* start new line */ @d term_new_line new_line(term_out) /* start new line of the terminal */ -@d print_ln(v) {fprintf(term_out,"%s",v);term_new_line;} +@d print_ln(v) {fprintf(term_out,v);term_new_line;} /* `|print|' and then start new line */ @d print2_ln(a,b) {print2(a,b);term_new_line;} /* same with two arguments */ @d print3_ln(a,b,c) {print3(a,b,c);term_new_line;} -- cgit v1.2.3