summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--Completion/Unix/Command/_ssh7
2 files changed, 14 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 36c5a9cbe..3b91d17e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2002-09-03 Oliver Kiddle <opk@zsh.org>
+
+ * 17607: Completion/Unix/Command/_ssh: pass through options such as
+ the port number to ssh when getting remote files for scp
+
+ * 17591: Completion/Linux/Command/_losetup,
+ Completion/Linux/Command/_modutils,
+ Completion/Linux/Command/_valgrind: new completion for losetup
+ and move a couple of functions to the Linux directory
+
2002-09-03 Peter Stephenson <pws@csr.com>
* 17602, 17603: Doc/Zsh/builtins.yo, Src/builtin.c, Src/zsh.h:
diff --git a/Completion/Unix/Command/_ssh b/Completion/Unix/Command/_ssh
index 80f4100c9..692a9b5cf 100644
--- a/Completion/Unix/Command/_ssh
+++ b/Completion/Unix/Command/_ssh
@@ -2,10 +2,11 @@
_remote_files () {
# There should be coloring based on all the different ls -F classifiers.
- local expl remfiles remdispf remdispd suf ret=1
+ local expl remfiles remdispf remdispd args suf ret=1
if zstyle -T ":completion:${curcontext}:" remote-access; then
- remfiles=(${(M)${(f)"$(ssh -a -x ${words[CURRENT]%%:*} ls -d1F ${PREFIX%%[^./][^/]#}\* 2>/dev/null)"}%%[^/]#(|/)})
+ zparseopts -D -E -a args p: 1 2 4 6
+ remfiles=(${(M)${(f)"$(ssh $args -a -x ${words[CURRENT]%%:*} ls -d1F ${PREFIX%%[^./][^/]#}\* 2>/dev/null)"}%%[^/]#(|/)})
compset -P '*/'
compset -S '/*' || suf='remote file'
@@ -262,7 +263,7 @@ _ssh () {
;;
file)
if compset -P '*:'; then
- _remote_files && ret=0
+ _remote_files ${(kv)opt_args[(I)-[P1246]]/-P/-p} && ret=0
elif compset -P '*@'; then
_wanted hosts expl host _ssh_hosts -S: && ret=0
else