* autoconf.sh (optarg): More robust expr invocation.

* autoreconf.sh: Likewise.
* autoupdate.sh: Likewise.
* autoheader.sh: Likewise.
Reported by Bernard Dautrevaux.

diff --git a/ChangeLog b/ChangeLog
index 125e3d6df931f5bb4de7d7ca05827c2ab862e14d..e0c79138c1ab6554f0d43533d2e3ccc63a47af1d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-09-19  Akim Demaille  <akim@epita.fr>
+
+       * autoconf.sh (optarg): More robust expr invocation.
+       * autoreconf.sh: Likewise.
+       * autoupdate.sh: Likewise.
+       * autoheader.sh: Likewise.
+       Reported by Bernard Dautrevaux.
+
 2000-09-19  Pavel Roskin  <proski@gnu.org>
 
        * acgeneral.m4 (AU_ALIAS): Do not use `defn' since then autoupdate

diff --git a/autoconf.in b/autoconf.in
index ae79c6a2c660e30c8e68c7dcb508c82f3333c3e2..cd9b1bec7c6907cd3432f63c51236a7399c7c1c6 100644 (file)
--- a/autoconf.in
+++ b/autoconf.in
@@ -125,8 +125,8 @@ verbose=:
 
 # Parse command line.
 while test $# -gt 0 ; do
-  optarg=`expr "$1" : '--[^=]*=\(.*\)' \| \
-               "$1" : '-.\(.*\)'`
+  optarg=`expr "x$1" : 'x--[^=]*=\(.*\)' \| \
+               "x$1" : 'x-.\(.*\)'`
   case $1 in
     --version | --vers* | -V )
        echo "$version" ; exit 0 ;;

diff --git a/autoconf.sh b/autoconf.sh
index ae79c6a2c660e30c8e68c7dcb508c82f3333c3e2..cd9b1bec7c6907cd3432f63c51236a7399c7c1c6 100644 (file)
--- a/autoconf.sh
+++ b/autoconf.sh
@@ -125,8 +125,8 @@ verbose=:
 
 # Parse command line.
 while test $# -gt 0 ; do
-  optarg=`expr "$1" : '--[^=]*=\(.*\)' \| \
-               "$1" : '-.\(.*\)'`
+  optarg=`expr "x$1" : 'x--[^=]*=\(.*\)' \| \
+               "x$1" : 'x-.\(.*\)'`
   case $1 in
     --version | --vers* | -V )
        echo "$version" ; exit 0 ;;

diff --git a/autoheader.in b/autoheader.in
index 1773dc71e5da4104a342675d616a0135fa8377d4..1b09befdb34179f9a3772915acbb1c61d6dab425 100644 (file)
--- a/autoheader.in
+++ b/autoheader.in
@@ -96,8 +96,8 @@ warning_obsolete=false
 
 # Parse command line.
 while test $# -gt 0 ; do
-  optarg=`expr "$1" : '--[^=]*=\(.*\)' \| \
-               "$1" : '-.\(.*\)'`
+  optarg=`expr "x$1" : 'x--[^=]*=\(.*\)' \| \
+               "x$1" : 'x-.\(.*\)'`
   case $1 in
     --version | --vers* | -V )
        echo "$version" ; exit 0 ;;

diff --git a/autoheader.sh b/autoheader.sh
index 1773dc71e5da4104a342675d616a0135fa8377d4..1b09befdb34179f9a3772915acbb1c61d6dab425 100644 (file)
--- a/autoheader.sh
+++ b/autoheader.sh
@@ -96,8 +96,8 @@ warning_obsolete=false
 
 # Parse command line.
 while test $# -gt 0 ; do
-  optarg=`expr "$1" : '--[^=]*=\(.*\)' \| \
-               "$1" : '-.\(.*\)'`
+  optarg=`expr "x$1" : 'x--[^=]*=\(.*\)' \| \
+               "x$1" : 'x-.\(.*\)'`
   case $1 in
     --version | --vers* | -V )
        echo "$version" ; exit 0 ;;

diff --git a/autoreconf.in b/autoreconf.in
index 46453c04b05af70addfe42dadd778c78b7f28146..95533b5574dcae13d24d20c0eb1e049eeae5c7ca 100644 (file)
--- a/autoreconf.in
+++ b/autoreconf.in
@@ -128,7 +128,8 @@ done
 
 # Parse command line.
 while test $# -gt 0; do
-  optarg=`expr "$1" : '-[^=]*=\(.*\)'`
+  optarg=`expr "x$1" : 'x--[^=]*=\(.*\)' \| \
+               "x$1" : 'x-.\(.*\)'`
   case "$1" in
     --version | --vers* | -V )
        echo "$version" ; exit 0 ;;
@@ -150,23 +151,23 @@ while test $# -gt 0; do
        localdir=$1
        shift ;;
 
-    --macrodir=* )
-       autoconf_dir=$optarg
-       shift ;;
     --macrodir | -m )
        test $# = 1 && eval "$exit_missing_arg"
        shift
        autoconf_dir=$1
        shift ;;
-
-    --m4dir=* )
-       m4dir=$optarg
+    --macrodir=* | -m* )
+       autoconf_dir=$optarg
        shift ;;
+
     --m4dir | -M )
        test $# = 1 && eval "$exit_missing_arg"
        shift
        m4dir=$1
        shift ;;
+    --m4dir=* | -M* )
+       m4dir=$optarg
+       shift ;;
 
      --force | -f )
        force=:; shift ;;

diff --git a/autoreconf.sh b/autoreconf.sh
index 46453c04b05af70addfe42dadd778c78b7f28146..95533b5574dcae13d24d20c0eb1e049eeae5c7ca 100644 (file)
--- a/autoreconf.sh
+++ b/autoreconf.sh
@@ -128,7 +128,8 @@ done
 
 # Parse command line.
 while test $# -gt 0; do
-  optarg=`expr "$1" : '-[^=]*=\(.*\)'`
+  optarg=`expr "x$1" : 'x--[^=]*=\(.*\)' \| \
+               "x$1" : 'x-.\(.*\)'`
   case "$1" in
     --version | --vers* | -V )
        echo "$version" ; exit 0 ;;
@@ -150,23 +151,23 @@ while test $# -gt 0; do
        localdir=$1
        shift ;;
 
-    --macrodir=* )
-       autoconf_dir=$optarg
-       shift ;;
     --macrodir | -m )
        test $# = 1 && eval "$exit_missing_arg"
        shift
        autoconf_dir=$1
        shift ;;
-
-    --m4dir=* )
-       m4dir=$optarg
+    --macrodir=* | -m* )
+       autoconf_dir=$optarg
        shift ;;
+
     --m4dir | -M )
        test $# = 1 && eval "$exit_missing_arg"
        shift
        m4dir=$1
        shift ;;
+    --m4dir=* | -M* )
+       m4dir=$optarg
+       shift ;;
 
      --force | -f )
        force=:; shift ;;

diff --git a/bin/autoconf.in b/bin/autoconf.in
index ae79c6a2c660e30c8e68c7dcb508c82f3333c3e2..cd9b1bec7c6907cd3432f63c51236a7399c7c1c6 100644 (file)
--- a/bin/autoconf.in
+++ b/bin/autoconf.in
@@ -125,8 +125,8 @@ verbose=:
 
 # Parse command line.
 while test $# -gt 0 ; do
-  optarg=`expr "$1" : '--[^=]*=\(.*\)' \| \
-               "$1" : '-.\(.*\)'`
+  optarg=`expr "x$1" : 'x--[^=]*=\(.*\)' \| \
+               "x$1" : 'x-.\(.*\)'`
   case $1 in
     --version | --vers* | -V )
        echo "$version" ; exit 0 ;;

diff --git a/bin/autoheader.in b/bin/autoheader.in
index 1773dc71e5da4104a342675d616a0135fa8377d4..1b09befdb34179f9a3772915acbb1c61d6dab425 100644 (file)
--- a/bin/autoheader.in
+++ b/bin/autoheader.in
@@ -96,8 +96,8 @@ warning_obsolete=false
 
 # Parse command line.
 while test $# -gt 0 ; do
-  optarg=`expr "$1" : '--[^=]*=\(.*\)' \| \
-               "$1" : '-.\(.*\)'`
+  optarg=`expr "x$1" : 'x--[^=]*=\(.*\)' \| \
+               "x$1" : 'x-.\(.*\)'`
   case $1 in
     --version | --vers* | -V )
        echo "$version" ; exit 0 ;;

diff --git a/bin/autoreconf.in b/bin/autoreconf.in
index 46453c04b05af70addfe42dadd778c78b7f28146..95533b5574dcae13d24d20c0eb1e049eeae5c7ca 100644 (file)
--- a/bin/autoreconf.in
+++ b/bin/autoreconf.in
@@ -128,7 +128,8 @@ done
 
 # Parse command line.
 while test $# -gt 0; do
-  optarg=`expr "$1" : '-[^=]*=\(.*\)'`
+  optarg=`expr "x$1" : 'x--[^=]*=\(.*\)' \| \
+               "x$1" : 'x-.\(.*\)'`
   case "$1" in
     --version | --vers* | -V )
        echo "$version" ; exit 0 ;;
@@ -150,23 +151,23 @@ while test $# -gt 0; do
        localdir=$1
        shift ;;
 
-    --macrodir=* )
-       autoconf_dir=$optarg
-       shift ;;
     --macrodir | -m )
        test $# = 1 && eval "$exit_missing_arg"
        shift
        autoconf_dir=$1
        shift ;;
-
-    --m4dir=* )
-       m4dir=$optarg
+    --macrodir=* | -m* )
+       autoconf_dir=$optarg
        shift ;;
+
     --m4dir | -M )
        test $# = 1 && eval "$exit_missing_arg"
        shift
        m4dir=$1
        shift ;;
+    --m4dir=* | -M* )
+       m4dir=$optarg
+       shift ;;
 
      --force | -f )
        force=:; shift ;;