[7222] pass input file as separate argument for MSYS path conversion

[gavinsmith0123]

Revision: 7222
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7222
Author:   gavin
Date:     2016-06-13 17:14:15 +0000 (Mon, 13 Jun 2016)
Log Message:
-----------
pass input file as separate argument for MSYS path conversion

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/util/texi2dvi

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2016-06-12 20:00:08 UTC (rev 7221)
+++ trunk/ChangeLog     2016-06-13 17:14:15 UTC (rev 7222)
@@ -1,3 +1,10 @@
+2016-06-13  Vincent Bela\xEFche  <address@hidden>
+
+       * util/texi2dvi (run_tex): Inline function listing unusual 
+       characters and pass through literal backslash-newline sequence 
+       to sed by use of single quotes.  Also, pass input file as a 
+       separate argument for the benefit of MSYS path conversion.
+
 2016-06-12  Gavin Smith  <address@hidden>
 
        * tp/Texinfo/Parser.pm (_print_tree),

Modified: trunk/util/texi2dvi
===================================================================
--- trunk/util/texi2dvi 2016-06-12 20:00:08 UTC (rev 7221)
+++ trunk/util/texi2dvi 2016-06-13 17:14:15 UTC (rev 7222)
@@ -918,12 +918,6 @@
   fi
 }
 
-list_funnies ()
-{
-  echo "$in_input" \
-    | $SED -e 's![^}#$%&^_{~]!!g' -e 's!\(.\)!\1\
-!g' | uniq
-}
 
 # run_tex - Run TeX as "$tex $in_input", taking care of errors and logs.
 run_tex ()
@@ -933,7 +927,9 @@
   # Check for any unusual characters in the filename.
   # However, >, \ and any whitespace characters are not supported
   # filenames.
-  in_input_funnies=`list_funnies`
+  in_input_funnies=`echo "$in_input" \
+    | $SED -e 's![^}#$%&^_{~]!!g' -e 's!\(.\)!\1\''
+!g' | uniq`
 
   if test -n "$in_input_funnies" ; then
     # Make > an end group character, as it's unlikely to appear in
@@ -948,8 +944,7 @@
     done
 
     # Set \toks0 to "\input FILENAME\relax"
-    tex_cmd="$tex_cmd'${escape}toks0${escape}bgroup"
-    tex_cmd="$tex_cmd${escape}input $in_input${escape}relax>"
+    tex_cmd="$tex_cmd '${escape}toks0${escape}bgroup${escape}input' 
'$in_input' '${escape}relax>"
 
     # Expand \toks0 after the end of the group
     tex_cmd="$tex_cmd${escape}expandafter${escape}egroup"