texlive[47712] Build/source/texk/dvidvi: dvidvi.c: patch from kbrown

[commits+hironobu at tug.org]

Revision: 47712
          http://tug.org/svn/texlive?view=revision&revision=47712
Author:   hironobu
Date:     2018-05-14 15:38:13 +0200 (Mon, 14 May 2018)
Log Message:
-----------
dvidvi.c: patch from kbrown

Modified Paths:
--------------
    trunk/Build/source/texk/dvidvi/ChangeLog
    trunk/Build/source/texk/dvidvi/dvidvi.c

Modified: trunk/Build/source/texk/dvidvi/ChangeLog
===================================================================
--- trunk/Build/source/texk/dvidvi/ChangeLog	2018-05-14 13:01:34 UTC (rev 47711)
+++ trunk/Build/source/texk/dvidvi/ChangeLog	2018-05-14 13:38:13 UTC (rev 47712)
@@ -1,3 +1,12 @@
+2018-05-14  Hironobu Yamashita  <h.y.acetaminophen at gmail.com>
+
+	* dvidvi.c: Adjust 'Bad option' error message.
+
+2018-05-09  Ken Brown  <kbrow1i at gmail.com>
+
+	* dvidvi.c: Avoid a gcc warning with -Wformat-security.
+	http://tug.org/pipermail/tlbuild/2018q2/004225.html
+
 2017-06-25  TANAKA Takuji  <ttk at t-lab.opal.ne.jp>
 
 	* configure{,ac}, aclocal.m4:

Modified: trunk/Build/source/texk/dvidvi/dvidvi.c
===================================================================
--- trunk/Build/source/texk/dvidvi/dvidvi.c	2018-05-14 13:01:34 UTC (rev 47711)
+++ trunk/Build/source/texk/dvidvi/dvidvi.c	2018-05-14 13:38:13 UTC (rev 47712)
@@ -138,7 +138,7 @@
 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 @@
             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 */