/[packages]/cauldron/texlive/current/SOURCES/texlive-20130530-mandriva-format.patch
ViewVC logotype

Contents of /cauldron/texlive/current/SOURCES/texlive-20130530-mandriva-format.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 555871 - (show annotations) (download)
Sun Dec 8 15:36:25 2013 UTC (6 years, 6 months ago) by malo
File size: 9332 byte(s)
update to 20130530, sync patches with mandriva
1 --- texlive-20130530-source/texk/devnag/src/devnag.c.orig 2013-10-12 01:20:18.054672732 -0300
2 +++ texlive-20130530-source/texk/devnag/src/devnag.c 2013-10-12 01:20:39.574674210 -0300
3 @@ -2395,7 +2395,7 @@ void put_macro(short macro) {
4 void err_ill(const char *str) {
5 fprintf(stderr, "Error: illegal character(s) \"%s\" detected at line %d:\n",
6 str, linenumber);
7 - fprintf(stderr, inbuf);
8 + fprintf(stderr, "%s", inbuf);
9 exit(1);
10 }
11
12 --- texlive-20130530-source/texk/dvidvi/dvidvi.c.orig 2013-10-12 01:20:52.105675070 -0300
13 +++ texlive-20130530-source/texk/dvidvi/dvidvi.c 2013-10-12 01:21:35.306678037 -0300
14 @@ -327,7 +327,7 @@ static void stringdvibuf(integer p, inte
15 * Print a usage error messsage, and quit.
16 */
17 static void usage(void) {
18 - (void)fprintf(stderr,banner);
19 + (void)fprintf(stderr,"%s",banner);
20 (void)fprintf(stderr,"Usage: dvidvi [options] input[.dvi] [output]\n");
21 (void)fprintf(stderr,"where options are:\n");
22 (void)fprintf(stderr," [-f n] first page printed [-l n] last page printed\n");
23 @@ -806,7 +806,7 @@ default:
24 } /* else argument with '-' */
25 } /* for */
26 if (*iname == 0) {
27 - (void)fprintf(stderr, banner) ;
28 + (void)fprintf(stderr, "%s", banner) ;
29 error("! no input file specified");
30 }
31 /* Inserted by djc@dsmail.hmi.de 3.8.1994 */
32 @@ -817,7 +817,7 @@ default:
33 }
34
35 if (*oname != 0 && !quiet) {
36 - (void)fprintf(stderr, banner) ;
37 + (void)fprintf(stderr, "%s", banner) ;
38 (void)fprintf(stderr, "%s -> %s\n",iname,oname);
39 temp = nextstring ;
40 }
41 --- texlive-20130530-source/texk/ps2pkm/objects.h.orig 2013-10-12 01:21:52.149679194 -0300
42 +++ texlive-20130530-source/texk/ps2pkm/objects.h 2013-10-12 01:22:09.281680370 -0300
43 @@ -232,7 +232,7 @@ struct xobject {
44 /*SHARED*/
45 /* NDW: personally, I want to see status and error messages! */
46 #define IfTrace0(condition,model) \
47 - {if (condition) printf(model);}
48 + {if (condition) printf("%s", model);}
49 #define IfTrace1(condition,model,arg0) \
50 {if (condition) printf(model,arg0);}
51 #define IfTrace2(condition,model,arg0,arg1) \
52 --- texlive-20130530-source/texk/web2c/cwebboot.cin.orig 2013-10-12 01:22:34.643682112 -0300
53 +++ texlive-20130530-source/texk/web2c/cwebboot.cin 2013-10-12 01:22:54.292683461 -0300
54 @@ -1088,7 +1088,7 @@ void
55 fatal(const char*s,const char*t)
56 #line 1182 "cwebdir/common.w"
57 {
58 -if(*s)printf(s);
59 +if(s&&*s)printf("%s",s);
60 err_print(t);
61 history= fatal_message;exit(wrap_up());
62 }
63 --- texlive-20130530-source/texk/web2c/cwebdir/common.w.orig 2013-10-12 01:23:09.905684533 -0300
64 +++ texlive-20130530-source/texk/web2c/cwebdir/common.w 2013-10-12 01:23:26.231685654 -0300
65 @@ -1180,7 +1180,7 @@ concatenated to print the final error me
66 fatal(s,t)
67 char *s,*t;
68 {
69 - if (*s) printf(s);
70 + if (s && *s) printf("%s", s);
71 err_print(t);
72 history=fatal_message; exit(wrap_up());
73 }
74 --- texlive-20130530-source/texk/web2c/cwebdir/cweave.w.orig 2013-10-12 01:23:38.055686466 -0300
75 +++ texlive-20130530-source/texk/web2c/cwebdir/cweave.w 2013-10-12 01:23:53.931687557 -0300
76 @@ -1784,7 +1784,7 @@ void
77 print_cat(c) /* symbolic printout of a category */
78 eight_bits c;
79 {
80 - printf(cat_name[c]);
81 + printf("%s", cat_name[c]);
82 }
83
84 @ The token lists for translated \TEX/ output contain some special control
85 --- texlive-20130530-source/texk/web2c/omegafonts/error_routines.c.orig 2013-10-12 01:27:20.938701772 -0300
86 +++ texlive-20130530-source/texk/web2c/omegafonts/error_routines.c 2013-10-12 01:28:01.932704588 -0300
87 @@ -32,6 +32,70 @@ They
88
89 */
90
91 +#if defined(__GNUC__) && (__GNUC__ >= 3)
92 +#include <string.h>
93 +#include <stdarg.h>
94 +#include <stdlib.h>
95 +
96 +void
97 +lex_error(string fmt, ...)
98 +{
99 + va_list ap;
100 +
101 + fprintf(stderr, "line %d (lexing): ", line_number);
102 + va_start(ap, fmt);
103 + vfprintf(stderr, fmt, ap);
104 + va_end(ap);
105 + fprintf(stderr, "\n");
106 +}
107 +
108 +void
109 +fatal_error(string fmt, ...)
110 +{
111 + va_list ap;
112 +
113 + fprintf(stderr, "line %d (fatal): ", line_number);
114 + va_start(ap, fmt);
115 + vfprintf(stderr, fmt, ap);
116 + va_end(ap);
117 + fprintf(stderr, "\n");
118 + exit(1);
119 +}
120 +
121 +void
122 +yyerror(string fmt)
123 +{
124 + fprintf(stderr, "line %d (parsing): ", line_number);
125 + fprintf(stderr, "%s", fmt);
126 + fprintf(stderr, "\n");
127 +}
128 +
129 +void
130 +warning_(string fmt, ...)
131 +{
132 + va_list ap;
133 +
134 + fprintf(stderr, "line %d (warning): ", line_number);
135 + va_start(ap, fmt);
136 + vfprintf(stderr, fmt, ap);
137 + va_end(ap);
138 + fprintf(stderr, "\n");
139 +}
140 +
141 +void
142 +internal_error(string fmt, ...)
143 +{
144 + va_list ap;
145 +
146 + fprintf(stderr, "line %d (internal): ", line_number);
147 + va_start(ap, fmt);
148 + vfprintf(stderr, fmt, ap);
149 + va_end(ap);
150 + fprintf(stderr, "\n");
151 + exit(2);
152 +}
153 +
154 +#else
155 void
156 lex_error_0(const_string fmt)
157 {
158 @@ -183,3 +247,4 @@ internal_error_s(const_string fmt, const
159 fprintf(stderr, "\n");
160 exit(2);
161 }
162 +#endif
163 --- texlive-20130530-source/texk/web2c/omegafonts/error_routines.h.orig 2013-10-12 01:28:15.056705489 -0300
164 +++ texlive-20130530-source/texk/web2c/omegafonts/error_routines.h 2013-10-12 01:28:43.228707424 -0300
165 @@ -21,6 +21,30 @@ along with Omega; if not, write to the F
166
167 */
168
169 +#if defined(__GNUC__) && (__GNUC__ >= 3)
170 +#define lex_error_0(a) lex_error("%s", a)
171 +#define lex_error_1(a, b) lex_error(a, b)
172 +#define lex_error_s(a, b) lex_error(a, b)
173 +#define lex_error_s_1(a, b, c) lex_error(a, b, c)
174 +extern void lex_error(string, ...) __attribute__ ((format (printf, 1, 2)));
175 +#define fatal_error_0(a) fatal_error("%s", a)
176 +#define fatal_error_1(a, b) fatal_error(a, b)
177 +#define fatal_error_2(a, b, c) fatal_error(a, b, c)
178 +#define fatal_error_s(a, b) fatal_error(a, b)
179 +extern void fatal_error(string, ...) __attribute__ ((format (printf, 1, 2)));
180 +extern void yyerror(string);
181 +#define warning_0(a) warning_("%s", a)
182 +#define warning_1(a, b) warning_(a, b)
183 +#define warning_2(a, b, c) warning_(a, b, c)
184 +#define warning_s(a, b) warning_(a, b)
185 +#define warning_s_1(a, b, c) warning_(a, b, c)
186 +#define warning_s_2(a, b, c, d) warning_(a, b, c, d)
187 +extern void warning_(string, ...) __attribute__ ((format (printf, 1, 2)));
188 +#define internal_error_0(a) internal_error("%s", a)
189 +#define internal_error_1(a, b) internal_error(a, b)
190 +#define internal_error_s(a, b) internal_error(a, b)
191 +extern void internal_error(string, ...) __attribute__ ((format (printf, 1, 2)));
192 +#else
193 extern void lex_error_0(const_string);
194 extern void lex_error_1(const_string, int);
195 extern void lex_error_s(const_string, const_string);
196 @@ -43,3 +67,4 @@ extern void warning_s_2(const_string, co
197 extern void internal_error_0(const_string);
198 extern void internal_error_1(const_string, int);
199 extern void internal_error_s(const_string, const_string);
200 +#endif
201 --- texlive-20130530-source/texk/web2c/omegafonts/out_routines.c.orig 2013-10-12 01:28:56.637708344 -0300
202 +++ texlive-20130530-source/texk/web2c/omegafonts/out_routines.c 2013-10-12 01:29:09.613709235 -0300
203 @@ -383,5 +383,5 @@ out_digits(unsigned counter)
204 void
205 out(const_string sval)
206 {
207 - fprintf(file_output, sval);
208 + fprintf(file_output, "%s", sval);
209 }
210 --- texlive-20130530-source/texk/web2c/tiedir/tie-w2c.ch.orig 2013-10-12 01:29:21.906710080 -0300
211 +++ texlive-20130530-source/texk/web2c/tiedir/tie-w2c.ch 2013-10-12 01:29:42.384711486 -0300
212 @@ -136,7 +136,7 @@ int main (int argc, string *argv)
213 @y
214 kpse_set_program_name(argv[0], "tie");
215 print(banner); /* print a ``banner line'' */
216 - print_ln(versionstring); /* Web2C version */
217 + printf("%s", versionstring); /* Web2C version */
218 print_ln(copyright); /* include the copyright notice */
219 @z
220
221 --- texlive-20130530-source/texk/xdvik/gui/message-window.c.orig 2013-10-12 01:29:55.535712389 -0300
222 +++ texlive-20130530-source/texk/xdvik/gui/message-window.c 2013-10-12 01:31:01.686716932 -0300
223 @@ -713,7 +713,7 @@ internal_popup_window(Widget parent,
224 Widget ret;
225
226 ASSERT(type < (sizeof my_msg_map / sizeof my_msg_map[0]), "too few elements in my_msg_map");
227 - sprintf(win_title, my_msg_map[type].window_title);
228 + snprintf(win_title, sizeof(win_title), "%s", my_msg_map[type].window_title);
229
230 #if DEBUG
231 fprintf(stderr, "internal_popup_window called with prompt: \"%s\"\n", msg_buf);
232 @@ -725,11 +725,10 @@ internal_popup_window(Widget parent,
233 supposed to be printf-format strings (i.e. with doubled `%' to escape them)
234 */
235 fprintf(stderr, "\n%s:\n", my_msg_map[type].window_title);
236 - fprintf(stderr, msg_buf);
237 - fprintf(stderr, "\n");
238 + fprintf(stderr, "%s\n", msg_buf);
239 if (helptext) {
240 fprintf(stderr, "---------- helptext ----------\n");
241 - fprintf(stderr, helptext);
242 + fprintf(stderr, "%s", helptext);
243 fprintf(stderr, "\n---------- end of helptext ----------\n");
244 }
245 return NULL;
246 @@ -741,8 +740,7 @@ internal_popup_window(Widget parent,
247 if (my_popup_num == MAX_POPUPS) {
248 /* already enough popups on screen, just dump it to stderr */
249 fprintf(stderr, "%s: ", win_title);
250 - fprintf(stderr, msg_buf);
251 - fputc('\n', stderr);
252 + fprintf(stderr, "%s\n", msg_buf);
253 /* Note: If a mad function continues to open popups, this will
254 * stop after MAX_POPUPS, but open a new window for each
255 * window the user pops down. Maybe we ought to do something

  ViewVC Help
Powered by ViewVC 1.1.28