*: various loop iteration improvements

bash_completion

@@ -1673,7 +1673,7 @@ _known_hosts_real()
         fi
 
         # apply suffix and prefix
-        for (( i=0; i < ${#COMPREPLY[@]}; i++ )); do
+        for i in ${!COMPREPLY[*]}; do
             COMPREPLY[i]=$prefix$user${COMPREPLY[i]}$suffix
         done
     fi

completions/_umount.linux

@@ -82,8 +82,8 @@ _linux_fstab()
                 dircur="${cur%/*}/"
             fi
             basecur=${cur#"$dircur"}
-            local i n=${#COMPREPLY[@]}
-            for (( i=0; i < n; i++ )); do
+            local i
+            for i in ${!COMPREPLY[*]}; do
                 [[ "${COMPREPLY[i]}" == "$realcur"* ]] &&
                     COMPREPLY+=( $(cd "$dircur" 2>/dev/null &&
                         compgen -f -d -P "$dircur" \

completions/dpkg-source

@@ -5,7 +5,7 @@ _dpkg_source()
     local cur prev words cword
     _init_completion || return
 
-    local options work i action packopts unpackopts fields
+    local options word action packopts unpackopts fields
 
     packopts="-c -l -F -V -T -D -U -W -E -sa -i -I -sk -sr -ss -sA -sK -sP \
         -sU -sR"
@@ -14,13 +14,13 @@ _dpkg_source()
     fields="Format Source Version Binary Maintainer Uploader Architecture \
             Standards-Version Build-Depends Files"
 
-    action="options"
-    for (( i=1; i < ${#words[@]}-1; i++ )); do
-        if [[ ${words[i]} == "-x" ]]; then
+    action=options
+    for word in "${words[@]:1}"; do
+        if [[ $word == -x ]]; then
             action=unpack
-        elif [[ ${words[i]} == "-b" ]]; then
+        elif [[ $word == -b ]]; then
             action=pack
-        elif [[ ${words[i]} == "-h" ]]; then
+        elif [[ $word == -h ]]; then
             action=help
         fi
     done

completions/info

@@ -61,7 +61,7 @@ _info()
     # weed out directory path names and paths to info pages
     COMPREPLY=( ${COMPREPLY[@]##*/?(:)} )
     # weed out info dir file
-    for (( i=0 ; i < ${#COMPREPLY[@]} ; ++i )); do
+    for i in ${!COMPREPLY[*]}; do
         [[ ${COMPREPLY[i]} == dir ]] && unset "COMPREPLY[i]"
     done
     # strip suffix from info pages

completions/pkg-config

@@ -12,11 +12,11 @@ _pkg_config()
             return
             ;;
         --variable)
-            local i
-            for (( i=1; i < ${#words[@]}; i++ )); do
-                if [[ ${words[i]} != -* ]]; then
+            local word
+            for word in "${words[@]:1}"; do
+                if [[ $word != -* ]]; then
                     COMPREPLY=( $(compgen -W \
-                        '$("$1" ${words[i]} --print-variables 2>/dev/null)' \
+                        '$("$1" $word --print-variables 2>/dev/null)' \
                         -- "$cur") )
                     break
                 fi

completions/rcs

@@ -15,15 +15,15 @@ _rcs()
 
     COMPREPLY=( $(compgen -f -- "$dir/RCS/$file") )
 
-    for (( i=0; i < ${#COMPREPLY[@]}; i++ )); do
+    for i in ${!COMPREPLY[*]}; do
         file=${COMPREPLY[i]##*/}
         dir=${COMPREPLY[i]%RCS/*}
         COMPREPLY[i]=$dir$file
     done
 
     COMPREPLY+=( $(compgen -G "$dir/$file*,v") )
 
-    for (( i=0; i < ${#COMPREPLY[@]}; i++ )); do
+    for i in ${!COMPREPLY[*]}; do
         COMPREPLY[i]=${COMPREPLY[i]%,v}
     done
 

completions/unpack200

@@ -23,9 +23,9 @@ _unpack200()
     $split && return
 
     # Check if a pack or a jar was already given.
-    local i pack=false jar=false
-    for (( i=1; i < ${#words[@]}-1; i++ )); do
-        case ${words[i]} in
+    local word pack=false jar=false
+    for word in "${words[@]:1}"; do
+        case $word in
             *.pack|*.pack.gz) pack=true ;;
             *.jar) jar=true ;;
         esac

completions/valgrind

@@ -16,10 +16,10 @@ _valgrind()
         fi
     done
 
-    local tool
-    for (( i=1; i < ${#words[@]}; i++ )); do
-        if [[ ${words[i]} == --tool=?* ]]; then
-            tool=${words[i]}
+    local word tool
+    for word in "${words[@]:1}"; do
+        if [[ $word == --tool=?* ]]; then
+            tool=$word
             break
         fi
     done

completions/wodim

@@ -5,7 +5,7 @@ _cdrecord()
     local cur prev words cword
     _init_completion -n = || return
 
-    local i generic_options track_options track_mode
+    local generic_options track_options track_mode
 
     # foo=bar style option
     if [[ "$cur" == *=* ]]; then
@@ -71,8 +71,9 @@ _cdrecord()
         if [[ -f $prev ]]; then
             track_mode=1
         else
-            for (( i=0; i < ${#track_options[@]}; i++ )); do
-                if [[ "${track_options[i]}" == "$prev" ]]; then
+            local opt
+            for opt in "${track_options[@]}"; do
+                if [[ $opt == "$prev" ]]; then
                     track_mode=1
                     break
                 fi