1 diff -ruNp texlive-20140525-source.orig/texk/devnag/src/devnag.c texlive-20140525-source/texk/devnag/src/devnag.c
2 --- texlive-20140525-source.orig/texk/devnag/src/devnag.c 2014-02-18 08:57:08.000000000 +0100
3 +++ texlive-20140525-source/texk/devnag/src/devnag.c 2014-06-14 20:07:06.525335916 +0200
4 @@ -2394,7 +2394,7 @@ void put_macro(short macro) {
5 void err_ill(const char *str) {
6 fprintf(stderr, "Error: illegal character(s) \"%s\" detected at line %d:\n",
8 - fprintf(stderr, inbuf);
9 + fprintf(stderr, "%s", inbuf);
13 diff -ruNp texlive-20140525-source.orig/texk/dvidvi/dvidvi.c texlive-20140525-source/texk/dvidvi/dvidvi.c
14 --- texlive-20140525-source.orig/texk/dvidvi/dvidvi.c 2013-06-28 15:27:05.000000000 +0200
15 +++ texlive-20140525-source/texk/dvidvi/dvidvi.c 2014-06-14 20:00:16.415140190 +0200
16 @@ -327,7 +327,7 @@ static void stringdvibuf(integer p, inte
17 * Print a usage error messsage, and quit.
19 static void usage(void) {
20 - (void)fprintf(stderr,banner);
21 + (void)fprintf(stderr,"%s",banner);
22 (void)fprintf(stderr,"Usage: dvidvi [options] input[.dvi] [output]\n");
23 (void)fprintf(stderr,"where options are:\n");
24 (void)fprintf(stderr," [-f n] first page printed [-l n] last page printed\n");
25 @@ -806,7 +806,7 @@ default:
26 } /* else argument with '-' */
29 - (void)fprintf(stderr, banner) ;
30 + (void)fprintf(stderr, "%s", banner) ;
31 error("! no input file specified");
33 /* Inserted by djc@dsmail.hmi.de 3.8.1994 */
34 @@ -817,7 +817,7 @@ default:
37 if (*oname != 0 && !quiet) {
38 - (void)fprintf(stderr, banner) ;
39 + (void)fprintf(stderr, "%s", banner) ;
40 (void)fprintf(stderr, "%s -> %s\n",iname,oname);
43 diff -ruNp texlive-20140525-source.orig/texk/ps2pkm/objects.h texlive-20140525-source/texk/ps2pkm/objects.h
44 --- texlive-20140525-source.orig/texk/ps2pkm/objects.h 2009-06-22 16:33:57.000000000 +0200
45 +++ texlive-20140525-source/texk/ps2pkm/objects.h 2014-06-14 20:05:23.686788284 +0200
46 @@ -232,7 +232,7 @@ struct xobject {
48 /* NDW: personally, I want to see status and error messages! */
49 #define IfTrace0(condition,model) \
50 - {if (condition) printf(model);}
51 + {if (condition) printf("%s",model);}
52 #define IfTrace1(condition,model,arg0) \
53 {if (condition) printf(model,arg0);}
54 #define IfTrace2(condition,model,arg0,arg1) \
55 diff -ruNp texlive-20140525-source.orig/texk/web2c/cwebboot.cin texlive-20140525-source/texk/web2c/cwebboot.cin
56 --- texlive-20140525-source.orig/texk/web2c/cwebboot.cin 2014-02-12 09:50:58.000000000 +0100
57 +++ texlive-20140525-source/texk/web2c/cwebboot.cin 2014-06-14 20:02:53.573448687 +0200
58 @@ -1092,7 +1092,7 @@ void
59 fatal(const char*s,const char*t)
60 #line 1182 "cwebdir/common.w"
63 +if(*s)printf("%s", s);
65 history= fatal_message;exit(wrap_up());
67 diff -ruNp texlive-20140525-source.orig/texk/web2c/cwebdir/common.w texlive-20140525-source/texk/web2c/cwebdir/common.w
68 --- texlive-20140525-source.orig/texk/web2c/cwebdir/common.w 2012-09-05 15:27:45.000000000 +0200
69 +++ texlive-20140525-source/texk/web2c/cwebdir/common.w 2014-06-14 20:06:21.331534710 +0200
70 @@ -1180,7 +1180,7 @@ concatenated to print the final error me
75 + if (*s) printf("%s", s);
77 history=fatal_message; exit(wrap_up());
79 diff -ruNp texlive-20140525-source.orig/texk/web2c/cwebdir/cweave.w texlive-20140525-source/texk/web2c/cwebdir/cweave.w
80 --- texlive-20140525-source.orig/texk/web2c/cwebdir/cweave.w 2012-09-05 15:27:45.000000000 +0200
81 +++ texlive-20140525-source/texk/web2c/cwebdir/cweave.w 2014-06-14 20:07:44.994166710 +0200
82 @@ -1784,7 +1784,7 @@ void
83 print_cat(c) /* symbolic printout of a category */
86 - printf(cat_name[c]);
87 + printf("%s", cat_name[c]);
90 @ The token lists for translated \TEX/ output contain some special control
91 diff -ruNp texlive-20140525-source.orig/texk/web2c/omegafonts/error_routines.c texlive-20140525-source/texk/web2c/omegafonts/error_routines.c
92 --- texlive-20140525-source.orig/texk/web2c/omegafonts/error_routines.c 2009-11-10 11:27:09.000000000 +0100
93 +++ texlive-20140525-source/texk/web2c/omegafonts/error_routines.c 2014-06-14 20:15:08.791211601 +0200
94 @@ -32,6 +32,71 @@ They
98 +#if defined(__GNUC__) && (__GNUC__ >= 3)
104 +lex_error(string fmt, ...)
108 + fprintf(stderr, "line %d (lexing): ", line_number);
110 + vfprintf(stderr, fmt, ap);
112 + fprintf(stderr, "\n");
116 +fatal_error(string fmt, ...)
120 + fprintf(stderr, "line %d (fatal): ", line_number);
122 + vfprintf(stderr, fmt, ap);
124 + fprintf(stderr, "\n");
131 + fprintf(stderr, "line %d (parsing): ", line_number);
132 + fprintf(stderr, "%s", fmt);
133 + fprintf(stderr, "\n");
137 +warning_(string fmt, ...)
141 + fprintf(stderr, "line %d (warning): ", line_number);
143 + vfprintf(stderr, fmt, ap);
145 + fprintf(stderr, "\n");
149 +internal_error(string fmt, ...)
153 + fprintf(stderr, "line %d (internal): ", line_number);
155 + vfprintf(stderr, fmt, ap);
157 + fprintf(stderr, "\n");
164 lex_error_0(const_string fmt)
166 @@ -183,3 +248,5 @@ internal_error_s(const_string fmt, const
167 fprintf(stderr, "\n");
172 diff -ruNp texlive-20140525-source.orig/texk/web2c/omegafonts/error_routines.h texlive-20140525-source/texk/web2c/omegafonts/error_routines.h
173 --- texlive-20140525-source.orig/texk/web2c/omegafonts/error_routines.h 2009-11-10 11:27:09.000000000 +0100
174 +++ texlive-20140525-source/texk/web2c/omegafonts/error_routines.h 2014-06-14 20:16:02.988972567 +0200
175 @@ -21,6 +21,30 @@ along with Omega; if not, write to the F
179 +#if defined(__GNUC__) && (__GNUC__ >= 3)
180 +#define lex_error_0(a) lex_error("%s", a)
181 +#define lex_error_1(a, b) lex_error(a, b)
182 +#define lex_error_s(a, b) lex_error(a, b)
183 +#define lex_error_s_1(a, b, c) lex_error(a, b, c)
184 +extern void lex_error(string, ...) __attribute__ ((format (printf, 1, 2)));
185 +#define fatal_error_0(a) fatal_error("%s", a)
186 +#define fatal_error_1(a, b) fatal_error(a, b)
187 +#define fatal_error_2(a, b, c) fatal_error(a, b, c)
188 +#define fatal_error_s(a, b) fatal_error(a, b)
189 +extern void fatal_error(string, ...) __attribute__ ((format (printf, 1, 2)));
190 +extern void yyerror(string);
191 +#define warning_0(a) warning_("%s", a)
192 +#define warning_1(a, b) warning_(a, b)
193 +#define warning_2(a, b, c) warning_(a, b, c)
194 +#define warning_s(a, b) warning_(a, b)
195 +#define warning_s_1(a, b, c) warning_(a, b, c)
196 +#define warning_s_2(a, b, c, d) warning_(a, b, c, d)
197 +extern void warning_(string, ...) __attribute__ ((format (printf, 1, 2)));
198 +#define internal_error_0(a) internal_error("%s", a)
199 +#define internal_error_1(a, b) internal_error(a, b)
200 +#define internal_error_s(a, b) internal_error(a, b)
201 +extern void internal_error(string, ...) __attribute__ ((format (printf, 1, 2)));
203 extern void lex_error_0(const_string);
204 extern void lex_error_1(const_string, int);
205 extern void lex_error_s(const_string, const_string);
206 @@ -43,3 +67,4 @@ extern void warning_s_2(const_string, co
207 extern void internal_error_0(const_string);
208 extern void internal_error_1(const_string, int);
209 extern void internal_error_s(const_string, const_string);
211 diff -ruNp texlive-20140525-source.orig/texk/web2c/omegafonts/out_routines.c texlive-20140525-source/texk/web2c/omegafonts/out_routines.c
212 --- texlive-20140525-source.orig/texk/web2c/omegafonts/out_routines.c 2009-11-10 11:27:09.000000000 +0100
213 +++ texlive-20140525-source/texk/web2c/omegafonts/out_routines.c 2014-06-14 20:08:15.091034333 +0200
214 @@ -383,5 +383,5 @@ out_digits(unsigned counter)
216 out(const_string sval)
218 - fprintf(file_output, sval);
219 + fprintf(file_output, "%s", sval);
221 diff -ruNp texlive-20140525-source.orig/texk/web2c/tiedir/tie.w texlive-20140525-source/texk/web2c/tiedir/tie.w
222 --- texlive-20140525-source.orig/texk/web2c/tiedir/tie.w 2009-03-09 09:29:33.000000000 +0100
223 +++ texlive-20140525-source/texk/web2c/tiedir/tie.w 2014-06-14 20:08:56.648851552 +0200
224 @@ -465,7 +465,7 @@ for terminating an output line and writi
225 @d new_line(v) fputc('\n',v) /* start new line */
226 @d term_new_line new_line(term_out)
227 /* start new line of the terminal */
228 -@d print_ln(v) {fprintf(term_out,v);term_new_line;}
229 +@d print_ln(v) {fprintf(term_out,"%s",v);term_new_line;}
230 /* `|print|' and then start new line */
231 @d print2_ln(a,b) {print2(a,b);term_new_line;} /* same with two arguments */
232 @d print3_ln(a,b,c) {print3(a,b,c);term_new_line;}