From 22e024a12ca7fb8ceb660b3da19adbf7c9a26353 Mon Sep 17 00:00:00 2001 From: Takuji Tanaka Date: Fri, 1 May 2020 02:28:43 +0000 Subject: dviout-util: Add bug report address on command line help git-svn-id: svn://tug.org/texlive/trunk@54956 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/dviout-util/ChangeLog | 7 +++++++ Build/source/texk/dviout-util/Makefile.am | 4 ++-- Build/source/texk/dviout-util/Makefile.in | 5 +++-- Build/source/texk/dviout-util/chkdvifont.c | 16 +++++++++++----- Build/source/texk/dviout-util/common.h | 1 + Build/source/texk/dviout-util/configure | 22 +++++++++++----------- Build/source/texk/dviout-util/configure.ac | 2 +- Build/source/texk/dviout-util/dvispc.c | 3 +++ 8 files changed, 39 insertions(+), 21 deletions(-) create mode 100644 Build/source/texk/dviout-util/common.h (limited to 'Build/source') diff --git a/Build/source/texk/dviout-util/ChangeLog b/Build/source/texk/dviout-util/ChangeLog index 42b9a76e906..17dd0189b4f 100644 --- a/Build/source/texk/dviout-util/ChangeLog +++ b/Build/source/texk/dviout-util/ChangeLog @@ -1,3 +1,10 @@ +2020-05-01 TANAKA Takuji + + * Makefile.{am,in}, common.h, dvispc.c, chkdvifont.c: + Add a bug report addresse on command line help. + * chkdvifont.c: Avoid compiler warnings. + * configure.ac: Version 20200501. + 2020-01-17 Hironobu Yamashita * configure.ac: Version 20200117. diff --git a/Build/source/texk/dviout-util/Makefile.am b/Build/source/texk/dviout-util/Makefile.am index b40d7b9ee35..409dbcf5b70 100644 --- a/Build/source/texk/dviout-util/Makefile.am +++ b/Build/source/texk/dviout-util/Makefile.am @@ -10,8 +10,8 @@ $(dviout_util_OBJECTS): $(KPATHSEA_DEPEND) $(PTEXENC_DEPEND) bin_PROGRAMS = dvispc chkdvifont -dvispc_SOURCES = dvispc.c -chkdvifont_SOURCES = chkdvifont.c dd.h msvcdir.h +dvispc_SOURCES = dvispc.c common.h +chkdvifont_SOURCES = chkdvifont.c dd.h msvcdir.h common.h LDADD = $(KPATHSEA_LIBS) dvispc_LDADD = $(PTEXENC_LIBS) $(LDADD) diff --git a/Build/source/texk/dviout-util/Makefile.in b/Build/source/texk/dviout-util/Makefile.in index ad609122b3d..923f7ae871a 100644 --- a/Build/source/texk/dviout-util/Makefile.in +++ b/Build/source/texk/dviout-util/Makefile.in @@ -543,6 +543,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -553,8 +554,8 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AM_CPPFLAGS = $(PTEXENC_INCLUDES) $(KPATHSEA_INCLUDES) -DUNIX -DKPATHSEA -DPTEXENC AM_CFLAGS = $(WARNING_CFLAGS) -dvispc_SOURCES = dvispc.c -chkdvifont_SOURCES = chkdvifont.c dd.h msvcdir.h +dvispc_SOURCES = dvispc.c common.h +chkdvifont_SOURCES = chkdvifont.c dd.h msvcdir.h common.h LDADD = $(KPATHSEA_LIBS) dvispc_LDADD = $(PTEXENC_LIBS) $(LDADD) dist_man1_MANS = dvispc.man chkdvifont.man diff --git a/Build/source/texk/dviout-util/chkdvifont.c b/Build/source/texk/dviout-util/chkdvifont.c index 1453490e546..acf2df8bea9 100644 --- a/Build/source/texk/dviout-util/chkdvifont.c +++ b/Build/source/texk/dviout-util/chkdvifont.c @@ -71,6 +71,7 @@ #include #include "dd.h" +#include "common.h" #define ID 2 #define ID_PTEX 3 @@ -430,7 +431,7 @@ int chk_font_file(FILE * fp) finfo = (struct FINFO *)gth_buf; fardir = (struct FARDIR *)gth_buf; - fread(gth_buf, sizeof(struct FINFO), 1, fp); + if (fread(gth_buf, sizeof(struct FINFO), 1, fp)<1) goto err; if (strcmp(gth_buf + 8, "gather") == 0) goto gth; @@ -451,7 +452,7 @@ int chk_font_file(FILE * fp) if (f_v) printf("\n"); fseek(fp, start, SEEK_SET); - fread((char *)fardir, sizeof(struct FARDIR), 1, fp); + if (fread((char *)fardir, sizeof(struct FARDIR), 1, fp)<1) goto err; start = ftell(fp); font.n = fardir->f_name; @@ -475,11 +476,11 @@ int chk_font_file(FILE * fp) if (f_v) printf("\n"); fseek(fp, start, SEEK_SET); - fread(gth_buf, sizeof(struct FINFO), 1, fp); + if (fread(gth_buf, sizeof(struct FINFO), 1, fp)<1) goto err; start = ftell(fp); font.n = finfo->f_name; - printf("%s:%d(%d)\n", + printf("%s:%ld(%ld)\n", font.n, to_long(finfo->f_pos), to_long(finfo->f_size)); f_end = to_long(finfo->f_pos) + to_long(finfo->f_size); fseek(fp, to_long(finfo->f_pos), SEEK_SET); @@ -488,6 +489,10 @@ int chk_font_file(FILE * fp) printf("\n"); } return (0); + + err: + fprintf(stderr, "Cannot read data\n"); + exit(250); } void show_dvi_data(DVIFILE_INFO *dvi) @@ -1284,7 +1289,7 @@ void get_list(char *fname) return; if (buf[0] == '#' || buf[0] == ';') continue; - if (sscanf(buf, "%15s %X %X", + if (sscanf(buf, "%15s %lX %lX", chkfont[n_data].f_name, &(chkfont[n_data].oldd), &(chkfont[n_data].neww)) != 3) { @@ -1358,6 +1363,7 @@ void usage() "eufm10 BF989013 8F256EB2\n" "# The line beginning with # or ; is ignored.\n" ); + fprintf(stderr, "\nEmail bug reports to %s.\n", BUG_ADDRESS); exit(0); } diff --git a/Build/source/texk/dviout-util/common.h b/Build/source/texk/dviout-util/common.h new file mode 100644 index 00000000000..14f5ec1d774 --- /dev/null +++ b/Build/source/texk/dviout-util/common.h @@ -0,0 +1 @@ +#define BUG_ADDRESS "issue@texjp.org" diff --git a/Build/source/texk/dviout-util/configure b/Build/source/texk/dviout-util/configure index d095c4c3c70..65cf04d3b11 100755 --- a/Build/source/texk/dviout-util/configure +++ b/Build/source/texk/dviout-util/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for dviout-util (TeX Live) 20200117. +# Generated by GNU Autoconf 2.69 for dviout-util (TeX Live) 20200501. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='dviout-util (TeX Live)' PACKAGE_TARNAME='dviout-util--tex-live-' -PACKAGE_VERSION='20200117' -PACKAGE_STRING='dviout-util (TeX Live) 20200117' +PACKAGE_VERSION='20200501' +PACKAGE_STRING='dviout-util (TeX Live) 20200501' PACKAGE_BUGREPORT='tex-k@tug.org' PACKAGE_URL='' @@ -1332,7 +1332,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures dviout-util (TeX Live) 20200117 to adapt to many kinds of systems. +\`configure' configures dviout-util (TeX Live) 20200501 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1403,7 +1403,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of dviout-util (TeX Live) 20200117:";; + short | recursive ) echo "Configuration of dviout-util (TeX Live) 20200501:";; esac cat <<\_ACEOF @@ -1524,7 +1524,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -dviout-util (TeX Live) configure 20200117 +dviout-util (TeX Live) configure 20200501 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2180,7 +2180,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by dviout-util (TeX Live) $as_me 20200117, which was +It was created by dviout-util (TeX Live) $as_me 20200501, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -7867,7 +7867,7 @@ fi # Define the identity of the package. PACKAGE='dviout-util--tex-live-' - VERSION='20200117' + VERSION='20200501' cat >>confdefs.h <<_ACEOF @@ -13893,7 +13893,7 @@ Usage: $0 [OPTIONS] Report bugs to ." lt_cl_version="\ -dviout-util (TeX Live) config.lt 20200117 +dviout-util (TeX Live) config.lt 20200501 configured by $0, generated by GNU Autoconf 2.69. Copyright (C) 2011 Free Software Foundation, Inc. @@ -15502,7 +15502,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by dviout-util (TeX Live) $as_me 20200117, which was +This file was extended by dviout-util (TeX Live) $as_me 20200501, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15568,7 +15568,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -dviout-util (TeX Live) config.status 20200117 +dviout-util (TeX Live) config.status 20200501 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/Build/source/texk/dviout-util/configure.ac b/Build/source/texk/dviout-util/configure.ac index 71566ee671b..afb5a893605 100644 --- a/Build/source/texk/dviout-util/configure.ac +++ b/Build/source/texk/dviout-util/configure.ac @@ -6,7 +6,7 @@ dnl This file is free software; the copyright holder dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl -AC_INIT([dviout-util (TeX Live)], [20200117], [tex-k@tug.org]) +AC_INIT([dviout-util (TeX Live)], [20200501], [tex-k@tug.org]) AC_PREREQ([2.65]) AC_CONFIG_SRCDIR([dvispc.c]) AC_CONFIG_AUX_DIR([../../build-aux]) diff --git a/Build/source/texk/dviout-util/dvispc.c b/Build/source/texk/dviout-util/dvispc.c index 00472045ce1..431631ec227 100644 --- a/Build/source/texk/dviout-util/dvispc.c +++ b/Build/source/texk/dviout-util/dvispc.c @@ -96,6 +96,8 @@ #include #endif +#include "common.h" + #define uchar unsigned char #define uint unsigned int #define Long int @@ -471,6 +473,7 @@ void usage(int ex) " pdf specials: pdf:bcolor, pdf:ecolor, pdf:bgcolor\n" " tpic specials: pn\n" ); + fprintf(stderr, "\nEmail bug reports to %s.\n", BUG_ADDRESS); exit(ex); } -- cgit v1.2.3