mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-29 08:31:35 -08:00
* Makefile.in (TRAMP_SRC): Remove tramp-fish.el. Add tramp-sh.el. * net/tramp.el (top): Don't show loading message. Require just 'tramp-compat, everything else is required there. Use `ignore-errors' where appropriate. (tramp-inline-compress-start-size, tramp-copy-size-limit) (tramp-terminal-type, tramp-end-of-output) (tramp-initial-end-of-output, tramp-completion-function-alist-rsh) (tramp-completion-function-alist-ssh) (tramp-completion-function-alist-telnet) (tramp-completion-function-alist-su) (tramp-completion-function-alist-putty, tramp-remote-path) (tramp-remote-process-environment, tramp-sh-extra-args) (tramp-actions-before-shell, tramp-uudecode) (tramp-perl-file-truename, tramp-perl-file-name-all-completions) (tramp-perl-file-attributes) (tramp-perl-directory-files-and-attributes) (tramp-perl-encode-with-module, tramp-perl-decode-with-module) (tramp-perl-encode, tramp-perl-decode) (tramp-vc-registered-read-file-names, tramp-file-mode-type-map) (tramp-file-name-handler-alist, tramp-make-tramp-temp-file) (tramp-handle-make-symbolic-link, tramp-handle-load) (tramp-handle-file-name-as-directory) (tramp-handle-file-name-directory) (tramp-handle-file-name-nondirectory, tramp-handle-file-truename) (tramp-handle-file-exists-p, tramp-handle-file-attributes) (tramp-do-file-attributes-with-ls) (tramp-do-file-attributes-with-perl) (tramp-do-file-attributes-with-stat) (tramp-handle-set-visited-file-modtime) (tramp-handle-verify-visited-file-modtime) (tramp-handle-set-file-modes, tramp-handle-set-file-times) (tramp-set-file-uid-gid, tramp-remote-selinux-p) (tramp-handle-file-selinux-context) (tramp-handle-set-file-selinux-context) (tramp-handle-file-executable-p, tramp-handle-file-readable-p) (tramp-handle-file-newer-than-file-p, tramp-handle-file-modes) (tramp-handle-file-directory-p, tramp-handle-file-regular-p) (tramp-handle-file-symlink-p, tramp-handle-file-writable-p) (tramp-handle-file-ownership-preserved-p) (tramp-handle-directory-file-name, tramp-handle-directory-files) (tramp-handle-directory-files-and-attributes) (tramp-do-directory-files-and-attributes-with-perl) (tramp-do-directory-files-and-attributes-with-stat) (tramp-handle-file-name-all-completions) (tramp-handle-file-name-completion, tramp-handle-add-name-to-file) (tramp-handle-copy-file, tramp-handle-copy-directory) (tramp-handle-rename-file, tramp-do-copy-or-rename-file) (tramp-do-copy-or-rename-file-via-buffer) (tramp-do-copy-or-rename-file-directly) (tramp-do-copy-or-rename-file-out-of-band) (tramp-handle-make-directory, tramp-handle-delete-directory) (tramp-handle-delete-file) (tramp-handle-dired-recursive-delete-directory) (tramp-handle-dired-compress-file, tramp-handle-dired-uncache) (tramp-handle-insert-directory) (tramp-handle-unhandled-file-name-directory) (tramp-handle-expand-file-name) (tramp-handle-substitute-in-file-name) (tramp-handle-executable-find, tramp-process-sentinel) (tramp-handle-start-file-process, tramp-handle-process-file) (tramp-handle-call-process-region, tramp-handle-shell-command) (tramp-handle-file-local-copy, tramp-handle-file-remote-p) (tramp-handle-insert-file-contents) (tramp-handle-insert-file-contents-literally) (tramp-handle-find-backup-file-name) (tramp-handle-make-auto-save-file-name, tramp-handle-write-region) (tramp-vc-registered-file-names, tramp-handle-vc-registered) (tramp-sh-file-name-handler, tramp-vc-file-name-handler) (tramp-maybe-send-script, tramp-set-auto-save, tramp-run-test) (tramp-run-test2, tramp-find-executable, tramp-set-remote-path) (tramp-find-file-exists-command, tramp-open-shell) (tramp-find-shell, tramp-barf-if-no-shell-prompt) (tramp-open-connection-setup-interactive-shell) (tramp-local-coding-commands, tramp-remote-coding-commands) (tramp-find-inline-encoding, tramp-call-local-coding-command) (tramp-inline-compress-commands, tramp-find-inline-compress) (tramp-compute-multi-hops, tramp-maybe-open-connection) (tramp-send-command , tramp-wait-for-output) (tramp-send-command-and-check, tramp-barf-unless-okay) (tramp-send-command-and-read, tramp-mode-string-to-int) (tramp-convert-file-attributes, tramp-check-cached-permissions) (tramp-file-mode-from-int, tramp-file-mode-permissions) (tramp-shell-case-fold, tramp-make-copy-program-file-name) (tramp-method-out-of-band-p, tramp-local-host-p) (tramp-get-remote-path, tramp-get-remote-tmpdir) (tramp-get-ls-command, tramp-get-ls-command-with-dired) (tramp-get-test-command, tramp-get-test-nt-command) (tramp-get-file-exists-command, tramp-get-remote-ln) (tramp-get-remote-perl, tramp-get-remote-stat) (tramp-get-remote-readlink, tramp-get-remote-trash) (tramp-get-remote-id, tramp-get-remote-uid, tramp-get-remote-gid) (tramp-get-local-uid, tramp-get-local-gid) (tramp-get-inline-compress, tramp-get-inline-coding, ): Move to tramp-sh.el. (tramp-methods, tramp-default-method-alist) (tramp-default-user-alist, tramp-foreign-file-name-handler-alist): Move initialization to tramp-sh.el. (tramp-temp-name-prefix): Make it a defconst. (tramp-dissect-file-name): Don't check anymore for multi-hop methods. (tramp-debug-outline-regexp): Add a docstring. (tramp-debug-outline-level): Renamed from `tramp-outline-level'. (tramp-get-debug-buffer): Use it. * net/tramp-cache.el (top): Set tramp-autoload cookie for initialization forms. (tramp-set-connection-property): Don't protect `tramp-message' call, it isn't necessary any longer. (tramp-dump-connection-properties): Use `ignore-errors'. * net/tramp-compat.el (top): Require 'advice, 'format-spec, 'password-cache and 'auth-source. * net/tramp-gvfs.el (top): * net/tramp-smb.el (top): Require 'tramp-sh. * net/tramp-gw.el (tramp-gw-open-network-stream): Use `ignore-errors'. * net/tramp-sh.el: New file, derived from tramp.el. (top): Initialize `tramp-methods', `tramp-default-method-alist', `tramp-default-user-alist', tramp-foreign-file-name-handler-alist. Remove "scp1_old", "scp2_old", "ssh1_old", "ssh2_old". Use `ignore-errors' where appropriate. (tramp-sh-file-name-handler-alist): Renamed from `tramp-file-name-handler-alist'. (tramp-send-command-and-check): Return t or nil. Remove all `zerop' checks, where called. (tramp-handle-set-file-modes) (tramp-do-copy-or-rename-file-directly) (tramp-handle-delete-directory, tramp-handle-delete-file) (tramp-maybe-send-script, ): Use `tramp-barf-unless-okay'. (tramp-sh-file-name-handler, tramp-send-command-and-check) (tramp-get-remote-ln): Set tramp-autoload cookie. * net/tramp-fish.el: Remove file.
225 lines
8.4 KiB
EmacsLisp
225 lines
8.4 KiB
EmacsLisp
;;; tramp-ftp.el --- Tramp convenience functions for Ange-FTP
|
|
|
|
;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008,
|
|
;; 2009, 2010 Free Software Foundation, Inc.
|
|
|
|
;; Author: Michael Albinus <michael.albinus@gmx.de>
|
|
;; Keywords: comm, processes
|
|
;; Package: tramp
|
|
|
|
;; 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 3 of the License, or
|
|
;; (at your option) any later version.
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
;; GNU General Public License for more details.
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
;;; Commentary:
|
|
|
|
;; Convenience functions for calling Ange-FTP from Tramp.
|
|
;; Most of them are displaced from tramp.el.
|
|
|
|
;;; Code:
|
|
|
|
(require 'tramp)
|
|
|
|
(eval-when-compile
|
|
|
|
;; Pacify byte-compiler.
|
|
(require 'cl)
|
|
(require 'custom))
|
|
|
|
;; Disable Ange-FTP from file-name-handler-alist.
|
|
;; To handle EFS, the following functions need to be dealt with:
|
|
;;
|
|
;; * dired-before-readin-hook contains efs-dired-before-readin
|
|
;; * file-name-handler-alist contains efs-file-handler-function
|
|
;; and efs-root-handler-function and efs-sifn-handler-function
|
|
;; * find-file-hooks contains efs-set-buffer-mode
|
|
;;
|
|
;; But it won't happen for EFS since the XEmacs maintainers
|
|
;; don't want to use a unified filename syntax.
|
|
(defun tramp-disable-ange-ftp ()
|
|
"Turn Ange-FTP off.
|
|
This is useful for unified remoting. See
|
|
`tramp-file-name-structure-unified' and
|
|
`tramp-file-name-structure-separate' for details. Requests suitable
|
|
for Ange-FTP will be forwarded to Ange-FTP. Also see the variables
|
|
`tramp-ftp-method', `tramp-default-method', and
|
|
`tramp-default-method-alist'.
|
|
|
|
This function is not needed in Emacsen which include Tramp, but is
|
|
present for backward compatibility."
|
|
(let ((a1 (rassq 'ange-ftp-hook-function file-name-handler-alist))
|
|
(a2 (rassq 'ange-ftp-completion-hook-function file-name-handler-alist)))
|
|
(setq file-name-handler-alist
|
|
(delete a1 (delete a2 file-name-handler-alist)))))
|
|
|
|
(eval-after-load "ange-ftp"
|
|
'(when (functionp 'tramp-disable-ange-ftp)
|
|
(tramp-disable-ange-ftp)))
|
|
|
|
;;;###autoload
|
|
(defun tramp-ftp-enable-ange-ftp ()
|
|
;; The following code is commented out in Ange-FTP.
|
|
|
|
;;; This regexp takes care of real ange-ftp file names (with a slash
|
|
;;; and colon).
|
|
;;; Don't allow the host name to end in a period--some systems use /.:
|
|
(or (assoc "^/[^/:]*[^/:.]:" file-name-handler-alist)
|
|
(setq file-name-handler-alist
|
|
(cons '("^/[^/:]*[^/:.]:" . ange-ftp-hook-function)
|
|
file-name-handler-alist)))
|
|
|
|
;;; This regexp recognizes absolute filenames with only one component,
|
|
;;; for the sake of hostname completion.
|
|
(or (assoc "^/[^/:]*\\'" file-name-handler-alist)
|
|
(setq file-name-handler-alist
|
|
(cons '("^/[^/:]*\\'" . ange-ftp-completion-hook-function)
|
|
file-name-handler-alist)))
|
|
|
|
;;; This regexp recognizes absolute filenames with only one component
|
|
;;; on Windows, for the sake of hostname completion.
|
|
(and (memq system-type '(ms-dos windows-nt))
|
|
(or (assoc "^[a-zA-Z]:/[^/:]*\\'" file-name-handler-alist)
|
|
(setq file-name-handler-alist
|
|
(cons '("^[a-zA-Z]:/[^/:]*\\'" .
|
|
ange-ftp-completion-hook-function)
|
|
file-name-handler-alist)))))
|
|
|
|
(add-hook 'tramp-ftp-unload-hook 'tramp-ftp-enable-ange-ftp)
|
|
|
|
;; Define FTP method ...
|
|
;;;###tramp-autoload
|
|
(defconst tramp-ftp-method "ftp"
|
|
"*When this method name is used, forward all calls to Ange-FTP.")
|
|
|
|
;; ... and add it to the method list.
|
|
;;;###tramp-autoload
|
|
(unless (featurep 'xemacs)
|
|
(add-to-list 'tramp-methods (cons tramp-ftp-method nil)))
|
|
|
|
;; Add some defaults for `tramp-default-method-alist'
|
|
(add-to-list 'tramp-default-method-alist
|
|
(list "\\`ftp\\." "" tramp-ftp-method))
|
|
(add-to-list 'tramp-default-method-alist
|
|
(list "" "\\`\\(anonymous\\|ftp\\)\\'" tramp-ftp-method))
|
|
|
|
;; Add completion function for FTP method.
|
|
(tramp-set-completion-function
|
|
tramp-ftp-method
|
|
'((tramp-parse-netrc "~/.netrc")))
|
|
|
|
;; If there is URL syntax, `substitute-in-file-name' needs special
|
|
;; handling.
|
|
(put 'substitute-in-file-name 'ange-ftp 'tramp-handle-substitute-in-file-name)
|
|
(add-hook 'tramp-ftp-unload-hook
|
|
'(lambda ()
|
|
(setplist 'substitute-in-file-name
|
|
(delete 'ange-ftp
|
|
(delete 'tramp-handle-substitute-in-file-name
|
|
(symbol-plist
|
|
'substitute-in-file-name))))))
|
|
|
|
;;;###tramp-autoload
|
|
(defun tramp-ftp-file-name-handler (operation &rest args)
|
|
"Invoke the Ange-FTP handler for OPERATION.
|
|
First arg specifies the OPERATION, second arg is a list of arguments to
|
|
pass to the OPERATION."
|
|
(save-match-data
|
|
(or (boundp 'ange-ftp-name-format)
|
|
(let (file-name-handler-alist) (require 'ange-ftp)))
|
|
(let ((ange-ftp-name-format
|
|
(list (nth 0 tramp-file-name-structure)
|
|
(nth 3 tramp-file-name-structure)
|
|
(nth 2 tramp-file-name-structure)
|
|
(nth 4 tramp-file-name-structure)))
|
|
;; ange-ftp uses `ange-ftp-ftp-name-arg' and `ange-ftp-ftp-name-res'
|
|
;; for optimization in `ange-ftp-ftp-name'. If Tramp wasn't active,
|
|
;; there could be incorrect values from previous calls in case the
|
|
;; "ftp" method is used in the Tramp file name. So we unset
|
|
;; those values.
|
|
(ange-ftp-ftp-name-arg "")
|
|
(ange-ftp-ftp-name-res nil))
|
|
(cond
|
|
;; If argument is a symlink, `file-directory-p' and
|
|
;; `file-exists-p' call the traversed file recursively. So we
|
|
;; cannot disable the file-name-handler this case. We set the
|
|
;; connection property "started" in order to put the remote
|
|
;; location into the cache, which is helpful for further
|
|
;; completion. We don't use `with-parsed-tramp-file-name',
|
|
;; because this returns another user but the one declared in
|
|
;; "~/.netrc".
|
|
((memq operation '(file-directory-p file-exists-p))
|
|
(if (apply 'ange-ftp-hook-function operation args)
|
|
(let ((v (tramp-dissect-file-name (car args) t)))
|
|
(aset v 0 tramp-ftp-method)
|
|
(tramp-set-connection-property v "started" t))
|
|
nil))
|
|
|
|
;; If the second argument of `copy-file' or `rename-file' is a
|
|
;; remote file name but via FTP, ange-ftp doesn't check this.
|
|
;; We must copy it locally first, because there is no place in
|
|
;; ange-ftp for correct handling.
|
|
((and (memq operation '(copy-file rename-file))
|
|
(file-remote-p (cadr args))
|
|
(not (tramp-ftp-file-name-p (cadr args))))
|
|
(let* ((filename (car args))
|
|
(newname (cadr args))
|
|
(tmpfile (tramp-compat-make-temp-file filename))
|
|
(args (cddr args)))
|
|
;; We must set `ok-if-already-exists' to t in the first
|
|
;; step, because the temp file has been created already.
|
|
(if (eq operation 'copy-file)
|
|
(apply operation filename tmpfile t (cdr args))
|
|
(apply operation filename tmpfile t))
|
|
(unwind-protect
|
|
(rename-file tmpfile newname (car args))
|
|
;; Cleanup.
|
|
(ignore-errors (delete-file tmpfile)))))
|
|
|
|
;; Normally, the handlers must be discarded.
|
|
;; `inhibit-file-name-handlers' isn't sufficient, because the
|
|
;; local file name could be in Tramp syntax as well (for
|
|
;; example, returning VMS file names like "/DISK$CAM:/AAA").
|
|
;; That's why we set also `tramp-mode' to nil.
|
|
(t (let* (;(tramp-mode nil)
|
|
(inhibit-file-name-handlers
|
|
(list 'tramp-file-name-handler
|
|
'tramp-completion-file-name-handler
|
|
(and (eq inhibit-file-name-operation operation)
|
|
inhibit-file-name-handlers)))
|
|
(inhibit-file-name-operation operation))
|
|
(apply 'ange-ftp-hook-function operation args)))))))
|
|
|
|
;;;###tramp-autoload
|
|
(defsubst tramp-ftp-file-name-p (filename)
|
|
"Check if it's a filename that should be forwarded to Ange-FTP."
|
|
(let ((v (tramp-dissect-file-name filename)))
|
|
(string= (tramp-file-name-method v) tramp-ftp-method)))
|
|
|
|
;;;###tramp-autoload
|
|
(unless (featurep 'xemacs)
|
|
(add-to-list 'tramp-foreign-file-name-handler-alist
|
|
(cons 'tramp-ftp-file-name-p 'tramp-ftp-file-name-handler)))
|
|
|
|
(add-hook 'tramp-unload-hook
|
|
(lambda ()
|
|
(unload-feature 'tramp-ftp 'force)))
|
|
|
|
(provide 'tramp-ftp)
|
|
|
|
;;; TODO:
|
|
|
|
;; * There are no backup files on FTP hosts.
|
|
|
|
;; arch-tag: 759fb338-5c63-4b99-bd36-b4d59db91cff
|
|
;;; tramp-ftp.el ends here
|