X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/380874900ca183ec2fdce91949d841328852d7a8..ffe832ea680b4820f5ff399191f7f2d41350ee2e:/lisp/pcmpl-unix.el

diff --git a/lisp/pcmpl-unix.el b/lisp/pcmpl-unix.el
index 35637c0136..d213c3ae8e 100644
--- a/lisp/pcmpl-unix.el
+++ b/lisp/pcmpl-unix.el
@@ -1,13 +1,13 @@
 ;;; pcmpl-unix.el --- standard UNIX completions
 
-;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -24,22 +24,30 @@
 
 ;;; Code:
 
-(provide 'pcmpl-unix)
-
 (require 'pcomplete)
 
 ;; User Variables:
 
 (defcustom pcmpl-unix-group-file "/etc/group"
-  "*If non-nil, a string naming the group file on your system."
-  :type 'file
+  "If non-nil, a string naming the group file on your system."
+  :type '(choice file (const nil))
   :group 'pcmpl-unix)
 
 (defcustom pcmpl-unix-passwd-file "/etc/passwd"
-  "*If non-nil, a string naming the passwd file on your system."
-  :type 'file
+  "If non-nil, a string naming the passwd file on your system."
+  :type '(choice file (const nil))
   :group 'pcmpl-unix)
 
+(defcustom pcmpl-ssh-known-hosts-file "~/.ssh/known_hosts"
+  "If non-nil, a string naming your SSH \"known_hosts\" file.
+This allows completion of SSH host names.  Note that newer
+versions of ssh hash the hosts by default to prevent
+Island-hopping SSH attacks.  This can be disabled, at some risk,
+with the SSH option \"HashKnownHosts no\"."
+  :type '(choice file (const nil))
+  :group 'pcmpl-unix
+  :version "23.1")
+
 ;; Functions:
 
 ;;;###autoload
@@ -123,5 +131,42 @@
     (pcomplete-here* (pcmpl-unix-group-names)))
   (while (pcomplete-here (pcomplete-entries))))
 
-;;; arch-tag: 3f9eb5af-7e0e-449d-b586-381cbbf8fc5c
+
+;; ssh support by Phil Hagelberg.
+;; http://www.emacswiki.org/cgi-bin/wiki/pcmpl-ssh.el
+
+(defun pcmpl-ssh-hosts ()
+  "Return a list of hosts found in `pcmpl-ssh-known-hosts-file'."
+  (when (and pcmpl-ssh-known-hosts-file
+             (file-readable-p pcmpl-ssh-known-hosts-file))
+    (with-temp-buffer
+      (insert-file-contents-literally pcmpl-ssh-known-hosts-file)
+      (let (ssh-hosts-list)
+        (while (re-search-forward "^ *\\([-.[:alnum:]]+\\)[, ]" nil t)
+          (add-to-list 'ssh-hosts-list (match-string 1))
+          (while (and (looking-back ",")
+                      (re-search-forward "\\([-.[:alnum:]]+\\)[, ]"
+                                         (line-end-position) t))
+            (add-to-list 'ssh-hosts-list (match-string 1))))
+        ssh-hosts-list))))
+
+;;;###autoload
+(defun pcomplete/ssh ()
+  "Completion rules for the `ssh' command."
+  (pcomplete-opt "1246AaCfgKkMNnqsTtVvXxYbcDeFiLlmOopRSw" nil t)
+  (pcomplete-here (pcmpl-ssh-hosts)))
+
+;;;###autoload
+(defun pcomplete/scp ()
+  "Completion rules for the `scp' command.
+Includes files as well as host names followed by a colon."
+  (pcomplete-opt "1246BCpqrvcFiloPS")
+  (while t (pcomplete-here (append (pcomplete-all-entries)
+                                   (mapcar (lambda (host)
+                                             (concat host ":"))
+                                           (pcmpl-ssh-hosts))))))
+
+(provide 'pcmpl-unix)
+
+;; arch-tag: 3f9eb5af-7e0e-449d-b586-381cbbf8fc5c
 ;;; pcmpl-unix.el ends here