コミット: 6c575bca840b1b8c556fb22ac51036819e3b2148 - mingw.pkg (git)

Experimental package creation tool for MinGW.org

コミットメタ情報

• リビジョン: 6c575bca840b1b8c556fb22ac51036819e3b2148 (tree)
• 日時: 2018-05-16 18:09:45
• 作者: Keith Marshall <keith@user...>
• コミッター: Keith Marshall

ログメッセージ

Robustly interpret options with mandatory arguments.

* src/modules/optdefn.sh (optchk) [-*]
(optchk_getopt_long) [-*, --*]: Clear argshift value, when it may
require adjustment to accommodate a detached argument, and then...
(opteval): ...adjust it to 1 or 2, as appropriate; validate...
[argshift == 2 && $# >= 2]: ...else diagnose and abort.

* src/modules/options.sh (arch, option, srcdir): Add...
[requires_argument]: ...this property qualifier.

変更サマリ

• modified: src/modules/optdefn.sh
• modified: src/modules/options.sh

差分

--- a/src/modules/optdefn.sh
+++ b/src/modules/optdefn.sh
@@ -202,7 +202,7 @@
 	   # upon to support optional option-argument processing).
 	   #
 	     do opt=`echo "$arg" | cut -c1` arg=`echo "$arg" | cut -c2-`
-		have_optmatch=false
+		have_optmatch=false argshift=0
 		for optchr in $shortopts '??'
 		  do $have_optmatch || {
 		     # We haven't found a match for the current character...
@@ -224,6 +224,7 @@
 		       # accepts an argument, propagate any residual of this
 		       # option string as an argument...
 		       #
+			 test "x$arg" = x || argshift=1
 			 have_optmatch=true optmatch=$opt
 			 eval '${'$opt'_optional_argument-false}' &&
 			   optarg=$arg arg=
@@ -275,12 +276,18 @@
       #
       *=*) optarg="`echo "$arg" | sed 's,^[^=]*=,,'`"
 	   arg="`IFS='='; set -- $arg; defn_parameter_list $1`"
+	   argshift=1
 	   ;;
       # North american users don't distinguish "licence"
       # and "license", and will generally adopt the latter
       # spelling; accept this, as a special case.
       #
-      --licens | --license) arg="--licence"
+      --licens | --license) arg="--licence" ;;
+
+      # For any other possible match, force a $argshift adjustment,
+      # to accommodate a possibly detached mandatory argument.
+      #
+      *) argshift=0
     esac
 
     for opt in $longopts
@@ -318,6 +325,10 @@
   # with the original "$@" argument vector from "optchk" itself.
   #
     test "x$optmatch" = x && optmatch_unknown "$1"
+    test $argshift -eq 0 && eval '${'$optmatch'_requires_argument-false}' && {
+      test $# -ge 2 || die "option '$optmatch' requires an argument"
+      optarg="$2" argshift=2
+    } || argshift=1
     opteval_$optmatch "$@"
   }
 

--- a/src/modules/options.sh
+++ b/src/modules/options.sh
@@ -45,13 +45,13 @@
   optdefine c stdout
   opteval_stdout(){ OUTPUT_STREAMING_OPTION=stdout; }
 
-  optdefine option
+  optdefine option requires_argument
   opteval_option(){ option $optarg; }
 
-  optdefine arch
+  optdefine arch requires_argument
   opteval_arch(){ ARCH="$optarg"; }
 
-  optdefine srcdir
+  optdefine srcdir requires_argument
   opteval_srcdir(){
     mkdir -p .$cmd && echo "PACKAGE_SRCDIR=\"$optarg\"" > .$cmd/srcdir.sh
     PACKAGE_SRCDIR="$optarg"