Allow getopts to handle explicit arguments, rather than "$@".

bash-completion uses this in _init_completion.

core/builtin.py

@@ -1245,15 +1245,13 @@ def _ParseOptSpec(spec_str):
   return spec
 
 
-def _GetOpts(spec, mem, optind):
+def _GetOpts(spec, argv, optind):
   optarg = ''  # not set by default
 
-  v2 = mem.GetArgNum(optind)
-  if v2.tag == value_e.Undef:  # No more arguments.
+  try:
+    current = argv[optind-1]  # 1-based indexing
+  except IndexError:
     return 1, '?', optarg, optind
-  assert v2.tag == value_e.Str
-
-  current = v2.s
 
   if not current.startswith('-'):  # The next arg doesn't look like a flag.
     return 1, '?', optarg, optind
@@ -1268,14 +1266,13 @@ def _GetOpts(spec, mem, optind):
 
   needs_arg = spec[current]
   if needs_arg:
-    v3 = mem.GetArgNum(optind)
-    if v3.tag == value_e.Undef:
+    try:
+      optarg = argv[optind-1]  # 1-based indexing
+    except IndexError:
       util.error('getopts: option %r requires an argument', current)
       # Hm doesn't cause status 1?
       return 0, '?', optarg, optind
-    assert v3.tag == value_e.Str
 
-    optarg = v3.s
     optind += 1
 
   return 0, opt_char, optarg, optind
@@ -1318,7 +1315,8 @@ def GetOpts(argv, mem):
   except ValueError:
     e_die("OPTIND doesn't look like an integer, got %r", v.s)
 
-  status, opt_char, optarg, optind = _GetOpts(spec, mem, optind)
+  user_argv = argv[2:] or mem.GetArgv()
+  status, opt_char, optarg, optind = _GetOpts(spec, user_argv, optind)
 
   state.SetGlobalString(mem, var_name, opt_char)
   state.SetGlobalString(mem, 'OPTARG', optarg)

spec/builtin-getopts.test.sh

@@ -89,18 +89,21 @@ echo h=$FLAG_h c=$FLAG_c optind=$OPTIND argv=$@
 ## stdout: h=0 c= optind=1 argv=x -h -c y
 
 #### getopts with explicit args
-# NOTE: Alpine doesn't appear to use this
+# NOTE: Alpine doesn't appear to use this, but bash-completion does.
 FLAG_h=0
 FLAG_c=''
 arg=''
+set -- A B C
 while getopts "hc:" opt -h -c foo x y z; do
   case $opt in
     h) FLAG_h=1 ;;
     c) FLAG_c="$OPTARG" ;;
   esac
 done
 echo h=$FLAG_h c=$FLAG_c optind=$OPTIND argv=$@
-## stdout: h=1 c=foo optind=4 argv=
+## STDOUT:
+h=1 c=foo optind=4 argv=A B C
+## END
 
 #### OPTIND
 echo $OPTIND

test/spec.sh

@@ -315,7 +315,7 @@ builtin-vars() {
 }
 
 builtin-getopts() {
-  sh-spec spec/builtin-getopts.test.sh --osh-failures-allowed 1 \
+  sh-spec spec/builtin-getopts.test.sh \
     ${REF_SHELLS[@]} $BUSYBOX_ASH $OSH_LIST "$@"
 }