From 1644e8b4a9baf844c5e7d67bbdf864444fd864c9 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 18 Jan 2018 23:11:21 +0000 Subject: printf %s instead of direct string (from Debian) git-svn-id: svn://tug.org/texlive/trunk@46372 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/kpathsea/ChangeLog | 3 ++- Build/source/texk/ps2pk/ChangeLog | 5 +++++ Build/source/texk/ps2pk/objects.h | 2 +- Build/source/texk/web2c/cwebboot.cin | 2 +- Build/source/texk/web2c/cwebdir/ChangeLog | 8 ++++++++ Build/source/texk/web2c/cwebdir/common.c | 2 +- Build/source/texk/web2c/cwebdir/common.w | 2 +- Build/source/texk/web2c/cwebdir/cweave.w | 2 +- Build/source/texk/web2c/omegafonts/ChangeLog | 10 +++++++++- Build/source/texk/web2c/omegafonts/error_routines.c | 10 +++++----- Build/source/texk/web2c/omegafonts/out_routines.c | 4 ++-- Build/source/texk/web2c/tiedir/ChangeLog | 5 +++++ Build/source/texk/web2c/tiedir/tie.w | 6 +++--- 13 files changed, 44 insertions(+), 17 deletions(-) (limited to 'Build/source/texk') diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog index ad1756b462c..7e9e0f08cbe 100644 --- a/Build/source/texk/kpathsea/ChangeLog +++ b/Build/source/texk/kpathsea/ChangeLog @@ -1,6 +1,7 @@ 2018-01-17 Norbert Preining - * mktexlsr (treefile): use mktemp with fallback option for temporary file. + * mktexlsr (treefile): use mktemp with fallback option for + temporary file. 2018-01-16 Karl Berry diff --git a/Build/source/texk/ps2pk/ChangeLog b/Build/source/texk/ps2pk/ChangeLog index b160465e451..043e99bbb20 100644 --- a/Build/source/texk/ps2pk/ChangeLog +++ b/Build/source/texk/ps2pk/ChangeLog @@ -1,3 +1,8 @@ +2018-01-18 Karl Berry + + * objects.h (IfTrace0): printf %s instead of direct string + (from Debian). + 2017-03-27 Karl Berry * Makefile.am (AM_TESTS_ENVIRONMENT): use instead of TESTS_ENVIRONMENT. diff --git a/Build/source/texk/ps2pk/objects.h b/Build/source/texk/ps2pk/objects.h index a5c3633cf21..790bed98651 100644 --- a/Build/source/texk/ps2pk/objects.h +++ b/Build/source/texk/ps2pk/objects.h @@ -231,7 +231,7 @@ struct xobject { /*SHARED*/ /* NDW: personally, I want to see status and error messages! */ #define IfTrace0(condition,model) \ - {if (condition) printf(model);} + {if (condition) printf("%s",model);} #define IfTrace1(condition,model,arg0) \ {if (condition) printf(model,arg0);} #define IfTrace2(condition,model,arg0,arg1) \ diff --git a/Build/source/texk/web2c/cwebboot.cin b/Build/source/texk/web2c/cwebboot.cin index 2e9be01a814..38f65b8ef07 100644 --- a/Build/source/texk/web2c/cwebboot.cin +++ b/Build/source/texk/web2c/cwebboot.cin @@ -1098,7 +1098,7 @@ void fatal(const char*s,const char*t) #line 1182 "cwebdir/common.w" { -if(*s)printf(s); +if(*s)printf("%s",s); err_print(t); history= fatal_message;exit(wrap_up()); } diff --git a/Build/source/texk/web2c/cwebdir/ChangeLog b/Build/source/texk/web2c/cwebdir/ChangeLog index 095ee826201..8e71c02202b 100644 --- a/Build/source/texk/web2c/cwebdir/ChangeLog +++ b/Build/source/texk/web2c/cwebdir/ChangeLog @@ -1,3 +1,11 @@ +2018-01-18 Karl Berry + + * cweave.w, + * common.w, + * common.c, + * ../cwebboot.cin: printf %s instead of direct string (from Debian). + (Also sent to DEK.) + 2017-01-29 Karl Berry * ../cwebboot.cin, diff --git a/Build/source/texk/web2c/cwebdir/common.c b/Build/source/texk/web2c/cwebdir/common.c index 2bf7a9d4a81..25bd81007a2 100644 --- a/Build/source/texk/web2c/cwebdir/common.c +++ b/Build/source/texk/web2c/cwebdir/common.c @@ -1063,7 +1063,7 @@ void fatal(s,t) char*s,*t; { -if(*s)printf(s); +if(*s)printf("%s",s); err_print(t); history= fatal_message;exit(wrap_up()); } diff --git a/Build/source/texk/web2c/cwebdir/common.w b/Build/source/texk/web2c/cwebdir/common.w index d8aacfb7b91..da3df6d3baa 100644 --- a/Build/source/texk/web2c/cwebdir/common.w +++ b/Build/source/texk/web2c/cwebdir/common.w @@ -1180,7 +1180,7 @@ concatenated to print the final error message. fatal(s,t) char *s,*t; { - if (*s) printf(s); + if (*s) printf("%s",s); err_print(t); history=fatal_message; exit(wrap_up()); } diff --git a/Build/source/texk/web2c/cwebdir/cweave.w b/Build/source/texk/web2c/cwebdir/cweave.w index e06762b1fc3..38afa934429 100644 --- a/Build/source/texk/web2c/cwebdir/cweave.w +++ b/Build/source/texk/web2c/cwebdir/cweave.w @@ -1785,7 +1785,7 @@ void print_cat(c) /* symbolic printout of a category */ eight_bits c; { - printf(cat_name[c]); + printf("%s",cat_name[c]); } @ The token lists for translated \TEX/ output contain some special control diff --git a/Build/source/texk/web2c/omegafonts/ChangeLog b/Build/source/texk/web2c/omegafonts/ChangeLog index 22fb82d5379..4eb6a30d066 100644 --- a/Build/source/texk/web2c/omegafonts/ChangeLog +++ b/Build/source/texk/web2c/omegafonts/ChangeLog @@ -1,6 +1,14 @@ +2018-01-18 Karl Berry + + * error_routines.c (yyerror, warning_0, fatal_error_0, + internal_error_0), + * out_routines.c (out): printf %s instead of direct string. + From Debian. + 2016-02-27 Akira Kakuto - * omfonts.c, help.test: Add an option -charcode-format for compatibility. + * omfonts.c, help.test: Add an option -charcode-format for + compatibility. 2015-07-07 Peter Breitenlohner diff --git a/Build/source/texk/web2c/omegafonts/error_routines.c b/Build/source/texk/web2c/omegafonts/error_routines.c index ec7979860bf..b1ac96c4ccb 100644 --- a/Build/source/texk/web2c/omegafonts/error_routines.c +++ b/Build/source/texk/web2c/omegafonts/error_routines.c @@ -3,7 +3,7 @@ This file is part of Omega, which is based on the web2c distribution of TeX, -Copyright (c) 1994--2001 John Plaice and Yannis Haralambous +Copyright 1994--2018 John Plaice and Yannis Haralambous Omega is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -62,7 +62,7 @@ void yyerror(const_string fmt) { fprintf(stderr, "line %d (parsing): ", line_number); - fprintf(stderr, fmt); + fprintf(stderr, "%s", fmt); fprintf(stderr, "\n"); num_errors++; } @@ -72,7 +72,7 @@ void warning_0(const_string fmt) { fprintf(stderr, "line %d (warning): ", line_number); - fprintf(stderr, fmt); + fprintf(stderr, "%s", fmt); fprintf(stderr, "\n"); } @@ -120,7 +120,7 @@ void fatal_error_0(const_string fmt) { fprintf(stderr, "line %d (fatal): ", line_number); - fprintf(stderr, fmt); + fprintf(stderr, "%s", fmt); fprintf(stderr, "\n"); exit(1); } @@ -156,7 +156,7 @@ void internal_error_0(const_string fmt) { fprintf(stderr, "line %d (internal): ", line_number); - fprintf(stderr, fmt); + fprintf(stderr, "%s", fmt); fprintf(stderr, "\n"); exit(2); } diff --git a/Build/source/texk/web2c/omegafonts/out_routines.c b/Build/source/texk/web2c/omegafonts/out_routines.c index 3428cd8e769..186e4d357bf 100644 --- a/Build/source/texk/web2c/omegafonts/out_routines.c +++ b/Build/source/texk/web2c/omegafonts/out_routines.c @@ -3,7 +3,7 @@ This file is part of Omega, which is based on the web2c distribution of TeX, -Copyright (c) 1994--2001 John Plaice and Yannis Haralambous +Copyright 1994--2018 John Plaice and Yannis Haralambous Omega is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -368,5 +368,5 @@ out_digits(unsigned counter) void out(const_string sval) { - fprintf(file_output, sval); + fprintf(file_output, "%s", sval); } diff --git a/Build/source/texk/web2c/tiedir/ChangeLog b/Build/source/texk/web2c/tiedir/ChangeLog index 8bc990c1af7..28d2e6b467f 100644 --- a/Build/source/texk/web2c/tiedir/ChangeLog +++ b/Build/source/texk/web2c/tiedir/ChangeLog @@ -1,3 +1,8 @@ +2018-01-18 Karl Berry + + * tie.w (print, print_ln): printf %s instead of direct string + (from Debian). + 2014-02-12 Peter Breitenlohner * tie-w2c.ch: Handle input lines with CRLF. diff --git a/Build/source/texk/web2c/tiedir/tie.w b/Build/source/texk/web2c/tiedir/tie.w index 227328b729e..e40d487351b 100644 --- a/Build/source/texk/web2c/tiedir/tie.w +++ b/Build/source/texk/web2c/tiedir/tie.w @@ -25,7 +25,7 @@ % 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 +458,14 @@ for terminating an output line and writing strings to the user. @^system dependencies@> @d term_out stdout -@d print(a) fprintf(term_out,a) /* `|print|' means write on the terminal */ +@d print(a) fprintf(term_out,"%s",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,v);term_new_line;} +@d print_ln(v) {fprintf(term_out,"%s",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