[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
FYI: 317-gary-simplify-verbatim-shell-quoting.diff
|
From: |
Gary V. Vaughan |
|
Subject: |
FYI: 317-gary-simplify-verbatim-shell-quoting.diff |
|
Date: |
Mon, 5 Mar 2007 16:30:59 -0800 (PST) |
|
User-agent: |
mailnotify/0.7 |
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Applied to HEAD.
I've tweaked the quoting errors Ralf pointed out here:
http://lists.gnu.org/archive/html/libtool-patches/2007-03/msg00001.html
Index: ChangeLog
from Gary V. Vaughan <address@hidden>
* libltdl/config/general.m4sh (M4SH_VERBATIM): New macro to
simplify m4sh quote quoting in blocks of raw shell code.
* clcommit.m4sh, libtoolize.m4sh, libltdl/config/getopt.m4sh,
libltdl/config/ltmain.m4sh, libltdl/config/mailnotify.m4sh,
tests/defs.m4sh: Use it.
Index: clcommit.m4sh
===================================================================
RCS file: /sources/libtool/libtool/clcommit.m4sh,v
retrieving revision 1.13
diff -u -u -r1.13 clcommit.m4sh
--- clcommit.m4sh 26 Feb 2007 10:24:25 -0000 1.13
+++ clcommit.m4sh 6 Mar 2007 00:28:44 -0000
@@ -87,6 +87,7 @@
m4_include([getopt.m4sh])
+M4SH_VERBATIM([[
# Global variables:
cvs_flags=
update_flags=
@@ -124,8 +125,8 @@
# sed scripts:
my_sed_single_opt='1s/^\(..\).*$/\1/;q'
my_sed_single_rest='1s/^..\(.*\)$/\1/;q'
- my_sed_long_opt='1s/^\(--[[^=]]*\)=.*/\1/;q'
- my_sed_long_arg='1s/^--[[^=]]*=//'
+ my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
+ my_sed_long_arg='1s/^--[^=]*=//'
# this just eases exit handling
while test $# -gt 0; do
@@ -180,7 +181,7 @@
opt_first=:
;;
- -C|--[[cC]]hange[[lL]]og)
+ -C|--[cC]hange[lL]og)
test $# = 0 && func_missing_arg $opt && break
if test -f "$1"; then :; else
func_error "ChangeLog file \`$1' does not exist"
@@ -242,7 +243,7 @@
-z|--compress)
test $# = 0 && func_missing_arg $opt && break
case "$1" in
- [[0-9]]) :;;
+ [0-9]) :;;
*) func_error "invalid argument for $opt"
break
;;
@@ -406,14 +407,14 @@
sleep 1 # give the user some time for a ^C
# Propagate any user edits back to the cvs log message
- $SED -e '/^[[A-Z]][[-a-zA-Z]]*:/d' -e '1d' < $tla_log > $log_file
+ $SED -e '/^[A-Z][-a-zA-Z]*:/d' -e '1d' < $tla_log > $log_file
else
${PAGER-more} "$log_file" || exit $EXIT_FAILURE
sleep 1 # give the user some time for a ^C
- subject=`cvs -nq up 2>/dev/null | $SED -n 's/^[[MAD]] //p'`
+ subject=`cvs -nq up 2>/dev/null | $SED -n 's/^[MAD] //p'`
test $# -gt 0 && subject="$@"
fi
@@ -449,7 +450,7 @@
test -f CVS/Tag &&
echo "Branch: `$SED -e 's,^T,,;1q' CVS/Tag`"
test -f CVS/Root &&
- echo "Changes by: `$SED -e 's,^:[[a-z]]*:,,;s,:.*$,,g' CVS/Root`"
+ echo "Changes by: `$SED -e 's,^:[a-z]*:,,;s,:.*$,,g' CVS/Root`"
echo ""
echo "Log Message:"
$SED -e 's,^, ,' "$log_file"
@@ -488,7 +489,7 @@
test -f "$log_file" || func_check_commit_msg
- grep '[[^ ]]' < "$log_file" > /dev/null ||
+ grep '[^ ]' < "$log_file" > /dev/null ||
func_fatal_error "empty commit message, aborting"
if grep '^$' < "$log_file" > /dev/null; then
@@ -506,7 +507,7 @@
# patch revision changes underneath us!
subject="$summary"
$opt_tla && \
- subject="$subject [["`$TLA tree-version|$SED $basename`--`$TLA
revisions|$SED -e '$p;d'`"]]"
+ subject="$subject ["`$TLA tree-version|$SED $basename`--`$TLA
revisions|$SED -e '$p;d'`"]"
# Send a copy of the log_file if sendmail_to was set:
if test -n "$sendmail_to"; then
@@ -522,3 +523,5 @@
# mode:shell-script
# sh-indentation:2
# End:
+]])
+
Index: libtoolize.m4sh
===================================================================
RCS file: /sources/libtool/libtool/libtoolize.m4sh,v
retrieving revision 1.57
diff -u -u -r1.57 libtoolize.m4sh
--- libtoolize.m4sh 24 Oct 2006 20:07:35 -0000 1.57
+++ libtoolize.m4sh 6 Mar 2007 00:28:44 -0000
@@ -70,6 +70,7 @@
m4_include([getopt.m4sh])
+M4SH_VERBATIM([[
# test EBCDIC or ASCII
case `echo X|tr X '\101'` in
A) # ASCII based system
@@ -118,8 +119,8 @@
# sed scripts:
my_sed_single_opt='1s/^\(..\).*$/\1/;q'
my_sed_single_rest='1s/^..\(.*\)$/\1/;q'
- my_sed_long_opt='1s/^\(--[[^=]]*\)=.*/\1/;q'
- my_sed_long_arg='1s/^--[[^=]]*=//'
+ my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
+ my_sed_long_arg='1s/^--[^=]*=//'
while test "$#" -gt 0; do
opt="$1"
@@ -337,7 +338,7 @@
s,libltdl/config-h.in,,
s,libltdl/Makefile.am,,
s,libltdl/Makefile.in,,
- /^[[ ]]*\\\\\$/d"
+ /^[ ]*\\\\\$/d"
case $my_filename in
Makefile.am)
my_fixup_non_subpackage_script=`echo "$my_fixup_non_subpackage_script"
| \
@@ -345,7 +346,7 @@
my_fixup_inc_paths_script= ;;
Makefile.inc)
repl=$ltdldir
- repl_uscore=`$ECHO "X$repl" | $Xsed -e 's,[[/.+-]],_,g'`
+ repl_uscore=`$ECHO "X$repl" | $Xsed -e 's,[/.+-],_,g'`
my_fixup_inc_paths_script="\
s,libltdl_,@address@hidden,
s,libltdl/,@repl@/,
@@ -407,24 +408,24 @@
# ---------------------------------------------------- #
my_sed_traces='s,#.*$,,; s,^dnl .*$,,; s, dnl .*$,,
- s,^.*AC_REQUIRE(.*$,,; s,^.*m4[]_require(.*$,,;
s,^.*m4[]_define(.*$,,
- s,^.*A[[CU]]_DEFUN(.*$,,; s,^.*m4[]_defun(.*$,,
+ s,^.*AC_REQUIRE(.*$,,; s,^.*m4_require(.*$,,; s,^.*m4_define(.*$,,
+ s,^.*A[CU]_DEFUN(.*$,,; s,^.*m4_defun(.*$,,
/AC_CONFIG_AUX_DIR(/ {
- s,^.*AC_CONFIG_AUX_DIR([[[ ]*\([^])]]*\).*$,auxdir=\1,
+ s,^.*AC_CONFIG_AUX_DIR([[ ]*\([^])]*\).*$,auxdir=\1,
p
}
/AC_CONFIG_MACRO_DIR(/ {
- s,^.*AC_CONFIG_MACRO_DIR([[[ ]*\([^])]]*\).*$,macrodir=\1,
+ s,^.*AC_CONFIG_MACRO_DIR([[ ]*\([^])]*\).*$,macrodir=\1,
p
}
/_LT_CONFIG_LTDL_DIR(/d
/LT_CONFIG_LTDL_DIR(/ {
- s/^.*LT_CONFIG_LTDL_DIR([[[ ]*\([^]),]*\)[^,]]*/ac_ltdldir=\1%%/
- s/%%[[[, ]*\([^])]]*\).*$/ ac_ltdl_mode=\1%%/
+ s/^.*LT_CONFIG_LTDL_DIR([[ ]*\([^]),]*\)[^,]*/ac_ltdldir=\1%%/
+ s/%%[[, ]*\([^])]*\).*$/ ac_ltdl_mode=\1%%/
s/%%.*$//
p
}
- /A[[CM]]_PROG_LIBTOOL/ {
+ /A[CM]_PROG_LIBTOOL/ {
s,^.*$,seen_libtool=:,
p
}
@@ -540,8 +541,8 @@
# in `Makefile.am' for a `-I' argument.
my_sed_aclocal_flags='
- /^[[ ]]*ACLOCAL_[[A-Z_]]*FLAGS[[ ]]*=/ {
- s,^[[^=]]*=[[ ]]*\(.*\), \1,
+ /^[ ]*ACLOCAL_[A-Z_]*FLAGS[ ]*=/ {
+ s,^[^=]*=[ ]*\(.*\), \1,
q
}
d'
@@ -572,8 +573,8 @@
my_include_regex=
my_sed_include='
- /^[m4]_include(\[[.*\]])$/ {
- s,^[m4]_include(\[[\(.*\)\]])$,\1,
+ /^m4_include(\[.*\])$/ {
+ s,^m4_include(\[\(.*\)\])$,\1,
p
}
d'
@@ -598,12 +599,12 @@
$opt_debug
my_filename="$1"
my_macro_regex="$2"
- my_sed_serial=['
+ my_sed_serial='
/^# serial [1-9][0-9.]*[ ]*'"$my_macro_regex"'[ ]*$/ {
s,^# serial \([1-9][0-9.]*\).*$,\1,
q
}
- d']
+ d'
# Search FILENAME and all the files it m4_includes for a serial number
# in the file that AC_DEFUNs MACRO_REGEX.
@@ -637,8 +638,8 @@
my_serial2="$2"
my_sed_dot='s/\..*$//g'
- my_sed_rest='s/^[[0-9]][[1-9]]*\.*//'
- my_sed_digits='s/[[^0-9.]]//g'
+ my_sed_rest='s/^[0-9][1-9]*\.*//'
+ my_sed_digits='s/[^0-9.]//g'
# Incase they turn out to be the same, we'll set it to empty
func_serial_max_result=
@@ -832,12 +833,12 @@
func_ltmain_update ()
{
$opt_debug
- my_sed_ltmain=['
+ my_sed_ltmain='
/^package_revision='\''*[0-9][1-9.]*'\''*/ {
s,^package_revision='\''*\([0-9.]*\)'\''*[ ]*$,\1,
p
}
- d']
+ d'
func_keyword_update "$1" "$2" "$3" "$my_sed_ltmain"
@@ -852,13 +853,13 @@
func_config_update ()
{
$opt_debug
- my_sed_config=['
+ my_sed_config='
/^timestamp='\''*[0-9][1-9-]*'\''*/ {
s,^timestamp='\''*\([0-9-]*\)'\''*,\1,
s/-/./g
p
}
- d']
+ d'
func_keyword_update "$1" "$2" "$3" "$my_sed_config"
@@ -873,13 +874,13 @@
func_install_update ()
{
$opt_debug
- my_sed_install=['
+ my_sed_install='
/^scriptversion='\''*[0-9][1-9.-]*'\''*/ {
s,^scriptversion='\''*\([0-9.-]*\)'\''*,\1,
s/-/./g
p
}
- d']
+ d'
func_keyword_update "$1" "$2" "$3" "$my_sed_install"
@@ -899,10 +900,10 @@
# Suggest modern idioms for storing autoconf macros:
if test -z "$macrodir$ltdldir"; then
if test x"$m4dir" = x.; then
- func_echo "Consider adding \`AC_CONFIG_MACRO_DIR([m4])' to
$configure_ac and rerunning"
+ func_echo "Consider adding \`AC_CONFIG_MACRO_DIR(m4)' to $configure_ac
and rerunning"
func_echo " libtoolize, to keep the correct libtool macros in-tree."
else
- func_echo "Consider adding \`AC_CONFIG_MACRO_DIR([$m4dir])'to
$configure.ac,"
+ func_echo "Consider adding \`AC_CONFIG_MACRO_DIR($m4dir)'to
$configure.ac,"
func_echo "and rerunning libtoolize."
fi
elif test -z "$m4dir"; then
@@ -922,7 +923,7 @@
done
fi
if test "$acmacrodir" != "$aclocaldir"; then
- func_echo "or else add \`AC_CONFIG_MACRO_DIR([[$acmacrodir]])' to
$configure_ac."
+ func_echo "or else add \`AC_CONFIG_MACRO_DIR([$acmacrodir])' to
$configure_ac."
ac_config_macro_dir_advised=:
fi
fi
@@ -938,18 +939,18 @@
# Remind the user to call LT_CONFIG_LTDL_DIR:
test -n "$ac_ltdldir" ||
- func_echo "Remember to add \`LT_CONFIG_LTDL_DIR([[$ltdldir]])' to
\`$configure_ac'."
+ func_echo "Remember to add \`LT_CONFIG_LTDL_DIR([$ltdldir])' to
\`$configure_ac'."
# Offer some suggestions for avoiding duplicate files in a project
# that uses libltdl:
test "${ltdlprefix}config" = "$auxdir" ||
- func_echo "Consider using
\`AC_CONFIG_AUX_DIR([[${ltdlprefix}config]])' in $configure_ac."
+ func_echo "Consider using
\`AC_CONFIG_AUX_DIR([${ltdlprefix}config])' in $configure_ac."
$ac_config_macro_dir_advised || test "${ltdlprefix}m4" = "$m4dir" ||
- func_echo "Consider using
\`AC_CONFIG_MACRO_DIR([[${ltdlprefix}m4]])' in $configure_ac."
+ func_echo "Consider using \`AC_CONFIG_MACRO_DIR([${ltdlprefix}m4])'
in $configure_ac."
else
# Don't trace for this, we're just checking the user didn't invoke it
# directly from configure.ac.
- $SED 's,[d]nl .*$,,; s,# .*$,,' "$configure_ac" | grep AC_PROG_RANLIB
&&
+ $SED 's,dnl .*$,,; s,# .*$,,' "$configure_ac" | grep AC_PROG_RANLIB &&
func_echo "\`AC_PROG_RANLIB' is rendered obsolete by \`LT_INIT'"
fi
@@ -1121,7 +1122,7 @@
$opt_quiet || func_echo "putting macros in AC_CONFIG_MACRO_DIR,
\`$m4dir'."
func_serial_update libtool.m4 "$aclocaldir" "$m4dir" \
- LT_INIT 'A[[CM]]_PROG_LIBTOOL'
+ LT_INIT 'A[CM]_PROG_LIBTOOL'
if $seen_ltdl; then
func_serial_update ltdl.m4 "$aclocaldir" "$m4dir" 'LTDL_INIT'
@@ -1183,3 +1184,4 @@
# mode:shell-script
# sh-indentation:2
# End:
+]])
Index: libltdl/config/general.m4sh
===================================================================
RCS file: /sources/libtool/libtool/libltdl/config/general.m4sh,v
retrieving revision 1.6
diff -u -u -r1.6 general.m4sh
--- libltdl/config/general.m4sh 23 Feb 2007 18:18:34 -0000 1.6
+++ libltdl/config/general.m4sh 6 Mar 2007 00:28:44 -0000
@@ -25,6 +25,9 @@
# the same distribution terms that you use for the rest of that program.
])dnl
+m4_define([M4SH_VERBATIM], [$1])dnl
+
+M4SH_VERBATIM([[
: ${CP="cp -f"}
: ${ECHO="echo"}
: ${EGREP="@EGREP@"}
@@ -52,7 +55,7 @@
'
IFS=" $lt_nl"
-dirname="s,/[[^/]]*$,,"
+dirname="s,/[^/]*$,,"
basename="s,^.*/,,"
# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
@@ -69,8 +72,8 @@
# Make sure we have an absolute path for reexecution:
case $progpath in
- [[\\/]]*|[[A-Za-z]]:\\*) ;;
- *[[\\/]]*)
+ [\\/]*|[A-Za-z]:\\*) ;;
+ *[\\/]*)
progdir=`$ECHO "X$progpath" | $Xsed -e "$dirname"`
progdir=`cd "$progdir" && pwd`
progpath="$progdir/$progname"
@@ -91,10 +94,10 @@
# Sed substitution that helps us do robust quoting. It backslashifies
# metacharacters that are still active within double-quoted strings.
Xsed="${SED}"' -e 1s/^X//'
-sed_quote_subst='s/\([[`"$\\]]\)/\\\1/g'
+sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
# Same as above, but do not quote variable references.
-double_quote_subst='s/\([["`\\]]\)/\\\1/g'
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
# Re-`\' parameter expansions in output of double_quote_subst that were
# `\'-ed in input to the same. If an odd number of `\' preceded a '$'
@@ -109,7 +112,7 @@
s/$bs4/&\\
/g
s/^$bs2$dollar/$bs&/
- s/\\([[^$bs]]\\)$bs2$dollar/\\1$bs2$bs$dollar/g
+ s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g
s/\n//g"
# Standard options:
@@ -268,7 +271,7 @@
func_quote_for_eval ()
{
case $1 in
- *[[\\\`\"\$]]*)
+ *[\\\`\"\$]*)
func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e
"$sed_quote_subst"` ;;
*)
func_quote_for_eval_unquoted_result="$1" ;;
@@ -280,7 +283,7 @@
# expansion for a subsequent eval.
# Many Bourne shells cannot handle close brackets correctly
# in scan sets, so we specify it separately.
- *[[\@<:@\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]]*|*@:>@*|"")
+ *[\@<:@\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*@:>@*|"")
func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\""
;;
*)
@@ -295,7 +298,7 @@
func_quote_for_expand ()
{
case $1 in
- *[[\\\`\"]]*)
+ *[\\\`\"]*)
my_arg=`$ECHO "X$1" | $Xsed \
-e "$double_quote_subst" -e "$sed_double_backslash"` ;;
*)
@@ -307,7 +310,7 @@
# word splitting and command substitution for a subsequent eval.
# Many Bourne shells cannot handle close brackets correctly
# in scan sets, so we specify it separately.
- *[[\@<:@\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]]*|*@:>@*|"")
+ *[\@<:@\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*@:>@*|"")
my_arg="\"$my_arg\""
;;
esac
@@ -338,3 +341,5 @@
fi
fi
}
+]])
+
Index: libltdl/config/getopt.m4sh
===================================================================
RCS file: /sources/libtool/libtool/libltdl/config/getopt.m4sh,v
retrieving revision 1.5
diff -u -u -r1.5 getopt.m4sh
--- libltdl/config/getopt.m4sh 15 Feb 2006 09:33:47 -0000 1.5
+++ libltdl/config/getopt.m4sh 6 Mar 2007 00:28:44 -0000
@@ -27,6 +27,7 @@
m4_include([general.m4sh])
+M4SH_VERBATIM([[
# func_version
# Echo version message to standard output and exit.
func_version ()
@@ -34,7 +35,7 @@
$SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {
s/^# //
s/^# *$//
- s/\((C)\)[[ 0-9,-]]*\( [[1-9]][[0-9]]*\)/\1\2/
+ s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
p
}' < "$progpath"
exit $?
@@ -86,3 +87,5 @@
}
exit_cmd=:
+]])
+
Index: libltdl/config/ltmain.m4sh
===================================================================
RCS file: /sources/libtool/libtool/libltdl/config/ltmain.m4sh,v
retrieving revision 1.68
diff -u -u -r1.68 ltmain.m4sh
--- libltdl/config/ltmain.m4sh 23 Feb 2007 21:52:50 -0000 1.68
+++ libltdl/config/ltmain.m4sh 6 Mar 2007 00:28:44 -0000
@@ -107,6 +107,7 @@
m4_include([getopt.m4sh])
+M4SH_VERBATIM([[
# Check that we have a working $ECHO.
if test "X$1" = X--no-reexec; then
# Discard the --no-reexec flag, and continue.
@@ -217,7 +218,7 @@
# Validate tagname.
case $tagname in
- *[[!-_A-Za-z0-9,/]]*)
+ *[!-_A-Za-z0-9,/]*)
func_fatal_error "invalid tag name: $tagname"
;;
esac
@@ -256,7 +257,7 @@
clean)
$ECHO \
-"Usage: $progname [[OPTION]]... --mode=clean RM [[RM-OPTION]]... FILE...
+"Usage: $progname [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
Remove files from the build directory.
@@ -270,7 +271,7 @@
compile)
$ECHO \
-"Usage: $progname [[OPTION]]... --mode=compile COMPILE-COMMAND... SOURCEFILE
+"Usage: $progname [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
Compile a source file into a libtool library object.
@@ -293,7 +294,7 @@
execute)
$ECHO \
-"Usage: $progname [[OPTION]]... --mode=execute COMMAND [[ARGS]]...
+"Usage: $progname [OPTION]... --mode=execute COMMAND [ARGS]...
Automatically set library path, then run a program.
@@ -313,7 +314,7 @@
finish)
$ECHO \
-"Usage: $progname [[OPTION]]... --mode=finish [[LIBDIR]]...
+"Usage: $progname [OPTION]... --mode=finish [LIBDIR]...
Complete the installation of libtool libraries.
@@ -325,7 +326,7 @@
install)
$ECHO \
-"Usage: $progname [[OPTION]]... --mode=install INSTALL-COMMAND...
+"Usage: $progname [OPTION]... --mode=install INSTALL-COMMAND...
Install executables or libraries.
@@ -342,7 +343,7 @@
link)
$ECHO \
-"Usage: $progname [[OPTION]]... --mode=link LINK-COMMAND...
+"Usage: $progname [OPTION]... --mode=link LINK-COMMAND...
Link object files or libraries together to form another library, or to
create an executable program.
@@ -373,14 +374,14 @@
don't remove output files matching REGEX
-release RELEASE specify package release information
-rpath LIBDIR the created library will eventually be installed in
LIBDIR
- -R[[ ]]LIBDIR add LIBDIR to the runtime path of programs and
libraries
+ -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
-shared only do dynamic linking of libtool libraries
-shrext SUFFIX override the standard shared library file extension
-static do not do any dynamic linking of uninstalled libtool
libraries
-static-libtool-libs
do not do any dynamic linking of libtool libraries
- -version-info CURRENT[[:REVISION[:AGE]]]
- specify library version info [[each variable defaults to
0]]
+ -version-info CURRENT[:REVISION[:AGE]]
+ specify library version info [each variable defaults to
0]
-weak LIBNAME declare that the target provides the LIBNAME interface
All other options (arguments beginning with \`-') are ignored.
@@ -402,7 +403,7 @@
uninstall)
$ECHO \
-"Usage: $progname [[OPTION]]... --mode=uninstall RM [[RM-OPTION]]... FILE...
+"Usage: $progname [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
Remove libraries from an installation directory.
@@ -818,7 +819,7 @@
my_outputname="$1"
my_originator="$2"
my_pic_p="${3-no}"
- my_prefix=`$ECHO "$my_originator" | sed 's%[[^a-zA-Z0-9]]%_%g'`
+ my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'`
my_dlsyms=
if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
@@ -893,7 +894,7 @@
}
else
$opt_dry_run || {
- eval "${SED} -e 's/\([[].[*^$]]\)/\\\\\1/g' -e 's/^/ /' -e
's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
+ eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e
's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" >
"$nlist"T'
eval '$MV "$nlist"T "$nlist"'
case $host in
@@ -969,9 +970,9 @@
$ECHO >> "$output_objdir/$my_dlsyms" "\
extern $lt_dlsym_const lt_dlsymlist
-lt_${my_prefix}_LTX_preloaded_symbols[[]];
+lt_${my_prefix}_LTX_preloaded_symbols[];
$lt_dlsym_const lt_dlsymlist
-lt_${my_prefix}_LTX_preloaded_symbols[[]] =
+lt_${my_prefix}_LTX_preloaded_symbols[] =
{\
{ \"$my_originator\", (void *) 0 },"
@@ -1092,7 +1093,7 @@
for my_xlib in $my_oldlibs; do
# Extract the objects.
case $my_xlib in
- [[\\/]]* | [[A-Za-z]]:[[\\/]]*) my_xabs="$my_xlib" ;;
+ [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
*) my_xabs=`pwd`"/$my_xlib" ;;
esac
func_basename "$my_xlib"
@@ -1311,7 +1312,7 @@
# Recognize several different file suffixes.
# If the user specifies -o file.o, it is replaced with file.lo
- xform='[[cCFSifmso]]'
+ xform='[cCFSifmso]'
case $libobj in
*.ada) xform=ada ;;
*.adb) xform=adb ;;
@@ -1323,7 +1324,7 @@
*.class) xform=class ;;
*.cpp) xform=cpp ;;
*.cxx) xform=cxx ;;
- *.[[fF]][[09]]?) xform='[[fF]][[09]].' ;;
+ *.[fF][09]?) xform='[fF][09].' ;;
*.for) xform=for ;;
*.java) xform=java ;;
*.obj) xform=obj ;;
@@ -1369,7 +1370,7 @@
func_quote_for_eval "$libobj"
test "X$libobj" != "X$func_quote_for_eval_result" \
- && $ECHO "X$libobj" | $GREP ['[@:>@~#^*{};<>?"'"'"' &()|`$@<:@]'] \
+ && $ECHO "X$libobj" | $GREP '[@:>@~#^*{};<>?"'"'"' &()|`$@<:@]' \
&& func_warning "libobj name \`$libobj' may not contain shell special
characters."
func_basename "$obj"
objname="$func_basename_result"
@@ -1404,7 +1405,7 @@
# Calculate the filename of the output object if compiler does
# not support -o with -c
if test "$compiler_c_o" = no; then
- output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e
's%\.[[^.]]*$%%'`.${objext}
+ output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e
's%\.[^.]*$%%'`.${objext}
lockfile="$output_obj.lock"
removelist="$removelist $output_obj $lockfile"
trap "$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE" 1 2 15
@@ -1756,7 +1757,7 @@
$ECHO "See any operating system documentation about shared libraries for"
case $host in
- solaris2.[[6789]]|solaris2.1[[0-9]])
+ solaris2.[6789]|solaris2.1[0-9])
$ECHO "more information, such as the ld(1), crle(1) and ld.so(8)
manual"
$ECHO "pages."
;;
@@ -1815,7 +1816,7 @@
-d) isdir=yes ;;
-f)
case " $install_prog " in
- *[[\\\ /]]cp\ *) ;;
+ *[\\\ /]cp\ *) ;;
*) prev=$arg ;;
esac
;;
@@ -1879,7 +1880,7 @@
func_fatal_help "\`$dest' is not a directory"
fi
case $destdir in
- [[\\/]]* | [[A-Za-z]]:[[\\/]]*) ;;
+ [\\/]* | [A-Za-z]:[\\/]*) ;;
*)
for file in $files; do
case $file in
@@ -2144,7 +2145,7 @@
}
else
# Install the binary that we compiled earlier.
- file=`$ECHO "X$file$stripped_ext" | $Xsed -e
"s%\([[^/]]*\)$%$objdir/\1%"`
+ file=`$ECHO "X$file$stripped_ext" | $Xsed -e
"s%\([^/]*\)$%$objdir/\1%"`
fi
fi
@@ -2524,7 +2525,7 @@
rpath | xrpath)
# We need an absolute path.
case $arg in
- [[\\/]]* | [[A-Za-z]]:[[\\/]]*) ;;
+ [\\/]* | [A-Za-z]:[\\/]*) ;;
*)
func_fatal_error "only absolute run-paths are allowed"
;;
@@ -2641,7 +2642,7 @@
# The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
# so, if we see these flags be careful not to treat them like -L
- -L[[A-Z]][[A-Z]]*:*)
+ -L[A-Z][A-Z]*:*)
case $with_gcc/$host in
no/*-*-irix* | /*-*-irix*)
func_append compile_command " $arg"
@@ -2656,7 +2657,7 @@
dir=$func_stripname_result
# We need an absolute path.
case $dir in
- [[\\/]]* | [[A-Za-z]]:[[\\/]]*) ;;
+ [\\/]* | [A-Za-z]:[\\/]*) ;;
*)
absdir=`cd "$dir" && pwd`
test -z "$absdir" && \
@@ -2702,7 +2703,7 @@
# Do not include libc due to us having libc/libc_r.
test "X$arg" = "X-lc" && continue
;;
- *-*-rhapsody* | *-*-darwin1.[[012]])
+ *-*-rhapsody* | *-*-darwin1.[012])
# Rhapsody C and math libraries are in the System framework
deplibs="$deplibs System.ltframework"
continue
@@ -2816,7 +2817,7 @@
dir=$func_stripname_result
# We need an absolute path.
case $dir in
- [[\\/]]* | [[A-Za-z]]:[[\\/]]*) ;;
+ [\\/]* | [A-Za-z]:[\\/]*) ;;
*)
func_fatal_error "only absolute run-paths are allowed"
;;
@@ -2926,8 +2927,8 @@
# -F/path gives path to uninstalled frameworks, gcc on darwin
# -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
# @file GCC response files
-
-64|-mips[[0-9]]|-r[[0-9]][[0-9]]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
- -t[[45]]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
+ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
func_quote_for_eval "$arg"
arg="$func_quote_for_eval_result"
func_append compile_command " $arg"
@@ -3475,7 +3476,7 @@
# Convert "-framework foo" to "foo.ltframework"
if test -n "$inherited_linker_flags"; then
- tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed
-e 's/-framework \([[^ $]]*\)/\1.ltframework/g'`
+ tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed
-e 's/-framework \([^ $]*\)/\1.ltframework/g'`
for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
case " $new_inherited_linker_flags " in
*" $tmp_inherited_linker_flag "*) ;;
@@ -3483,7 +3484,7 @@
esac
done
fi
- dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([[^
$]]*\).ltframework% -framework \1%g'`
+ dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^
$]*\).ltframework% -framework \1%g'`
if test "$linkmode,$pass" = "prog,link"; then
compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
@@ -3554,7 +3555,7 @@
# We need an absolute path.
case $ladir in
- [[\\/]]* | [[A-Za-z]]:[[\\/]]*) abs_ladir="$ladir" ;;
+ [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
*)
abs_ladir=`cd "$ladir" && pwd`
if test -z "$abs_ladir"; then
@@ -3833,15 +3834,15 @@
if test "$hardcode_direct" = no; then
add="$dir/$linklib"
case $host in
- *-*-sco3.2v5.0.[[024]]*) add_dir="-L$dir" ;;
+ *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
*-*-sysv4*uw2*) add_dir="-L$dir" ;;
- *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[[01]].[[10]]* | \
+ *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
*-*-unixware7*) add_dir="-L$dir" ;;
*-*-darwin* )
# if the lib is a (non-dlopened) module then we can not
# link against it, someone is ignoring the earlier warnings
if /usr/bin/file -L $add 2> /dev/null |
- $GREP ": [[^:]]* bundle" >/dev/null ; then
+ $GREP ": [^:]* bundle" >/dev/null ; then
if test "X$dlopenmodule" != "X$lib"; then
$ECHO "*** Warning: lib $linklib is a module, not a
shared library"
if test -z "$old_library" ; then
@@ -3878,7 +3879,7 @@
# Try looking first in the location we're being installed to.
if test -n "$inst_prefix_dir"; then
case $libdir in
- [[\\/]]*)
+ [\\/]*)
add_dir="$add_dir -L$inst_prefix_dir$libdir"
;;
esac
@@ -3951,7 +3952,7 @@
# Try looking first in the location we're being installed to.
if test -n "$inst_prefix_dir"; then
case $libdir in
- [[\\/]]*)
+ [\\/]*)
add_dir="$add_dir -L$inst_prefix_dir$libdir"
;;
esac
@@ -4062,7 +4063,7 @@
dir="$func_dirname_result"
# We need an absolute path.
case $dir in
- [[\\/]]* | [[A-Za-z]]:[[\\/]]*) absdir="$dir" ;;
+ [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
*)
absdir=`cd "$dir" && pwd`
if test -z "$absdir"; then
@@ -4369,7 +4370,7 @@
# Check that each of the things are valid numbers.
case $current in
-
0|[[1-9]]|[[1-9]][[0-9]]|[[1-9]][[0-9]][[0-9]]|[[1-9]][[0-9]][[0-9]][[0-9]]|[[1-9]][[0-9]][[0-9]][[0-9]][[0-9]])
;;
+
0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9])
;;
*)
func_error "CURRENT \`$current' must be a nonnegative integer"
func_fatal_error "\`$vinfo' is not valid version information"
@@ -4377,7 +4378,7 @@
esac
case $revision in
-
0|[[1-9]]|[[1-9]][[0-9]]|[[1-9]][[0-9]][[0-9]]|[[1-9]][[0-9]][[0-9]][[0-9]]|[[1-9]][[0-9]][[0-9]][[0-9]][[0-9]])
;;
+
0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9])
;;
*)
func_error "REVISION \`$revision' must be a nonnegative integer"
func_fatal_error "\`$vinfo' is not valid version information"
@@ -4385,7 +4386,7 @@
esac
case $age in
-
0|[[1-9]]|[[1-9]][[0-9]]|[[1-9]][[0-9]][[0-9]]|[[1-9]][[0-9]][[0-9]][[0-9]]|[[1-9]][[0-9]][[0-9]][[0-9]][[0-9]])
;;
+
0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9])
;;
*)
func_error "AGE \`$age' must be a nonnegative integer"
func_fatal_error "\`$vinfo' is not valid version information"
@@ -4616,7 +4617,7 @@
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
# these systems don't actually have a c library (as such)!
;;
- *-*-rhapsody* | *-*-darwin1.[[012]])
+ *-*-rhapsody* | *-*-darwin1.[012])
# Rhapsody C library is in the System framework
deplibs="$deplibs System.ltframework"
;;
@@ -4778,7 +4779,7 @@
if test -n "$a_deplib" ; then
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`
+ potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
for potent_lib in $potential_libs; do
# Follow soft links.
if ls -lLd "$potent_lib" 2>/dev/null |
@@ -4794,8 +4795,8 @@
while test -h "$potlib" 2>/dev/null; do
potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
case $potliblink in
- [[\\/]]* | [[A-Za-z]]:[[\\/]]*) potlib="$potliblink";;
- *) potlib=`$ECHO "X$potlib" | $Xsed -e
's,[[^/]]*$,,'`"$potliblink";;
+ [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
+ *) potlib=`$ECHO "X$potlib" | $Xsed -e
's,[^/]*$,,'`"$potliblink";;
esac
done
if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
@@ -4847,7 +4848,7 @@
if test -n "$a_deplib" ; then
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`
+ 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 | \
@@ -4883,14 +4884,14 @@
none | unknown | *)
newdeplibs=""
tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \
- -e 's/ -lc$//' -e 's/ -[[LR]][[^ ]]*//g'`
+ -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'`
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
for i in $predeps $postdeps ; do
# can't use Xsed below, because $i might contain '/'
tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"`
done
fi
- if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[[ ]]//g' |
+ if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' |
$GREP . >/dev/null; then
$ECHO
if test "X$deplibs_check_method" = "Xnone"; then
@@ -4910,7 +4911,7 @@
name=$name_save
case $host in
- *-*-rhapsody* | *-*-darwin1.[[012]])
+ *-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library with the System framework
newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc /
System.ltframework /'`
;;
@@ -4964,9 +4965,9 @@
# Time to change all our "foo.ltframework" stuff back to "-framework
foo"
case $host in
*-*-darwin*)
- newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([[^
$]]*\).ltframework% -framework \1%g'`
- new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" |
$Xsed -e 's% \([[^ $]]*\).ltframework% -framework \1%g'`
- deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([[^ $]]*\).ltframework%
-framework \1%g'`
+ newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^
$]*\).ltframework% -framework \1%g'`
+ new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" |
$Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+ deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework%
-framework \1%g'`
;;
esac
@@ -5164,7 +5165,7 @@
# though. Also, the filter scales superlinearly with the number of
# global variables. join(1) would be nice here, but unfortunately
# isn't a blessed tool.
- $opt_dry_run || $SED -e '/[[ ,]]DATA/!d;s,\(.*\)\([[
\,]].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
+ $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([
\,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
export_symbols=$output_objdir/$libname.def
$opt_dry_run || $SED -f $output_objdir/$libname.filter <
$orig_export_symbols > $export_symbols
@@ -5591,10 +5592,10 @@
&& test "$dlopen_support" = unknown \
&& test "$dlopen_self" = unknown \
&& test "$dlopen_self_static" = unknown && \
- func_warning "\`LT_INIT([[dlopen]])' not used. Assuming no dlopen
support."
+ func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen
support."
case $host in
- *-*-rhapsody* | *-*-darwin1.[[012]])
+ *-*-rhapsody* | *-*-darwin1.[012])
# On Rhapsody replace the C library is the System framework
compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc /
System.ltframework /'`
finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc /
System.ltframework /'`
@@ -5607,15 +5608,15 @@
# But is supposedly fixed on 10.4 or later (yay!).
if test "$tagname" = CXX ; then
case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
- 10.[[0123]])
+ 10.[0123])
compile_command="$compile_command ${wl}-bind_at_load"
finalize_command="$finalize_command ${wl}-bind_at_load"
;;
esac
fi
# Time to change all our "foo.ltframework" stuff back to "-framework
foo"
- compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([[^
$]]*\).ltframework% -framework \1%g'`
- finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([[^
$]]*\).ltframework% -framework \1%g'`
+ compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^
$]*\).ltframework% -framework \1%g'`
+ finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^
$]*\).ltframework% -framework \1%g'`
;;
esac
@@ -5884,7 +5885,7 @@
# Quote $ECHO for shipping.
if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then
case $progpath in
- [[\\/]]* | [[A-Za-z]]:[[\\/]]*) qecho="$SHELL $progpath
--fallback-echo";;
+ [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
esac
qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"`
@@ -6005,36 +6006,36 @@
void lt_fatal (const char *message, ...);
int
-main (int argc, char *argv[[]])
+main (int argc, char *argv[])
{
char **newargz;
int i;
- program_name = (char *) xstrdup (base_name (argv[[0]]));
- DEBUG("(main) argv[[0]] : %s\n",argv[[0]]);
+ program_name = (char *) xstrdup (base_name (argv[0]));
+ DEBUG("(main) argv[0] : %s\n",argv[0]);
DEBUG("(main) program_name : %s\n",program_name);
newargz = XMALLOC(char *, argc+2);
EOF
cat >> $cwrappersource <<EOF
- newargz[[0]] = (char *) xstrdup("$SHELL");
+ newargz[0] = (char *) xstrdup("$SHELL");
EOF
cat >> $cwrappersource <<"EOF"
- newargz[[1]] = find_executable(argv[[0]]);
- if (newargz[[1]] == NULL)
- lt_fatal("Couldn't find %s", argv[[0]]);
- DEBUG("(main) found exe at : %s\n",newargz[[1]]);
+ newargz[1] = find_executable(argv[0]);
+ if (newargz[1] == NULL)
+ lt_fatal("Couldn't find %s", argv[0]);
+ DEBUG("(main) found exe at : %s\n",newargz[1]);
/* we know the script has the same name, without the .exe */
- /* so make sure newargz[[1]] doesn't end in .exe */
- strendzap(newargz[[1]],".exe");
+ /* so make sure newargz[1] doesn't end in .exe */
+ strendzap(newargz[1],".exe");
for (i = 1; i < argc; i++)
- newargz[[i+1]] = xstrdup(argv[[i]]);
- newargz[[argc+1]] = NULL;
+ newargz[i+1] = xstrdup(argv[i]);
+ newargz[argc+1] = NULL;
for (i=0; i<argc+1; i++)
{
- DEBUG("(main) newargz[[%d]] : %s\n",i,newargz[[i]]);
+ DEBUG("(main) newargz[%d] : %s\n",i,newargz[i]);
;
}
@@ -6081,7 +6082,7 @@
#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
/* Skip over the disk name in MSDOS pathnames. */
- if (isalpha ((unsigned char)name[[0]]) && name[[1]] == ':')
+ if (isalpha ((unsigned char)name[0]) && name[1] == ':')
name += 2;
#endif
@@ -6125,7 +6126,7 @@
const char* p;
const char* p_next;
/* static buffer for getcwd */
- char tmp[[LT_PATHMAX + 1]];
+ char tmp[LT_PATHMAX + 1];
int tmp_len;
char* concat_name;
@@ -6136,7 +6137,7 @@
/* Absolute path? */
#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
- if (isalpha ((unsigned char)wrapper[[0]]) && wrapper[[1]] == ':')
+ if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':')
{
concat_name = xstrdup (wrapper);
if (check_executable(concat_name))
@@ -6146,7 +6147,7 @@
else
{
#endif
- if (IS_DIR_SEPARATOR (wrapper[[0]]))
+ if (IS_DIR_SEPARATOR (wrapper[0]))
{
concat_name = xstrdup (wrapper);
if (check_executable(concat_name))
@@ -6186,14 +6187,14 @@
tmp_len = strlen(tmp);
concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
memcpy (concat_name, tmp, tmp_len);
- concat_name[[tmp_len]] = '/';
+ concat_name[tmp_len] = '/';
strcpy (concat_name + tmp_len + 1, wrapper);
}
else
{
concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1);
memcpy (concat_name, p, p_len);
- concat_name[[p_len]] = '/';
+ concat_name[p_len] = '/';
strcpy (concat_name + p_len + 1, wrapper);
}
if (check_executable(concat_name))
@@ -6209,7 +6210,7 @@
tmp_len = strlen(tmp);
concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
memcpy (concat_name, tmp, tmp_len);
- concat_name[[tmp_len]] = '/';
+ concat_name[tmp_len] = '/';
strcpy (concat_name + tmp_len + 1, wrapper);
if (check_executable(concat_name))
@@ -6291,9 +6292,9 @@
if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
- [#] Zsh 3.x and 4.x performs word splitting on \${1+\"address@hidden"},
which
+ # Zsh 3.x and 4.x performs word splitting on \${1+\"address@hidden"}, which
# is contrary to our usage. Disable this feature.
- alias -g '\${1+\"address@hidden"}'='\"address@hidden"'
+ alias -g '\${1+\"address@hidden"}'='\"address@hidden"'
setopt NO_GLOB_SUBST
else
case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
@@ -6333,18 +6334,18 @@
$ECHO >> $output "\
# Find the directory that this script lives in.
- thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[[^/]]*$%%'\`
+ thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
test \"x\$thisdir\" = \"x\$file\" && thisdir=.
# Follow symbolic links until we get to the real thisdir.
file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
while test -n \"\$file\"; do
- destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[[^/]]*\$%%'\`
+ destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
# If there was a directory component, then change thisdir.
if test \"x\$destdir\" != \"x\$file\"; then
case \"\$destdir\" in
- [[\\\\/]]* | [[A-Za-z]]:[[\\\\/]]*) thisdir=\"\$destdir\" ;;
+ [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
*) thisdir=\"\$thisdir/\$destdir\" ;;
esac
fi
@@ -6530,14 +6531,14 @@
objbase="$func_basename_result"
case " $oldobjs " in
" ") oldobjs=$obj ;;
- *[[\ /]]"$objbase "*)
+ *[\ /]"$objbase "*)
while :; do
# Make sure we don't pick an alternate name that also
# overlaps.
newobj=lt$counter-$objbase
counter=`expr $counter + 1`
case " $oldobjs " in
- *[[\ /]]"$newobj "*) ;;
+ *[\ /]"$newobj "*) ;;
*) if test ! -f "$gentop/$newobj"; then break; fi ;;
esac
done
@@ -6687,7 +6688,7 @@
newdlfiles=
for lib in $dlfiles; do
case $lib in
- [[\\/]]* | [[A-Za-z]]:[[\\/]]*) abs="$lib" ;;
+ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
*) abs=`pwd`"/$lib" ;;
esac
newdlfiles="$newdlfiles $abs"
@@ -6696,7 +6697,7 @@
newdlprefiles=
for lib in $dlprefiles; do
case $lib in
- [[\\/]]* | [[A-Za-z]]:[[\\/]]*) abs="$lib" ;;
+ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
*) abs=`pwd`"/$lib" ;;
esac
newdlprefiles="$newdlprefiles $abs"
@@ -6980,3 +6981,5 @@
# sh-indentation:2
# End:
# vi:sw=2
+]])
+
Index: libltdl/config/mailnotify.m4sh
===================================================================
RCS file: /sources/libtool/libtool/libltdl/config/mailnotify.m4sh,v
retrieving revision 1.3
diff -u -u -r1.3 mailnotify.m4sh
--- libltdl/config/mailnotify.m4sh 23 Jan 2006 18:33:57 -0000 1.3
+++ libltdl/config/mailnotify.m4sh 6 Mar 2007 00:28:44 -0000
@@ -68,6 +68,7 @@
m4_include([getopt.m4sh])
+M4SH_VERBATIM([[
# Global variables:
multipart=1
outputfile=""
@@ -80,8 +81,8 @@
# sed scripts:
my_sed_single_opt='1s/^\(..\).*$/\1/;q'
my_sed_single_rest='1s/^..\(.*\)$/\1/;q'
- my_sed_long_opt='1s/^\(--[[^=]]*\)=.*/\1/;q'
- my_sed_long_arg='1s/^--[[^=]]*=//'
+ my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
+ my_sed_long_arg='1s/^--[^=]*=//'
while test $# -gt 0; do
opt="$1"
@@ -387,3 +388,5 @@
# mode:shell-script
# sh-indentation:2
# End:
+]])
+
Index: tests/defs.m4sh
===================================================================
RCS file: /sources/libtool/libtool/tests/defs.m4sh,v
retrieving revision 1.16
diff -u -u -r1.16 defs.m4sh
--- tests/defs.m4sh 12 Nov 2005 09:16:56 -0000 1.16
+++ tests/defs.m4sh 6 Mar 2007 00:28:44 -0000
@@ -30,6 +30,7 @@
m4_include([general.m4sh])
+M4SH_VERBATIM([[
: ${AUTOCONF="autoconf"}
: ${AUTORECONF="autoreconf"}
: ${LIBTOOL="./libtool"}
@@ -345,3 +346,5 @@
# mode:shell-script
# sh-indentation:2
# End:
+]])
+
_________________________________________________________
This patch notification generated by vcsapply version 1.0
http://savannah.gnu.org/projects/cvs-utils
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (Darwin)
iD8DBQFF7LZCFRMICSmD1gYRAsoBAKC1deE7g1CUdbpTykrdUu/gJ4WAsACbBe4p
LQ4+0Vh0KQpx0DyYEAG8QqQ=
=uF1u
-----END PGP SIGNATURE-----
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- FYI: 317-gary-simplify-verbatim-shell-quoting.diff,
Gary V. Vaughan <=