summaryrefslogtreecommitdiff
path: root/dviware
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2023-08-12 03:03:37 +0000
committerNorbert Preining <norbert@preining.info>2023-08-12 03:03:37 +0000
commit1671b301fbe6cef52ccfa6085824e9677703e023 (patch)
tree351f5c112c4ca58d43310883a432d05d9c60670b /dviware
parent3bfa493a1fafa36f78e84022bfe6511b23f51781 (diff)
CTAN sync 202308120303
Diffstat (limited to 'dviware')
-rw-r--r--dviware/dvidvi/ChangeLog8
-rw-r--r--dviware/dvidvi/dvidvi.c12
-rwxr-xr-xdviware/dvidvi/dvidvi.test26
3 files changed, 35 insertions, 11 deletions
diff --git a/dviware/dvidvi/ChangeLog b/dviware/dvidvi/ChangeLog
index 59f4f4ac78..2945e0bbe5 100644
--- a/dviware/dvidvi/ChangeLog
+++ b/dviware/dvidvi/ChangeLog
@@ -1,3 +1,11 @@
+2023-08-11 TANAKA Takuji <ttk@t-lab.opal.ne.jp>
+
+ * dvidvi.c:
+ Skip Unicode conversion if command line arguments are missing
+ in order to prevent unwanted looking for texmf.cnf. (Windows only)
+ * dvidvi.test:
+ Make easier to test on Windows.
+
2021-02-19 Karl Berry <karl@freefriends.org>
* dvidvi.test,
diff --git a/dviware/dvidvi/dvidvi.c b/dviware/dvidvi/dvidvi.c
index 0e2b9b0f2a..1749c566d1 100644
--- a/dviware/dvidvi/dvidvi.c
+++ b/dviware/dvidvi/dvidvi.c
@@ -1256,11 +1256,13 @@ int main(int argc, char *argv[])
#if defined(WIN32) && defined(KPATHSEA)
int ac;
char **av, *enc;
- kpse_set_program_name(argv[0], "dvidvi");
- enc = kpse_var_value("command_line_encoding");
- if (get_command_line_args_utf8(enc, &ac, &av)) {
- argc = ac;
- argv = av;
+ if (argc>1) {
+ kpse_set_program_name(argv[0], "dvidvi");
+ enc = kpse_var_value("command_line_encoding");
+ if (get_command_line_args_utf8(enc, &ac, &av)) {
+ argc = ac;
+ argv = av;
+ }
}
#endif
processargs(argc, argv) ;
diff --git a/dviware/dvidvi/dvidvi.test b/dviware/dvidvi/dvidvi.test
index 2f013ee87f..9719ef72d4 100755
--- a/dviware/dvidvi/dvidvi.test
+++ b/dviware/dvidvi/dvidvi.test
@@ -1,23 +1,37 @@
#! /bin/sh -vx
-# $Id: dvidvi.test 57800 2021-02-19 16:45:39Z karl $
+# $Id: dvidvi.test 67877 2023-08-11 11:46:10Z takuji $
# Copyright 2017-2021 Karl Berry <tex-live@tug.org>
# Copyright 2011 Peter Breitenlohner <tex-live@tug.org>
# You may freely use, modify and/or distribute this file.
+BinDir=${BinDir:-.}
+ExeExt=${ExeExt:-}
+_dvidvi=$BinDir/dvidvi$ExeExt
+
+# pre-generated test results in the repository are stored in LF
+# but the output might be written in CRLF on some platform.
+# if 'diff --strip-trailing-cr' is available, exploit it.
+# (useful for tests on win32 binaries run on MSYS shell)
+DIFF="diff"
+$DIFF --strip-trailing-cr $0 $0 \
+ && DIFF="diff --strip-trailing-cr" || echo
+
+
rm -rf play*
cp $srcdir/tests/play.dvi .
-./dvidvi -f 5 -l @25 -m'4:-3,0(6,0)' play playout 2>playout.2
+$_dvidvi -f 5 -l @25 -m'4:-3,0(6,0)' play playout 2>playout.2
#
# Eliminate version number for the comparison.
grep -v '^This is dvidvi' playout.2 \
-| diff - $srcdir/tests/playout.2 \
+| $DIFF - $srcdir/tests/playout.2 \
|| exit 1
rm -rf play*
cp $srcdir/tests/playtate.dvi .
-./dvidvi -f 5 -l @25 -m'4:-3,0(6,0)' playtate playout 2>playout.3
+$_dvidvi -f 5 -l @25 -m'4:-3,0(6,0)' playtate playout 2>playout.3
#
grep -v '^This is dvidvi' playout.3 \
-| diff - $srcdir/tests/playout.3 \
-|| exit 1
+| $DIFF - $srcdir/tests/playout.3 \
+|| exit 2
+exit 0