[7145] texi2dvi small changes

[Gavin D. Smith]

Revision: 7145
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7145
Author:   gavin
Date:     2016-05-04 06:11:44 +0000 (Wed, 04 May 2016)
Log Message:
-----------
texi2dvi small changes

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2016-05-03 18:14:49 UTC (rev 7144)
+++ trunk/ChangeLog     2016-05-04 06:11:44 UTC (rev 7145)
@@ -1,3 +1,14 @@
+2016-05-05  Gavin Smith  <address@hidden>
+
+       * util/texi2dvi (usage): Change wording of documentation of 
+       --mostly-clean option.
+       (input_file_name_decode): Remove unused 'in_dir_abs' variable.
+       (cd_orig): Don't use ${VAR#WORD} feature because it doesn't 
+       exist in some older shells.  Use sed instead.
+       (cd_dir): Don't use \+ feature of sed because it is said not to 
+       be portable.
+       (move_to_dest): Remove commented-out echo line.
+
 2016-05-03  Gavin Smith  <address@hidden>
 
        * util/texi2dvi (cd_dir): New function, to change directory
@@ -24,7 +35,6 @@
        'build_mode'.  (No functional change.)
        (compile): Change a comment.
 
-
 2016-05-01  Gavin Smith  <address@hidden>
 
        * util/texi2dvi (usage): Streamline help message.  Don't mention 

Modified: trunk/util/texi2dvi
===================================================================
--- trunk/util/texi2dvi 2016-05-03 18:14:49 UTC (rev 7144)
+++ trunk/util/texi2dvi 2016-05-04 06:11:44 UTC (rev 7145)
@@ -145,9 +145,9 @@
   -q, --quiet         no output unless errors (implies --batch)
   -v, --version       display version information and exit successfully
   -V, --verbose       report on what is done
-  --max-iterations=N   don't process files more than N times [$max_iters]
-  --mostly-clean      remove the auxiliary files and directories,
-                         but not the output
+  --max-iterations=N  don't process files more than N times [$max_iters]
+  --mostly-clean      remove auxiliary files or directories from
+                          previous runs (but not the output)
 
 Output format:
       --dvi     output a DVI file [default]
@@ -242,7 +242,7 @@
 {
   cd "$1"
   # Replace each path component with ".." and remove any trailing slash.
-  cdd_prefix=`echo "$1" | sed -e 's/[^/\\]\+/../g' -e 's/[/\\]$//'`
+  cdd_prefix=`echo "$1" | sed -e 's/[^/\\][^/\\]*/../g' -e 's/[/\\]$//'`
 
   # Add this prefix for some variables.
   for cdd_dir in $path_vars; do
@@ -276,8 +276,19 @@
   cd "$orig_pwd" || exit 1
   
   # strip off ../../ from some variables
+  # quote string by placing \ before each character (each either . or /)
+  cdd_prefix_q=`echo "$cdd_prefix" | sed -e 's/\\(.\\)/\\\\\\1/g'`
+  # after backslashes quote within backquoted string:
+  #             echo "$cdd_prefix" | sed -e 's/\(.\)/\\\1/g'
+
   for cdo_dir in $path_vars ; do
-    eval $cdo_dir=\${$cdo_dir#\$cdd_prefix/}
+    eval "$cdo_dir=\`echo \"\$$cdo_dir\" | sed -e 's/^$cdd_prefix_q\///'\`"
+
+    # Becomes
+    # CDO_DIR=`echo "$CDO_DIR" | sed -e 's/^CDD_PREFIX//'`
+
+    # eval $cdo_dir=\${$cdo_dir#\$cdd_prefix/}
+    # would be simpler, but doesn't work in older shells.
   done
 }
 
@@ -1665,8 +1676,6 @@
 #   The filename given on the commmand line, but cleaned of TeX commands.
 # - IN_DIR
 #   The directory containing the input file.
-# - IN_DIR_ABS
-#   The absolute directory of the input file.
 # - IN_BASE
 #   The input file base name (no directory part).
 # - IN_NOEXT
@@ -1706,7 +1715,6 @@
 
   # Get the name of the current directory.
   in_dir=`func_dirname "$command_line_filename"`
-  in_dir_abs=`absolute "$in_dir"`
 
   # Strip directory part but leave extension.
   in_base=`basename "$command_line_filename"`