[Bash-completion-commits] [SCM] bash-completion branch, master, updated. ac644578e07720281452d5ed8c22181365a27d87
Ville Skyttä
ville.skytta at iki.fi
Sun Nov 1 19:03:41 UTC 2009
The following commit has been merged in the master branch:
commit ac644578e07720281452d5ed8c22181365a27d87
Author: Ville Skyttä <ville.skytta at iki.fi>
Date: Sun Nov 1 21:01:18 2009 +0200
More compgen -W instead of embedding user input in sed/awk/grep fixes.
diff --git a/CHANGES b/CHANGES
index 344bca3..4b09e15 100644
--- a/CHANGES
+++ b/CHANGES
@@ -33,7 +33,8 @@ bash-completion (2.x)
$plusdirs have been dropped too. 3rd party completions should switch
to using the complete/compgen features directly, and BASH_VERSINFO
for bash version checks.
- * Fix sed error in qdbus completions containing slashes (Debian: 552631).
+ * Protect various completions from unusual user input by not embedding the
+ input in external command arguments (Debian: 552631).
* Add /sbin to $PATH when invoking ifconfig and iwconfig.
* Combine dcop and qdbus completions into the latter.
diff --git a/bash_completion b/bash_completion
index 2a053b9..7521a0e 100644
--- a/bash_completion
+++ b/bash_completion
@@ -480,23 +480,23 @@ _configured_interfaces()
{
if [ -f /etc/debian_version ]; then
# Debian system
- COMPREPLY=( $( sed -ne 's|^iface \([^ ]\+\).*$|\1|p' \
- /etc/network/interfaces ) )
+ COMPREPLY=( $( compgen -W "$( sed -ne 's|^iface \([^ ]\+\).*$|\1|p' \
+ /etc/network/interfaces )" -- "$cur" ) )
elif [ -f /etc/SuSE-release ]; then
# SuSE system
- COMPREPLY=( $( command ls \
- /etc/sysconfig/network/ifcfg-* | \
- sed -ne 's|.*ifcfg-\('"$cur"'.*\)|\1|p' ) )
+ COMPREPLY=( $( compgen -W "$( command ls \
+ /etc/sysconfig/network/ifcfg-* | \
+ sed -ne 's|.*ifcfg-\(.*\)|\1|p' )" -- "$cur" ) )
elif [ -f /etc/pld-release ]; then
# PLD Linux
- COMPREPLY=( $( command ls -B \
- /etc/sysconfig/interfaces | \
- sed -ne 's|.*ifcfg-\('"$cur"'.*\)|\1|p' ) )
+ COMPREPLY=( $( compgen -W "$( command ls -B \
+ /etc/sysconfig/interfaces | \
+ sed -ne 's|.*ifcfg-\(.*\)|\1|p' )" -- "$cur" ) )
else
# Assume Red Hat
- COMPREPLY=( $( command ls \
- /etc/sysconfig/network-scripts/ifcfg-* | \
- sed -ne 's|.*ifcfg-\('"$cur"'.*\)|\1|p' ) )
+ COMPREPLY=( $( compgen -W "$( command ls \
+ /etc/sysconfig/network-scripts/ifcfg-* | \
+ sed -ne 's|.*ifcfg-\(.*\)|\1|p' )" -- "$cur" ) )
fi
}
@@ -524,7 +524,8 @@ _available_interfaces()
fi
COMPREPLY=( $( eval PATH="$PATH:/sbin" $cmd 2>/dev/null | \
- sed -ne 's|^\('"$cur"'[^[:space:][:punct:]]\{1,\}\).*$|\1|p') )
+ awk '/^[^[:space:]]/ { print $1 }' ) )
+ COMPREPLY=( $( compgen -W '${COMPREPLY[@]/%[[:punct:]]/}' -- "$cur" ) )
}
# This function expands tildes in pathnames
@@ -618,14 +619,13 @@ _uids()
_gids()
{
if type getent &>/dev/null; then
- COMPREPLY=( $( getent group | \
- awk -F: '{if ($3 ~ /^'"$cur"'/) print $3}' ) )
+ COMPREPLY=( $( compgen -W '$( getent group | cut -d: -f3 )' \
+ -- "$cur" ) )
elif type perl &>/dev/null; then
COMPREPLY=( $( compgen -W '$( perl -e '"'"'while (($gid) = (getgrent)[2]) { print $gid . "\n" }'"'"' )' -- "$cur" ) )
else
# make do with /etc/group
- COMPREPLY=( $( awk 'BEGIN {FS=":"} {if ($3 ~ /^'"$cur"'/) print $3}'\
- /etc/group ) )
+ COMPREPLY=( $( compgen -W '$( cut -d: -f3 /etc/group )' -- "$cur" ) )
fi
}
@@ -651,8 +651,8 @@ _modules()
{
local modpath
modpath=/lib/modules/$1
- COMPREPLY=( $( command ls -R $modpath | \
- sed -ne 's/^\('"$cur"'.*\)\.k\?o\(\|.gz\)$/\1/p') )
+ COMPREPLY=( $( compgen -W "$( command ls -R $modpath | \
+ sed -ne 's/^\(.*\)\.k\?o\(\|.gz\)$/\1/p' )" -- "$cur" ) )
}
# This function completes on installed modules
@@ -660,7 +660,7 @@ _modules()
_installed_modules()
{
COMPREPLY=( $( compgen -W "$( PATH="$PATH:/sbin" lsmod | \
- awk '{if (NR != 1) print $1}' )" -- $1 ) )
+ awk '{if (NR != 1) print $1}' )" -- "$1" ) )
}
# This function completes on user:group format
@@ -899,15 +899,17 @@ _mount()
for i in {,/usr}/{,s}bin/showmount; do [ -x $i ] && sm=$i && break; done
if [ -n "$sm" ] && [[ "$cur" == *:* ]]; then
- COMPREPLY=( $( $sm -e ${cur%%:*} | sed 1d | \
- grep ^${cur#*:} | awk '{print $1}' ) )
+ COMPREPLY=( $( compgen -W "$( $sm -e ${cur%%:*} | sed 1d | \
+ awk '{print $1}' )" -- "$cur" ) )
elif [[ "$cur" == //* ]]; then
host=${cur#//}
host=${host%%/*}
if [ -n "$host" ]; then
- COMPREPLY=( $( compgen -W "$( echo $( smbclient -d 0 -NL $host 2>/dev/null|
- sed -ne '/^['"$'\t '"']*Sharename/,/^$/p' |
- sed -ne '3,$s|^[^A-Za-z]*\([^'"$'\t '"']*\).*$|//'$host'/\1|p' ) )" -- "$cur" ) )
+ COMPREPLY=( $( compgen -P "//$host" -W \
+ "$( smbclient -d 0 -NL $host 2>/dev/null |
+ sed -ne '/^['"$'\t '"']*Sharename/,/^$/p' |
+ sed -ne '3,$s|^[^A-Za-z]*\([^'"$'\t '"']*\).*$|/\1|p' )" \
+ -- "${cur#//$host}" ) )
fi
elif [ -r /etc/vfstab ]; then
# Solaris
@@ -976,9 +978,8 @@ _insmod()
if [ $COMP_CWORD -gt 1 ] &&
[[ "${COMP_WORDS[COMP_CWORD-1]}" != -* ]]; then
# do module parameter completion
- COMPREPLY=( $( /sbin/modinfo -p ${COMP_WORDS[1]} 2>/dev/null | \
- awk '{if ($1 ~ /^parm:/ && $2 ~ /^'"$cur"'/) { print $2 } \
- else if ($1 !~ /:/ && $1 ~ /^'"$cur"'/) { print $1 }}' ) )
+ COMPREPLY=( $( compgen -W "$( /sbin/modinfo -p ${COMP_WORDS[1]} | \
+ cut -d: -f1 )" -- "$cur" ) )
else
_modules $(uname -r)
fi
diff --git a/contrib/configure b/contrib/configure
index 308595a..c6ebaa0 100644
--- a/contrib/configure
+++ b/contrib/configure
@@ -23,13 +23,15 @@ _configure()
[[ "$cur" != -* ]] && return 0
if [ -n "$COMP_CONFIGURE_HINTS" ]; then
- COMPREPLY=( $( $1 --help 2>&1 | awk '/^ --[A-Za-z]/ { print $1; \
- if ($2 ~ /--[A-Za-z]/) print $2 }' | sed -e 's/[[,].*//g' | \
- grep ^$cur ) )
+ COMPREPLY=( $( compgen -W "$( $1 --help 2>&1 | \
+ awk '/^ --[A-Za-z]/ { print $1; \
+ if ($2 ~ /--[A-Za-z]/) print $2 }' | sed -e 's/[[,].*//g' )" \
+ -- "$cur" ) )
else
- COMPREPLY=( $( $1 --help 2>&1 | awk '/^ --[A-Za-z]/ { print $1; \
- if ($2 ~ /--[A-Za-z]/) print $2 }' | sed -e 's/[[,=].*//g' | \
- grep ^$cur ) )
+ COMPREPLY=( $( compgen -W "$( $1 --help 2>&1 | \
+ awk '/^ --[A-Za-z]/ { print $1; \
+ if ($2 ~ /--[A-Za-z]/) print $2 }' | sed -e 's/[[,=].*//g' )" \
+ -- "$cur" ) )
fi
}
complete -F _configure -o filenames configure
diff --git a/contrib/getent b/contrib/getent
index ec49e2e..008f3ab 100644
--- a/contrib/getent
+++ b/contrib/getent
@@ -27,13 +27,13 @@ _getent()
return 0
;;
protocols|networks|ahosts|ahostsv4|ahostsv6|rpc)
- COMPREPLY=( $( getent "$prev" | \
- sed -ne 's|^\('"$cur"'[^[:space:]]*\).*|\1|p' ) )
+ COMPREPLY=( $( compgen -W "$( getent "$prev" | \
+ awk '{ print $1 }' )" -- "$cur" ) )
return 0
;;
aliases|shadow)
- COMPREPLY=( $( getent "$prev" | \
- sed -ne 's|^\('"$cur"'[^:]*\).*|\1|p' ) )
+ COMPREPLY=( $( compgen -W "$( getent "$prev" | cut -d: -f1 )" \
+ -- "$cur" ) )
return 0
;;
esac
--
bash-completion
More information about the Bash-completion-commits
mailing list