First search for an input file with a suffix .xdv or .dvi in (x)dvipdfmx in branch2018.

git-svn-id: svn://tug.org/texlive/branches/branch2018/Build/source@48683 c570f23f-e606-0410-a88d-b1316a301751

Author: Akira Kakuto

texk/dvipdfm-x/ChangeLog

@@ -1,11 +1,28 @@
+2018-05-23  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
+
+	* dvi.c: First search for an input file with a suffix .xdv
+	or .dvi. Report from Andreas Scherer:
+	http://tug.org/pipermail/tex-k/2018-May/002882.html.
+
+2018-05-16  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
+
+	* pdfparse.c: Revert. The changes on 2018-05-14 must be
+	problematic. Again, kanji characters including 0x5c can't be
+	used as names of image files in (e)-pTeX.
+
+2018-05-14  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
+
+	* pdfparse.c: Allow image file names including 0x5c for
+	(e)-pTeX in CP932-like system (Windows only).
+
 2018-05-06  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
 
 	* tt_cmap.c: Revert a part of changes in 2017-12-09,
 	which breaks to give tounicode entries for ligatures.
 	http://tug.org/pipermail/tex-live/2018-May/041608.html.
 	* configure.ac: Version 20180506.
 
- 2018-04-28  Stefan Br\"uns  <stefan.bruens@rwth-aachen.de>
+2018-04-28  Stefan Br\"uns  <stefan.bruens@rwth-aachen.de>
 
 	* pngimage.c: Fix a bug which causes a segfault with 1/2/4-bit
 	transparent indexed PNGs.

texk/dvipdfm-x/dvi.c

@@ -1,6 +1,6 @@
 /* This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
-    Copyright (C) 2002-2017 by Jin-Hwan Cho and Shunsaku Hirata,
+    Copyright (C) 2002-2018 by Jin-Hwan Cho and Shunsaku Hirata,
     the dvipdfmx project team.
 
     Copyright (C) 2012-2015 by Khaled Hosny <khaledhosny@eglug.org>
@@ -1999,21 +1999,24 @@ dvi_init (char *dvi_filename, double mag)
     else
       ungetc(ch, dvi_file);
   } else {
-    dvi_file = MFOPEN(dvi_filename, FOPEN_RBIN_MODE);
-    if (!dvi_file) {
-      char *p;
-      p = strrchr(dvi_filename, '.');
-      if (p == NULL || (!FILESTRCASEEQ(p, ".dvi") &&
-                        !FILESTRCASEEQ(p, ".xdv"))) {
-        strcat(dvi_filename, ".xdv");
+    char *p, *saved_orig_name;
+    dvi_file = NULL;
+    saved_orig_name = xstrdup(dvi_filename);
+    p = strrchr(dvi_filename, '.');
+    if (p == NULL || (!FILESTRCASEEQ(p, ".dvi") &&
+                      !FILESTRCASEEQ(p, ".xdv"))) {
+      strcat(dvi_filename, ".xdv");
+      dvi_file = MFOPEN(dvi_filename, FOPEN_RBIN_MODE);
+      if (!dvi_file) {
+        dvi_filename[strlen(dvi_filename) - 4] = '\0';
+        strcat(dvi_filename, ".dvi");
         dvi_file = MFOPEN(dvi_filename, FOPEN_RBIN_MODE);
-        if (!dvi_file) {
-          dvi_filename[strlen(dvi_filename) - 4] = '\0';
-          strcat(dvi_filename, ".dvi");
-          dvi_file = MFOPEN(dvi_filename, FOPEN_RBIN_MODE);
-        }
       }
     }
+    if (!dvi_file)
+      dvi_file = MFOPEN(saved_orig_name, FOPEN_RBIN_MODE);
+    free(saved_orig_name);
+
     if (!dvi_file) {
       ERROR("Could not open specified DVI (or XDV) file: %s",
             dvi_filename);