summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClint Adams <clint@users.sourceforge.net>2006-09-30 21:58:19 +0000
committerClint Adams <clint@users.sourceforge.net>2006-09-30 21:58:19 +0000
commit3badc3caba2c061e4751f226b1d3d67bcd095848 (patch)
tree3788c5adbd45851053b21f1160cd05a064983713
parent8855a7b635cadb5d75c7e1f6c78688dc569af14c (diff)
downloadzsh-3badc3caba2c061e4751f226b1d3d67bcd095848.tar.gz
zsh-3badc3caba2c061e4751f226b1d3d67bcd095848.zip
22800: put quotes around "$@".
-rw-r--r--ChangeLog5
-rw-r--r--Completion/Linux/Type/_fuse_arguments6
-rw-r--r--Completion/Linux/Type/_fuse_values6
-rw-r--r--Completion/Linux/Type/_wakeup_capable_devices2
4 files changed, 12 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index d52a0151b..818c26a26 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2006-09-30 Clint Adams <clint@zsh.org>
+ * 22800: Completion/Linux/Type/_fuse_arguments,
+ Completion/Linux/Type/_fuse_values,
+ Completion/Linux/Type/_wakeup_capable_devices:
+ put quotes around "$@".
+
* 22799: R. Ramkumar: Completion/Linux/Command/_fusermount:
change _fusermount to use _fuse_values and _canonical_paths.
diff --git a/Completion/Linux/Type/_fuse_arguments b/Completion/Linux/Type/_fuse_arguments
index ea705a2d0..b5c21a5e2 100644
--- a/Completion/Linux/Type/_fuse_arguments
+++ b/Completion/Linux/Type/_fuse_arguments
@@ -18,7 +18,7 @@ long=$argv[(I)--]
if (( long )); then
argv[long]=($fargs --)
else
- set -- $@ $fargs
+ set -- "$@" $fargs
fi
while [[ $1 == -(O*|F*|[CRWsw]) ]]; do
@@ -38,10 +38,10 @@ if [[ $cvalsvar != - ]]; then
fsopt='*-o[specify mount options]:mount option:_fuse_values'
[[ -n $cvalsvar ]] && fsopt+=" -A $cvalsvar"
fsopt+=' mount\ option'
- set -- $@ $fsopt
+ set -- "$@" $fsopt
fi
-_arguments -R $opts $@
+_arguments -R $opts "$@"
ret=$?
diff --git a/Completion/Linux/Type/_fuse_values b/Completion/Linux/Type/_fuse_values
index 2600d141c..be830cb40 100644
--- a/Completion/Linux/Type/_fuse_values
+++ b/Completion/Linux/Type/_fuse_values
@@ -44,12 +44,12 @@ fvals=(
'attr_timeout[cache timeout for attributes]:timeout (s)'
)
-[[ -n $cvalsvar ]] && set -- $@ ${(P)cvalsvar}
+[[ -n $cvalsvar ]] && set -- "$@" ${(P)cvalsvar}
if [[ $# -eq 0 ]]; then
set -- 'mount options' $fvals
else
- set -- $@ $fvals
+ set -- "$@" $fvals
fi
if [[ -n $state ]]; then
@@ -57,7 +57,7 @@ if [[ -n $state ]]; then
state=
fi
-_values $opts $@ && ret=0
+_values $opts "$@" && ret=0
if [[ -n $state ]]; then
compstate[restore]=
diff --git a/Completion/Linux/Type/_wakeup_capable_devices b/Completion/Linux/Type/_wakeup_capable_devices
index dd79d2d0d..daad43b7a 100644
--- a/Completion/Linux/Type/_wakeup_capable_devices
+++ b/Completion/Linux/Type/_wakeup_capable_devices
@@ -10,6 +10,6 @@ while read devline; do
desc+=$item
done
-_describe -t wakeup-capable-devices 'wakeup capable device' desc $@ && ret=0
+_describe -t wakeup-capable-devices 'wakeup capable device' desc "$@" && ret=0
return ret