As promised, here is a first cut at an echo audit of ltmain.
I even found one $ECHO "X.." that was missing a corresponding $Xsed
entirely. This means we are not testing that code path. :-/
Now while there are many things we do not test..
BTW, is there a way to get at source code coverage in shell scripts?
I had already thought of inserting
echo $LINENO >>$coverage_fd
every other line of ltmain, just for testing purposes, so that I could
adapt stresstest to the missing bits. Here documents and multi-line
quotes make this rather tedious handwork, however. Thoughts?
For you to digest (or not): HEAD and branch-2-0 patches for echo audit.
Regards,
Ralf
* config/ltmain.m4sh: Audit use of echo vs $ECHO.
Reported by Robert Ögren <[EMAIL PROTECTED]> and others.
Index: config/ltmain.m4sh
===================================================================
RCS file: /cvsroot/libtool/libtool/config/ltmain.m4sh,v
retrieving revision 1.64
diff -u -r1.64 ltmain.m4sh
--- config/ltmain.m4sh 22 Apr 2005 10:10:30 -0000 1.64
+++ config/ltmain.m4sh 25 Apr 2005 15:53:06 -0000
@@ -668,7 +668,7 @@
esac
;;
esac
- $ECHO $win32_libid_type
+ $ECHO "$win32_libid_type"
}
@@ -778,7 +778,7 @@
if test "$dlself" = yes; then
func_echo "generating symbol list for \`$output'"
- $opt_dry_run || $ECHO ': @PROGRAM@ ' > "$nlist"
+ $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
# Add our own program objects to the symbol list.
progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" |
$NL2SP`
@@ -809,7 +809,7 @@
eval "${SED} -n -e '/^: @[EMAIL PROTECTED]/d' -e 's/^.*
\(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
case $host in
*cygwin* | *mingw* )
- eval "${ECHO} EXPORTS "'> "$output_objdir/$outputname.def"'
+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
eval 'cat "$export_symbols" >>
"$output_objdir/$outputname.def"'
;;
esac
@@ -819,7 +819,7 @@
eval "${SED} -e 's/\([[ ]][[.*^$]]\)/\\\1/g' -e 's/^/ /' -e
's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
case $host in
*cygwin | *mingw* )
- eval "${ECHO} EXPORTS "'> "$output_objdir/$outputname.def"'
+ eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
eval 'cat "$output_objdir/$outputname.exp" >>
"$output_objdir/$outputname.def"'
;;
esac
@@ -1855,9 +1855,9 @@
if test -n "$inst_prefix_dir"; then
# Stick the inst_prefix_dir data into the link command.
- relink_command=`$ECHO "$relink_command" | $SED "[EMAIL
PROTECTED]@%-inst-prefix-dir $inst_prefix_dir%"`
+ relink_command=`$ECHO "X$relink_command" | $Xsed -e "[EMAIL
PROTECTED]@%-inst-prefix-dir $inst_prefix_dir%"`
else
- relink_command=`$ECHO "$relink_command" | $SED "[EMAIL
PROTECTED]@%%"`
+ relink_command=`$ECHO "X$relink_command" | $Xsed -e "[EMAIL
PROTECTED]@%%"`
fi
func_warning "relinking \`$file'"
@@ -2603,7 +2603,7 @@
esac
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
- testbindir=`${ECHO} "$dir" | ${SED} -e 's*/lib$*/bin*'`
+ testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
case :$dllsearchpath: in
*":$dir:"*) ;;
*) dllsearchpath="$dllsearchpath:$dir";;
@@ -3301,7 +3301,7 @@
match_pattern*)
set dummy $deplibs_check_method; shift
match_pattern_regex=`expr "$deplibs_check_method" : "$1
\(.*\)"`
- if eval $ECHO \"X$deplib\" 2>/dev/null | $Xsed -e 10q \
+ if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \
| $EGREP "$match_pattern_regex" > /dev/null; then
valid_a_lib=yes
fi
@@ -3695,7 +3695,7 @@
shift
realname="$1"
shift
- libname=`eval \\$ECHO \"$libname_spec\"`
+ libname=`eval "\\$ECHO \"$libname_spec\""`
# use dlname if we got it. it's perfectly good, no?
if test -n "$dlname"; then
soname="$dlname"
@@ -4465,7 +4465,7 @@
;;
$output_objdir/$outputname | $output_objdir/$libname.* |
$output_objdir/${libname}${release}.*)
if test "X$precious_files_regex" != "X"; then
- if $ECHO $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
+ if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null
2>&1
then
continue
fi
@@ -4490,7 +4490,7 @@
# Eliminate all temporary directories.
for path in $notinst_path; do
lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e 's% $path % %g'`
- deplibs=`$ECHO "$deplibs " | ${SED} -e 's% -L$path % %g'`
+ deplibs=`$ECHO "X$deplibs " | $Xsed -e 's% -L$path % %g'`
dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e 's% -L$path %
%g'`
done
@@ -4604,8 +4604,8 @@
esac
fi
if test -n "$i" ; then
- libname=`eval \\$ECHO \"$libname_spec\"`
- deplib_matches=`eval \\$ECHO \"$library_names_spec\"`
+ libname=`eval "\\$ECHO \"$libname_spec\""`
+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
set dummy $deplib_matches; shift
deplib_match=$1
if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
@@ -4646,8 +4646,8 @@
esac
fi
if test -n "$i" ; then
- libname=`eval \\$ECHO \"$libname_spec\"`
- deplib_matches=`eval \\$ECHO \"$library_names_spec\"`
+ libname=`eval "\\$ECHO \"$libname_spec\""`
+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
set dummy $deplib_matches; shift
deplib_match=$1
if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ;
then
@@ -4693,7 +4693,7 @@
esac
fi
if test -n "$a_deplib" ; then
- libname=`eval \\$ECHO \"$libname_spec\"`
+ libname=`eval "\\$ECHO \"$libname_spec\""`
for i in $lib_search_path $sys_lib_search_path
$shlib_search_path; do
potential_libs=`ls $i/$libname[[.-]]* 2>/dev/null`
for potent_lib in $potential_libs; do
@@ -4762,12 +4762,12 @@
esac
fi
if test -n "$a_deplib" ; then
- libname=`eval \\$ECHO \"$libname_spec\"`
+ libname=`eval "\\$ECHO \"$libname_spec\""`
for i in $lib_search_path $sys_lib_search_path
$shlib_search_path; do
potential_libs=`ls $i/$libname[[.-]]* 2>/dev/null`
for potent_lib in $potential_libs; do
potlib="$potent_lib" # see symlink-check above in
file_magic test
- if eval $ECHO \"X$potent_lib\" 2>/dev/null | $Xsed -e 10q |
\
+ if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e
10q | \
$EGREP "$match_pattern_regex" > /dev/null; then
newdeplibs="$newdeplibs $a_deplib"
a_deplib=""
@@ -5009,7 +5009,7 @@
fi
if test -n "$export_symbols" && test -n "$include_expsyms"; then
- $opt_dry_run || eval '$ECHO "X$include_expsyms" | $SP2NL >>
"$export_symbols"'
+ $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >>
"$export_symbols"'
fi
tmp_deplibs=
@@ -5374,8 +5374,8 @@
# Create an invalid libtool object if no PIC, so that we don't
# accidentally link it into a program.
- # $show "$ECHO timestamp > $libobj"
- # $opt_dry_run || eval "$ECHO timestamp > $libobj" || exit $?
+ # $show "echo timestamp > $libobj"
+ # $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
exit $EXIT_SUCCESS
fi
@@ -6812,7 +6812,7 @@
# ### END LIBTOOL TAG CONFIG: disable-shared
# ### BEGIN LIBTOOL TAG CONFIG: disable-static
-build_old_libs=`case $build_libtool_libs in yes) $ECHO no;; *) $ECHO yes;;
esac`
+build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
# ### END LIBTOOL TAG CONFIG: disable-static
# Local Variables:
* config/ltmain.m4sh: Audit use of echo vs $ECHO.
Reported by Robert Ögren <[EMAIL PROTECTED]> and others.
Index: config/ltmain.m4sh
===================================================================
RCS file: /cvsroot/libtool/libtool/config/ltmain.m4sh,v
retrieving revision 1.1.2.50
diff -u -r1.1.2.50 ltmain.m4sh
--- config/ltmain.m4sh 22 Apr 2005 10:03:59 -0000 1.1.2.50
+++ config/ltmain.m4sh 25 Apr 2005 16:01:54 -0000
@@ -624,7 +624,7 @@
esac
;;
esac
- $ECHO $win32_libid_type
+ $ECHO "$win32_libid_type"
}
@@ -735,7 +735,7 @@
if test "$dlself" = yes; then
func_echo "generating symbol list for \`$output'"
- test -z "$run" && $ECHO ': @PROGRAM@ ' > "$nlist"
+ test -z "$run" && echo ': @PROGRAM@ ' > "$nlist"
# Add our own program objects to the symbol list.
progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" |
$NL2SP`
@@ -761,7 +761,7 @@
$run eval "${SED} -n -e '/^: @[EMAIL PROTECTED]/d' -e 's/^.*
\(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
case $host in
*cygwin* | *mingw* )
- $run eval "${ECHO} EXPORTS "'> "$output_objdir/$outputname.def"'
+ $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
$run eval 'cat "$export_symbols" >>
"$output_objdir/$outputname.def"'
;;
esac
@@ -769,7 +769,7 @@
$run eval "${SED} -e 's/\([[ ]][[.*^$]]\)/\\\1/g' -e 's/^/ /' -e
's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
case $host in
*cygwin | *mingw* )
- $run eval "${ECHO} EXPORTS "'> "$output_objdir/$outputname.def"'
+ $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
$run eval 'cat "$output_objdir/$outputname.exp" >>
"$output_objdir/$outputname.def"'
;;
esac
@@ -1842,9 +1842,9 @@
if test -n "$inst_prefix_dir"; then
# Stick the inst_prefix_dir data into the link command.
- relink_command=`$ECHO "$relink_command" | $SED "[EMAIL
PROTECTED]@%-inst-prefix-dir $inst_prefix_dir%"`
+ relink_command=`$ECHO "X$relink_command" | $Xsed -e "[EMAIL
PROTECTED]@%-inst-prefix-dir $inst_prefix_dir%"`
else
- relink_command=`$ECHO "$relink_command" | $SED "[EMAIL
PROTECTED]@%%"`
+ relink_command=`$ECHO "X$relink_command" | $Xsed -e "[EMAIL
PROTECTED]@%%"`
fi
func_warning "relinking \`$file'"
@@ -2598,7 +2598,7 @@
esac
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
- testbindir=`${ECHO} "$dir" | ${SED} -e 's*/lib$*/bin*'`
+ testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
case :$dllsearchpath: in
*":$dir:"*) ;;
*) dllsearchpath="$dllsearchpath:$dir";;
@@ -3295,7 +3295,7 @@
match_pattern*)
set dummy $deplibs_check_method; shift
match_pattern_regex=`expr "$deplibs_check_method" : "$1
\(.*\)"`
- if eval $ECHO \"X$deplib\" 2>/dev/null | $Xsed -e 10q \
+ if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \
| $EGREP "$match_pattern_regex" > /dev/null; then
valid_a_lib=yes
fi
@@ -3687,7 +3687,7 @@
shift
realname="$1"
shift
- libname=`eval \\$ECHO \"$libname_spec\"`
+ libname=`eval "\\$ECHO \"$libname_spec\""`
# use dlname if we got it. it's perfectly good, no?
if test -n "$dlname"; then
soname="$dlname"
@@ -4453,7 +4453,7 @@
;;
$output_objdir/$outputname | $output_objdir/$libname.* |
$output_objdir/${libname}${release}.*)
if test "X$precious_files_regex" != "X"; then
- if $ECHO $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
+ if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null
2>&1
then
continue
fi
@@ -4480,7 +4480,7 @@
# Eliminate all temporary directories.
for path in $notinst_path; do
lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e 's% $path % %g'`
- deplibs=`$ECHO "$deplibs " | ${SED} -e 's% -L$path % %g'`
+ deplibs=`$ECHO "X$deplibs " | $Xsed -e 's% -L$path % %g'`
dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e 's% -L$path %
%g'`
done
@@ -4594,8 +4594,8 @@
esac
fi
if test -n "$i" ; then
- libname=`eval \\$ECHO \"$libname_spec\"`
- deplib_matches=`eval \\$ECHO \"$library_names_spec\"`
+ libname=`eval "\\$ECHO \"$libname_spec\""`
+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
set dummy $deplib_matches; shift
deplib_match=$1
if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
@@ -4636,8 +4636,8 @@
esac
fi
if test -n "$i" ; then
- libname=`eval \\$ECHO \"$libname_spec\"`
- deplib_matches=`eval \\$ECHO \"$library_names_spec\"`
+ libname=`eval "\\$ECHO \"$libname_spec\""`
+ deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
set dummy $deplib_matches; shift
deplib_match=$1
if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ;
then
@@ -4683,7 +4683,7 @@
esac
fi
if test -n "$a_deplib" ; then
- libname=`eval \\$ECHO \"$libname_spec\"`
+ libname=`eval "\\$ECHO \"$libname_spec\""`
for i in $lib_search_path $sys_lib_search_path
$shlib_search_path; do
potential_libs=`ls $i/$libname[[.-]]* 2>/dev/null`
for potent_lib in $potential_libs; do
@@ -4752,12 +4752,12 @@
esac
fi
if test -n "$a_deplib" ; then
- libname=`eval \\$ECHO \"$libname_spec\"`
+ libname=`eval "\\$ECHO \"$libname_spec\""`
for i in $lib_search_path $sys_lib_search_path
$shlib_search_path; do
potential_libs=`ls $i/$libname[[.-]]* 2>/dev/null`
for potent_lib in $potential_libs; do
potlib="$potent_lib" # see symlink-check above in
file_magic test
- if eval $ECHO \"X$potent_lib\" 2>/dev/null | $Xsed -e 10q |
\
+ if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e
10q | \
$EGREP "$match_pattern_regex" > /dev/null; then
newdeplibs="$newdeplibs $a_deplib"
a_deplib=""
@@ -5002,7 +5002,7 @@
fi
if test -n "$export_symbols" && test -n "$include_expsyms"; then
- $run eval '$ECHO "X$include_expsyms" | $SP2NL >> "$export_symbols"'
+ $run eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >>
"$export_symbols"'
fi
tmp_deplibs=
@@ -5352,8 +5352,8 @@
# Create an invalid libtool object if no PIC, so that we don't
# accidentally link it into a program.
- # $show "$ECHO timestamp > $libobj"
- # $run eval "$ECHO timestamp > $libobj" || exit $?
+ # $show "echo timestamp > $libobj"
+ # $run eval "echo timestamp > $libobj" || exit $?
exit $EXIT_SUCCESS
fi
@@ -6754,7 +6754,7 @@
# ### END LIBTOOL TAG CONFIG: disable-shared
# ### BEGIN LIBTOOL TAG CONFIG: disable-static
-build_old_libs=`case $build_libtool_libs in yes) $ECHO no;; *) $ECHO yes;;
esac`
+build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
# ### END LIBTOOL TAG CONFIG: disable-static
# Local Variables:
