Mercurial > octave

changeset 21403:9429c39994f8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix quoting in generated shell scripts (bug #46063) * subst-config-vals.in.sh, subst-cross-config-vals.in.sh: Use " to quote substitution of config_opts. USe " to quote sed commands for substituting MKOCTFILE variables. * mk-mxarray-h.in.sh, mk-version-h.in.sh, subst-config-vals.in.sh, subst-cross-config-vals.in.sh, subst-default-vals.in.sh, subst-script-vals.in.sh: Use "\"...\"" to quote RHS of variable assignment instead of "'...'".
author John W. Eaton <jwe@octave.org>
date Fri, 04 Mar 2016 20:04:45 -0500
parents 8017ce5b2a6e
children 0daaca299102
files build-aux/mk-mxarray-h.in.sh build-aux/mk-version-h.in.sh build-aux/subst-config-vals.in.sh build-aux/subst-cross-config-vals.in.sh build-aux/subst-default-vals.in.sh build-aux/subst-script-vals.in.sh
diffstat 6 files changed, 26 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/build-aux/mk-mxarray-h.in.sh	Fri Mar 04 22:24:47 2016 +1100
+++ b/build-aux/mk-mxarray-h.in.sh	Fri Mar 04 20:04:45 2016 -0500
@@ -38,7 +38,7 @@
   while echo "$tmp" | grep '\${[A-Za-z_][A-Za-z0-9_]*}' > /dev/null; do
     eval tmp="$tmp"
   done
-  eval $1="'$tmp'"
+  eval $1="\"$tmp\""
 }
 
 expand_var OCTAVE_IDX_TYPE
--- a/build-aux/mk-version-h.in.sh	Fri Mar 04 22:24:47 2016 +1100
+++ b/build-aux/mk-version-h.in.sh	Fri Mar 04 20:04:45 2016 -0500
@@ -44,7 +44,7 @@
   while echo "$tmp" | grep '\${[A-Za-z_][A-Za-z0-9_]*}' > /dev/null; do
     eval tmp="$tmp"
   done
-  eval $1="'$tmp'"
+  eval $1="\"$tmp\""
 }
 
 expand_var OCTAVE_API_VERSION
--- a/build-aux/subst-config-vals.in.sh	Fri Mar 04 22:24:47 2016 +1100
+++ b/build-aux/subst-config-vals.in.sh	Fri Mar 04 20:04:45 2016 -0500
@@ -180,7 +180,8 @@
 Z_CPPFLAGS='@Z_CPPFLAGS@'
 Z_LDFLAGS='@Z_LDFLAGS@'
 Z_LIBS='@Z_LIBS@'
-config_opts='@config_opts@'
+## this on uses ' to quote individual arguments, so use " here.
+config_opts="@config_opts@"
 
 ## These must use " so that embedded variables are interpolated.
 
@@ -192,7 +193,7 @@
   while echo "$tmp" | grep '\${[A-Za-z_][A-Za-z0-9_]*}' > /dev/null; do
     eval tmp="$tmp"
   done
-  eval $1="'$tmp'"
+  eval $1="\"$tmp\""
 }
 
 expand_var NO_OCT_FILE_STRIP
@@ -447,14 +448,14 @@
   -e "s|%OCTAVE_CONF_MAGICK_CPPFLAGS%|\"${MAGICK_CPPFLAGS}\"|" \
   -e "s|%OCTAVE_CONF_MAGICK_LDFLAGS%|\"${MAGICK_LDFLAGS}\"|" \
   -e "s|%OCTAVE_CONF_MAGICK_LIBS%|\"${MAGICK_LIBS}\"|" \
-  -e 's|%OCTAVE_CONF_MKOCTFILE_AR%|\"${MKOCTFILE_AR}\"|' \
-  -e 's|%OCTAVE_CONF_MKOCTFILE_CC%|\"${MKOCTFILE_CC}\"|' \
-  -e 's|%OCTAVE_CONF_MKOCTFILE_CXX%|\"${MKOCTFILE_CXX}\"|' \
-  -e 's|%OCTAVE_CONF_MKOCTFILE_DL_LD%|\"${MKOCTFILE_DL_LD}\"|' \
-  -e 's|%OCTAVE_CONF_MKOCTFILE_DL_LDFLAGS%|\"${MKOCTFILE_DL_LDFLAGS}\"|' \
-  -e 's|%OCTAVE_CONF_MKOCTFILE_F77%|\"${MKOCTFILE_F77}\"|' \
-  -e 's|%OCTAVE_CONF_MKOCTFILE_LD_CXX%|\"${MKOCTFILE_LD_CXX}\"|' \
-  -e 's|%OCTAVE_CONF_MKOCTFILE_RANLIB%|\"${MKOCTFILE_RANLIB}\"|' \
+  -e "s|%OCTAVE_CONF_MKOCTFILE_AR%|\"${MKOCTFILE_AR}\"|" \
+  -e "s|%OCTAVE_CONF_MKOCTFILE_CC%|\"${MKOCTFILE_CC}\"|" \
+  -e "s|%OCTAVE_CONF_MKOCTFILE_CXX%|\"${MKOCTFILE_CXX}\"|" \
+  -e "s|%OCTAVE_CONF_MKOCTFILE_DL_LD%|\"${MKOCTFILE_DL_LD}\"|" \
+  -e "s|%OCTAVE_CONF_MKOCTFILE_DL_LDFLAGS%|\"${MKOCTFILE_DL_LDFLAGS}\"|" \
+  -e "s|%OCTAVE_CONF_MKOCTFILE_F77%|\"${MKOCTFILE_F77}\"|" \
+  -e "s|%OCTAVE_CONF_MKOCTFILE_LD_CXX%|\"${MKOCTFILE_LD_CXX}\"|" \
+  -e "s|%OCTAVE_CONF_MKOCTFILE_RANLIB%|\"${MKOCTFILE_RANLIB}\"|" \
   -e "s|%OCTAVE_CONF_OCTAVE_LINK_DEPS%|\"${OCTAVE_LINK_DEPS}\"|" \
   -e "s|%OCTAVE_CONF_OCTAVE_LINK_OPTS%|\"${OCTAVE_LINK_OPTS}\"|" \
   -e "s|%OCTAVE_CONF_OCTINCLUDEDIR%|\"${octincludedir}\"|" \
--- a/build-aux/subst-cross-config-vals.in.sh	Fri Mar 04 22:24:47 2016 +1100
+++ b/build-aux/subst-cross-config-vals.in.sh	Fri Mar 04 20:04:45 2016 -0500
@@ -184,7 +184,8 @@
 Z_CPPFLAGS='@Z_CPPFLAGS@'
 Z_LDFLAGS='@Z_LDFLAGS@'
 Z_LIBS='@Z_LIBS@'
-config_opts='@config_opts@'
+## this on uses ' to quote individual arguments, so use " here.
+config_opts="@config_opts@"
 
 ## These must use " so that embedded variables are interpolated.
 
@@ -196,7 +197,7 @@
   while echo "$tmp" | grep '\${[A-Za-z_][A-Za-z0-9_]*}' > /dev/null; do
     eval tmp="$tmp"
   done
-  eval $1="'$tmp'"
+  eval $1="\"$tmp\""
 }
 
 expand_var NO_OCT_FILE_STRIP
@@ -443,14 +444,14 @@
     -e "s|%OCTAVE_CONF_MAGICK_CPPFLAGS%|\"${MAGICK_CPPFLAGS}\"|" \
     -e "s|%OCTAVE_CONF_MAGICK_LDFLAGS%|\"${MAGICK_LDFLAGS}\"|" \
     -e "s|%OCTAVE_CONF_MAGICK_LIBS%|\"${MAGICK_LIBS}\"|" \
-    -e 's|%OCTAVE_CONF_MKOCTFILE_AR%|\"${AR}\"|' \
-    -e 's|%OCTAVE_CONF_MKOCTFILE_CC%|\"${CC}\"|' \
-    -e 's|%OCTAVE_CONF_MKOCTFILE_CXX%|\"${CXX}\"|' \
-    -e 's|%OCTAVE_CONF_MKOCTFILE_DL_LD%|\"${DL_LD}\"|' \
-    -e 's|%OCTAVE_CONF_MKOCTFILE_DL_LDFLAGS%|\"${DL_LDFLAGS}\"|' \
-    -e 's|%OCTAVE_CONF_MKOCTFILE_F77%|\"${F77}\"|' \
-    -e 's|%OCTAVE_CONF_MKOCTFILE_LD_CXX%|\"${LD_CXX}\"|' \
-    -e 's|%OCTAVE_CONF_MKOCTFILE_RANLIB%|\"${RANLIB}\"|' \
+    -e "s|%OCTAVE_CONF_MKOCTFILE_AR%|\"${AR}\"|" \
+    -e "s|%OCTAVE_CONF_MKOCTFILE_CC%|\"${CC}\"|" \
+    -e "s|%OCTAVE_CONF_MKOCTFILE_CXX%|\"${CXX}\"|" \
+    -e "s|%OCTAVE_CONF_MKOCTFILE_DL_LD%|\"${DL_LD}\"|" \
+    -e "s|%OCTAVE_CONF_MKOCTFILE_DL_LDFLAGS%|\"${DL_LDFLAGS}\"|" \
+    -e "s|%OCTAVE_CONF_MKOCTFILE_F77%|\"${F77}\"|" \
+    -e "s|%OCTAVE_CONF_MKOCTFILE_LD_CXX%|\"${LD_CXX}\"|" \
+    -e "s|%OCTAVE_CONF_MKOCTFILE_RANLIB%|\"${RANLIB}\"|" \
     -e "s|%OCTAVE_CONF_OCTAVE_LINK_DEPS%|\"${OCTAVE_LINK_DEPS}\"|" \
     -e "s|%OCTAVE_CONF_OCTAVE_LINK_OPTS%|\"${OCTAVE_LINK_OPTS}\"|" \
     -e "s|%OCTAVE_CONF_OCTINCLUDEDIR%|\"${octincludedir}\"|" \
--- a/build-aux/subst-default-vals.in.sh	Fri Mar 04 22:24:47 2016 +1100
+++ b/build-aux/subst-default-vals.in.sh	Fri Mar 04 20:04:45 2016 -0500
@@ -80,7 +80,7 @@
   while echo "$tmp" | grep '\${[A-Za-z_][A-Za-z0-9_]*}' > /dev/null; do
     eval tmp="$tmp"
   done
-  eval $1="'$tmp'"
+  eval $1="\"$tmp\""
 }
 
 expand_var archlibdir
--- a/build-aux/subst-script-vals.in.sh	Fri Mar 04 22:24:47 2016 +1100
+++ b/build-aux/subst-script-vals.in.sh	Fri Mar 04 20:04:45 2016 -0500
@@ -43,7 +43,7 @@
   while echo "$tmp" | grep '\${[A-Za-z_][A-Za-z0-9_]*}' > /dev/null; do
     eval tmp="$tmp"
   done
-  eval $1="'$tmp'"
+  eval $1="\"$tmp\""
 }
 
 expand_var AWK