texlive[46372] Build/source: printf %s instead of direct string (from

commits+karl at tug.org commits+karl at tug.org
Fri Jan 19 00:11:21 CET 2018


Revision: 46372
          http://tug.org/svn/texlive?view=revision&revision=46372
Author:   karl
Date:     2018-01-19 00:11:21 +0100 (Fri, 19 Jan 2018)
Log Message:
-----------
printf %s instead of direct string (from Debian)

Modified Paths:
--------------
    trunk/Build/source/texk/kpathsea/ChangeLog
    trunk/Build/source/texk/ps2pk/ChangeLog
    trunk/Build/source/texk/ps2pk/objects.h
    trunk/Build/source/texk/web2c/cwebboot.cin
    trunk/Build/source/texk/web2c/cwebdir/ChangeLog
    trunk/Build/source/texk/web2c/cwebdir/common.c
    trunk/Build/source/texk/web2c/cwebdir/common.w
    trunk/Build/source/texk/web2c/cwebdir/cweave.w
    trunk/Build/source/texk/web2c/omegafonts/ChangeLog
    trunk/Build/source/texk/web2c/omegafonts/error_routines.c
    trunk/Build/source/texk/web2c/omegafonts/out_routines.c
    trunk/Build/source/texk/web2c/tiedir/ChangeLog
    trunk/Build/source/texk/web2c/tiedir/tie.w
    trunk/Build/source/utils/devnag/ChangeLog
    trunk/Build/source/utils/devnag/src/devnag.c

Modified: trunk/Build/source/texk/kpathsea/ChangeLog
===================================================================
--- trunk/Build/source/texk/kpathsea/ChangeLog	2018-01-18 23:09:04 UTC (rev 46371)
+++ trunk/Build/source/texk/kpathsea/ChangeLog	2018-01-18 23:11:21 UTC (rev 46372)
@@ -1,6 +1,7 @@
 2018-01-17  Norbert Preining  <norbert at preining.info>
 
-	* 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  <karl at freefriends.org>
 

Modified: trunk/Build/source/texk/ps2pk/ChangeLog
===================================================================
--- trunk/Build/source/texk/ps2pk/ChangeLog	2018-01-18 23:09:04 UTC (rev 46371)
+++ trunk/Build/source/texk/ps2pk/ChangeLog	2018-01-18 23:11:21 UTC (rev 46372)
@@ -1,3 +1,8 @@
+2018-01-18  Karl Berry  <karl at tug.org>
+
+	* objects.h (IfTrace0): printf %s instead of direct string
+	(from Debian).
+
 2017-03-27  Karl Berry  <karl at freefriends.org>
 
 	* Makefile.am (AM_TESTS_ENVIRONMENT): use instead of TESTS_ENVIRONMENT.

Modified: trunk/Build/source/texk/ps2pk/objects.h
===================================================================
--- trunk/Build/source/texk/ps2pk/objects.h	2018-01-18 23:09:04 UTC (rev 46371)
+++ trunk/Build/source/texk/ps2pk/objects.h	2018-01-18 23:11:21 UTC (rev 46372)
@@ -231,7 +231,7 @@
 /*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)                       \

Modified: trunk/Build/source/texk/web2c/cwebboot.cin
===================================================================
--- trunk/Build/source/texk/web2c/cwebboot.cin	2018-01-18 23:09:04 UTC (rev 46371)
+++ trunk/Build/source/texk/web2c/cwebboot.cin	2018-01-18 23:11:21 UTC (rev 46372)
@@ -1098,7 +1098,7 @@
  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());
 }

Modified: trunk/Build/source/texk/web2c/cwebdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/ChangeLog	2018-01-18 23:09:04 UTC (rev 46371)
+++ trunk/Build/source/texk/web2c/cwebdir/ChangeLog	2018-01-18 23:11:21 UTC (rev 46372)
@@ -1,3 +1,11 @@
+2018-01-18  Karl Berry  <karl at tug.org>
+
+	* 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  <karl at tug.org>
 
 	* ../cwebboot.cin,

Modified: trunk/Build/source/texk/web2c/cwebdir/common.c
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/common.c	2018-01-18 23:09:04 UTC (rev 46371)
+++ trunk/Build/source/texk/web2c/cwebdir/common.c	2018-01-18 23:11:21 UTC (rev 46372)
@@ -1063,7 +1063,7 @@
 fatal(s,t)
 char*s,*t;
 {
-if(*s)printf(s);
+if(*s)printf("%s",s);
 err_print(t);
 history= fatal_message;exit(wrap_up());
 }

Modified: trunk/Build/source/texk/web2c/cwebdir/common.w
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/common.w	2018-01-18 23:09:04 UTC (rev 46371)
+++ trunk/Build/source/texk/web2c/cwebdir/common.w	2018-01-18 23:11:21 UTC (rev 46372)
@@ -1180,7 +1180,7 @@
 fatal(s,t)
   char *s,*t;
 {
-  if (*s) printf(s);
+  if (*s) printf("%s",s);
   err_print(t);
   history=fatal_message; exit(wrap_up());
 }

Modified: trunk/Build/source/texk/web2c/cwebdir/cweave.w
===================================================================
--- trunk/Build/source/texk/web2c/cwebdir/cweave.w	2018-01-18 23:09:04 UTC (rev 46371)
+++ trunk/Build/source/texk/web2c/cwebdir/cweave.w	2018-01-18 23:11:21 UTC (rev 46372)
@@ -1785,7 +1785,7 @@
 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

Modified: trunk/Build/source/texk/web2c/omegafonts/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/omegafonts/ChangeLog	2018-01-18 23:09:04 UTC (rev 46371)
+++ trunk/Build/source/texk/web2c/omegafonts/ChangeLog	2018-01-18 23:11:21 UTC (rev 46372)
@@ -1,6 +1,14 @@
+2018-01-18  Karl Berry  <karl at tug.org>
+
+	* 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  <kakuto at fuk.kindai.ac.jp>
 
-	* 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  <peb at mppmu.mpg.de>
 

Modified: trunk/Build/source/texk/web2c/omegafonts/error_routines.c
===================================================================
--- trunk/Build/source/texk/web2c/omegafonts/error_routines.c	2018-01-18 23:09:04 UTC (rev 46371)
+++ trunk/Build/source/texk/web2c/omegafonts/error_routines.c	2018-01-18 23:11:21 UTC (rev 46372)
@@ -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 @@
 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 @@
 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 @@
 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 @@
 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);
 }

Modified: trunk/Build/source/texk/web2c/omegafonts/out_routines.c
===================================================================
--- trunk/Build/source/texk/web2c/omegafonts/out_routines.c	2018-01-18 23:09:04 UTC (rev 46371)
+++ trunk/Build/source/texk/web2c/omegafonts/out_routines.c	2018-01-18 23:11:21 UTC (rev 46372)
@@ -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 @@
 void
 out(const_string sval)
 {
-	fprintf(file_output, sval);
+	fprintf(file_output, "%s", sval);
 }

Modified: trunk/Build/source/texk/web2c/tiedir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/tiedir/ChangeLog	2018-01-18 23:09:04 UTC (rev 46371)
+++ trunk/Build/source/texk/web2c/tiedir/ChangeLog	2018-01-18 23:11:21 UTC (rev 46372)
@@ -1,3 +1,8 @@
+2018-01-18  Karl Berry  <karl at tug.org>
+
+	* tie.w (print, print_ln): printf %s instead of direct string
+	(from Debian).
+
 2014-02-12  Peter Breitenlohner  <peb at mppmu.mpg.de>
 
 	* tie-w2c.ch: Handle input lines with CRLF.

Modified: trunk/Build/source/texk/web2c/tiedir/tie.w
===================================================================
--- trunk/Build/source/texk/web2c/tiedir/tie.w	2018-01-18 23:09:04 UTC (rev 46371)
+++ trunk/Build/source/texk/web2c/tiedir/tie.w	2018-01-18 23:11:21 UTC (rev 46372)
@@ -25,7 +25,7 @@
 %		also repaired loop control for end of changes test (92-09-24)
 % Version 2.4 included <stdlib.h> instead of <malloc.h> when
 %		used with ANSI-C				   (92-12-17)
-%
+% See ChangeLog for further changes.
 
 % Here is TeX material that gets inserted after \input cwebmac
 
@@ -458,7 +458,7 @@
 
 @^system dependencies@>
 @d term_out  stdout
- at d print(a)  fprintf(term_out,a) /* `|print|' means write on the terminal */
+ at 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 */
@@ -465,7 +465,7 @@
 @d new_line(v)  fputc('\n',v) /* start new line */
 @d term_new_line  new_line(term_out)
 	/* start new line of the terminal */
- at d print_ln(v)  {fprintf(term_out,v);term_new_line;}
+ at 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;}

Modified: trunk/Build/source/utils/devnag/ChangeLog
===================================================================
--- trunk/Build/source/utils/devnag/ChangeLog	2018-01-18 23:09:04 UTC (rev 46371)
+++ trunk/Build/source/utils/devnag/ChangeLog	2018-01-18 23:11:21 UTC (rev 46372)
@@ -1,3 +1,8 @@
+2018-01-18  Karl Berry  <karl at tug.org>
+
+	* src/devnag.c (err_ill): printf %s instead of direct string
+	(from Debian).
+
 2016-06-30  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
 
 	* tests/*.tex: update version number.

Modified: trunk/Build/source/utils/devnag/src/devnag.c
===================================================================
--- trunk/Build/source/utils/devnag/src/devnag.c	2018-01-18 23:09:04 UTC (rev 46371)
+++ trunk/Build/source/utils/devnag/src/devnag.c	2018-01-18 23:11:21 UTC (rev 46372)
@@ -3,7 +3,7 @@
 
  *
  Preprocessor for Devanagari for TeX package
- Copyright (C) 1991-2016  University of Groningen, The Netherlands
+ Copyright (C) 1991-2018  University of Groningen, The Netherlands
  *
  Author   : Frans J. Velthuis <velthuis at rc.rug.nl>
  Date     : 09 May 1991
@@ -2417,7 +2417,7 @@
 void err_ill(const char *str) {
    fprintf(stderr, "Error: illegal character(s) \"%s\" detected at line %d:\n",
 	  str, linenumber);
-   fprintf(stderr, inbuf);
+   fprintf(stderr, "%s", inbuf);
    exit(1);
 }
 



More information about the tex-live-commits mailing list