Группа :: Издательство
Пакет: texlive
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: texlive-20160523-mageia-format.patch
Скачать
Скачать
--- texlive-20160523-source/texk/dvidvi/dvidvi.c.orig 2016-09-23 01:20:52.105675070 -0300
+++ texlive-20160523-source/texk/dvidvi/dvidvi.c 2016-09-23 01:21:35.306678037 -0300
@@ -327,7 +327,7 @@ static void stringdvibuf(integer p, inte
* Print a usage error messsage, and quit.
*/
static void usage(void) {
- (void)fprintf(stderr,banner);
+ (void)fprintf(stderr,"%s",banner);
(void)fprintf(stderr,"Usage: dvidvi [options] input[.dvi] [output]\n");
(void)fprintf(stderr,"where options are:\n");
(void)fprintf(stderr," [-f n] first page printed [-l n] last page printed\n");
@@ -806,7 +806,7 @@ default:
} /* else argument with '-' */
} /* for */
if (*iname == 0) {
- (void)fprintf(stderr, banner) ;
+ (void)fprintf(stderr, "%s", banner) ;
error("! no input file specified");
}
/* Inserted by djc@dsmail.hmi.de 3.8.1994 */
@@ -817,7 +817,7 @@ default:
}
if (*oname != 0 && !quiet) {
- (void)fprintf(stderr, banner) ;
+ (void)fprintf(stderr, "%s", banner) ;
(void)fprintf(stderr, "%s -> %s\n",iname,oname);
temp = nextstring ;
}
--- texlive-20160523-source/texk/web2c/omegafonts/error_routines.c.orig 2016-09-23 01:27:20.938701772 -0300
+++ texlive-20160523-source/texk/web2c/omegafonts/error_routines.c 2016-09-23 01:28:01.932704588 -0300
@@ -32,6 +32,70 @@ They
*/
+#if defined(__GNUC__) && (__GNUC__ >= 3)
+#include <string.h>
+#include <stdarg.h>
+#include <stdlib.h>
+
+void
+lex_error(string fmt, ...)
+{
+ va_list ap;
+
+ fprintf(stderr, "line %d (lexing): ", line_number);
+ va_start(ap, fmt);
+ vfprintf(stderr, fmt, ap);
+ va_end(ap);
+ fprintf(stderr, "\n");
+}
+
+void
+fatal_error(string fmt, ...)
+{
+ va_list ap;
+
+ fprintf(stderr, "line %d (fatal): ", line_number);
+ va_start(ap, fmt);
+ vfprintf(stderr, fmt, ap);
+ va_end(ap);
+ fprintf(stderr, "\n");
+ exit(1);
+}
+
+void
+yyerror(string fmt)
+{
+ fprintf(stderr, "line %d (parsing): ", line_number);
+ fprintf(stderr, "%s", fmt);
+ fprintf(stderr, "\n");
+}
+
+void
+warning_(string fmt, ...)
+{
+ va_list ap;
+
+ fprintf(stderr, "line %d (warning): ", line_number);
+ va_start(ap, fmt);
+ vfprintf(stderr, fmt, ap);
+ va_end(ap);
+ fprintf(stderr, "\n");
+}
+
+void
+internal_error(string fmt, ...)
+{
+ va_list ap;
+
+ fprintf(stderr, "line %d (internal): ", line_number);
+ va_start(ap, fmt);
+ vfprintf(stderr, fmt, ap);
+ va_end(ap);
+ fprintf(stderr, "\n");
+ exit(2);
+}
+
+#else
void
lex_error_1(const_string fmt, int item)
{
@@ -183,3 +247,4 @@ internal_error_s(const_string fmt, const
fprintf(stderr, "\n");
exit(2);
}
+#endif
--- texlive-20160523-source/texk/web2c/omegafonts/error_routines.h.orig 2016-09-23 01:28:15.056705489 -0300
+++ texlive-20160523-source/texk/web2c/omegafonts/error_routines.h 2016-09-23 01:28:43.228707424 -0300
@@ -21,6 +21,30 @@ along with Omega; if not, write to the F
extern int num_errors;
+#if defined(__GNUC__) && (__GNUC__ >= 3)
+#define lex_error_0(a) lex_error("%s", a)
+#define lex_error_1(a, b) lex_error(a, b)
+#define lex_error_s(a, b) lex_error(a, b)
+#define lex_error_s_1(a, b, c) lex_error(a, b, c)
+extern void lex_error(string, ...) __attribute__ ((format (printf, 1, 2)));
+#define fatal_error_0(a) fatal_error("%s", a)
+#define fatal_error_1(a, b) fatal_error(a, b)
+#define fatal_error_2(a, b, c) fatal_error(a, b, c)
+#define fatal_error_s(a, b) fatal_error(a, b)
+extern void fatal_error(string, ...) __attribute__ ((format (printf, 1, 2)));
+extern void yyerror(string);
+#define warning_0(a) warning_("%s", a)
+#define warning_1(a, b) warning_(a, b)
+#define warning_2(a, b, c) warning_(a, b, c)
+#define warning_s(a, b) warning_(a, b)
+#define warning_s_1(a, b, c) warning_(a, b, c)
+#define warning_s_2(a, b, c, d) warning_(a, b, c, d)
+extern void warning_(string, ...) __attribute__ ((format (printf, 1, 2)));
+#define internal_error_0(a) internal_error("%s", a)
+#define internal_error_1(a, b) internal_error(a, b)
+#define internal_error_s(a, b) internal_error(a, b)
+extern void internal_error(string, ...) __attribute__ ((format (printf, 1, 2)));
+#else
extern void lex_error_1(const_string, int);
extern void lex_error_s(const_string, const_string);
extern void lex_error_s_1(const_string, const_string, int);
@@ -43,2 +67,3 @@ extern void warning_s_2(const_string, co
extern void internal_error_0(const_string);
extern void internal_error_1(const_string, int);
+#endif
--- texlive-20160523-source/texk/web2c/tiedir/tie-w2c.ch.orig 2016-09-23 01:29:21.906710080 -0300
+++ texlive-20160523-source/texk/web2c/tiedir/tie-w2c.ch 2016-09-23 01:29:42.384711486 -0300
@@ -136,7 +136,7 @@ int main (int argc, string *argv)
@y
kpse_set_program_name(argv[0], "tie");
print(banner); /* print a ``banner line'' */
- print_ln(versionstring); /* Web2C version */
+ printf("%s", versionstring); /* Web2C version */
print_ln(copyright); /* include the copyright notice */
@z