From 872abd5ea5e52b8c5615892baebd8b648719d13e Mon Sep 17 00:00:00 2001 From: Hironobu Yamashita Date: Mon, 14 May 2018 13:38:13 +0000 Subject: dvidvi.c: patch from kbrown git-svn-id: svn://tug.org/texlive/trunk@47712 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/dvidvi/ChangeLog | 9 +++++++++ Build/source/texk/dvidvi/dvidvi.c | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Build/source/texk/dvidvi/ChangeLog b/Build/source/texk/dvidvi/ChangeLog index c03ca78c6d5..d83fdff6679 100644 --- a/Build/source/texk/dvidvi/ChangeLog +++ b/Build/source/texk/dvidvi/ChangeLog @@ -1,3 +1,12 @@ +2018-05-14 Hironobu Yamashita + + * dvidvi.c: Adjust 'Bad option' error message. + +2018-05-09 Ken Brown + + * dvidvi.c: Avoid a gcc warning with -Wformat-security. + http://tug.org/pipermail/tlbuild/2018q2/004225.html + 2017-06-25 TANAKA Takuji * configure{,ac}, aclocal.m4: diff --git a/Build/source/texk/dvidvi/dvidvi.c b/Build/source/texk/dvidvi/dvidvi.c index fb769fabc25..fa4c54cb2f4 100644 --- a/Build/source/texk/dvidvi/dvidvi.c +++ b/Build/source/texk/dvidvi/dvidvi.c @@ -138,7 +138,7 @@ const char *oname=NULL ; /* output dvi file name */ char *iname ; /* input dvi file name */ char *strings ; /* pointer of the string pool */ -char banner[] = BANNER ; /* the startup message */ +const char banner[] = BANNER ; /* the startup message */ integer inlength ; /* the length of the input dvi file */ integer postloc ; /* location of the postamble */ integer mag ; /* magnification factor */ @@ -772,7 +772,7 @@ case '?' : usage() ; break ; default: - error("! Bad option, not one of filmnqrx?") ; + error("! Bad option, not one of fijlmnpqrx?") ; } /* switch c */ } else { /* this a file name */ if (*iname == 0) { /* input file name */ -- cgit v1.2.3