
* doc/misc/tramp.texi: Replace flags by their hard coded name. Remove unused flags and the enclosed alternative text for XEmacs. * doc/misc/trampver.texi: Use "Tramp" CamelCase. Rename "emacs" and "xemacs" flags to "unified" and "separate". Remove flags "emacsgw", "emacsname", "emacsdir", "ftppackagename", "emacsothername", "emacsotherdir" and "emacsotherfilename". (trampver): * lisp/net/trampver.el (tramp-version): Set to "2.3.0-pre". * lisp/net/tramp.el (bkup-backup-directory-info) (directory-sep-char, ls-lisp-use-insert-directory-program) (outline-regexp, tramp-backup-directory-alist) (tramp-default-method, tramp-shell-prompt-pattern, tramp-syntax) (tramp-file-name-regexp-unified) (tramp-file-name-regexp-separate) (tramp-completion-file-name-regexp-unified) (tramp-completion-file-name-regexp-separate, tramp-chunksize) (tramp-get-method-parameter, tramp-find-method, tramp-find-user) (tramp-debug-message, tramp-progress-reporter-update) (with-tramp-progress-reporter) (tramp-rfn-eshadow-setup-minibuffer) (rfn-eshadow-setup-minibuffer-hook, tramp-unload-hook) (tramp-rfn-eshadow-update-overlay) (rfn-eshadow-update-overlay-hook, tramp-default-file-modes) (tramp-file-name-for-operation) (tramp-completion-file-name-handler) (tramp-autoload-file-name-handler, tramp-completion-mode-p) (tramp-handle-directory-files) (tramp-handle-directory-files-and-attributes) (tramp-handle-dired-uncache, tramp-handle-find-backup-file-name) (tramp-handle-insert-file-contents, tramp-handle-load) (tramp-handle-shell-command) (tramp-handle-verify-visited-file-modtime) (tramp-handle-file-notify-valid-p, tramp-accept-process-output) (tramp-check-for-regexp, tramp-wait-for-regexp) (tramp-send-string, tramp-mode-string-to-int) (tramp-get-local-gid, tramp-check-cached-permissions) (tramp-get-remote-tmpdir, tramp-make-tramp-temp-file) (auto-save-file-name-transforms) (tramp-handle-make-auto-save-file-name, tramp-read-passwd) (tramp-clear-passwd, tramp-time-diff): * lisp/net/tramp-adb.el (directory-listing-before-filename-regexp) (directory-sep-char, tramp-adb-file-name-handler-alist) (tramp-adb-parse-device-names) (tramp-adb-handle-expand-file-name) (tramp-adb-handle-file-truename, tramp-adb--gnu-switches-to-ash) (tramp-adb-handle-file-local-copy) (tramp-adb-handle-write-region, tramp-adb-handle-set-file-modes) (tramp-adb-handle-rename-file, tramp-adb-handle-process-file) (tramp-adb-handle-shell-command) (tramp-adb-handle-start-file-process, tramp-adb-get-device) (tramp-adb-maybe-open-connection): * lisp/net/tramp-cache.el (tramp-persistency-file-name) (tramp-cache-print): * lisp/net/tramp-cmds.el (tramp-cleanup-all-connections) (tramp-bug, tramp-reporter-dump-variable) (tramp-load-report-modules, tramp-append-tramp-buffers): * lisp/net/tramp-compat.el (tramp-compat-funcall) (tramp-advice-file-expand-wildcards) (tramp-compat-temporary-file-directory) (tramp-compat-make-temp-file, tramp-compat-copy-file) (tramp-compat-delete-directory, ) (tramp-compat-process-running-p): * lisp/net/tramp-ftp.el (tramp-methods) <ftp>: (tramp-default-method-alist, tramp-foreign-file-name-handler-alist): * lisp/net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist) (tramp-gvfs-do-copy-or-rename-file, tramp-gvfs-handle-copy-file) (tramp-gvfs-handle-file-local-copy) (tramp-gvfs-handle-file-name-all-completions) (tramp-gvfs-handle-file-notify-add-watch) (tramp-gvfs-monitor-file-process-filter) (tramp-gvfs-handle-file-readable-p) (tramp-gvfs-handle-rename-file, tramp-gvfs-handle-write-region) (tramp-gvfs-file-name, tramp-gvfs-handler-askquestion) (tramp-gvfs-maybe-open-connection) (tramp-gvfs-parse-device-names): * lisp/net/tramp-gw.el (tramp-gw-aux-proc-sentinel) (tramp-gw-open-connection, tramp-gw-open-network-stream): * lisp/net/tramp-sh.el (directory-sep-char) (tramp-sh-file-name-handler-alist) (tramp-sh-handle-file-truename) (tramp-sh-handle-set-visited-file-modtime) (tramp-sh-handle-verify-visited-file-modtime) (tramp-sh-handle-set-file-modes, tramp-sh-handle-set-file-times) (tramp-sh-handle-file-acl) (tramp-sh-handle-file-name-all-completions) (tramp-sh-handle-copy-file, tramp-sh-handle-rename-file) (tramp-do-copy-or-rename-file-directly) (tramp-do-copy-or-rename-file-out-of-band) (dired-compress-file-suffixes, dired-remove-file) (tramp-sh-handle-dired-compress-file) (tramp-sh-handle-insert-directory) (tramp-sh-handle-expand-file-name) (tramp-sh-handle-start-file-process) (tramp-sh-handle-process-file, tramp-sh-handle-file-local-copy) (tramp-sh-handle-write-region, tramp-sh-handle-vc-registered) (tramp-sh-handle-file-notify-add-watch) (tramp-sh-gvfs-monitor-dir-process-filter) (tramp-sh-inotifywait-process-filter, tramp-maybe-send-script) (tramp-find-executable) (tramp-open-connection-setup-interactive-shell) (tramp-find-inline-encoding, tramp-compute-multi-hops) (tramp-maybe-open-connection, tramp-convert-file-attributes) (tramp-get-remote-path, tramp-get-remote-touch): * lisp/net/tramp-smb.el (tramp-smb-file-name-handler-alist) (tramp-smb-handle-copy-directory, tramp-smb-handle-copy-file) (tramp-smb-handle-delete-directory) (tramp-smb-handle-directory-files, tramp-smb-handle-file-acl) (tramp-smb-handle-make-directory-internal) (tramp-smb-handle-process-file, tramp-smb-handle-rename-file) (tramp-smb-handle-set-file-acl, tramp-smb-handle-set-file-modes) (tramp-smb-handle-write-region, tramp-smb-get-file-entries) (tramp-smb-get-cifs-capabilities) (tramp-smb-maybe-open-connection): * lisp/net/trampver.el (tramp-repository-get-version): Remove XEmacs compat code. * lisp/net/tramp-cmds.el (mml-mode, mml-insert-empty-tag) (reporter-dump-variable): Declare functions. * lisp/net/tramp.el (tramp-bkup-backup-directory-info) (tramp-advice-minibuffer-electric-separator) (tramp-advice-minibuffer-electric-tilde) (tramp-handle-unhandled-file-name-directory): * lisp/net/tramp-compat.el (tramp-compat-with-temp-message) (tramp-compat-font-lock-add-keywords) (tramp-compat-load, tramp-compat-number-sequence) (tramp-compat-split-string, tramp-compat-delete-dups): * lisp/net/tramp-sh.el (tramp-sh-handle-insert-file-contents-literally): Remove. * lisp/net/tramp-sh.el (tramp-methods) <psftp>: This does not work recursively.
203 lines
7.4 KiB
EmacsLisp
203 lines
7.4 KiB
EmacsLisp
;;; tramp-ftp.el --- Tramp convenience functions for Ange-FTP
|
|
|
|
;; Copyright (C) 2002-2016 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)
|
|
|
|
;; Pacify byte-compiler.
|
|
(eval-when-compile
|
|
(require 'cl)
|
|
(require 'custom))
|
|
(defvar ange-ftp-ftp-name-arg)
|
|
(defvar ange-ftp-ftp-name-res)
|
|
(defvar ange-ftp-name-format)
|
|
|
|
;; Disable Ange-FTP from file-name-handler-alist.
|
|
(defun tramp-disable-ange-ftp ()
|
|
"Turn Ange-FTP off.
|
|
This is useful for unified remoting. See
|
|
`tramp-file-name-structure' 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
|
|
(add-to-list 'tramp-methods (cons tramp-ftp-method nil))
|
|
|
|
;; Add some defaults for `tramp-default-method-alist'.
|
|
;;;###tramp-autoload
|
|
(add-to-list 'tramp-default-method-alist
|
|
(list "\\`ftp\\." nil tramp-ftp-method))
|
|
;;;###tramp-autoload
|
|
(add-to-list 'tramp-default-method-alist
|
|
(list nil "\\`\\(anonymous\\|ftp\\)\\'" tramp-ftp-method))
|
|
|
|
;; Add completion function for FTP method.
|
|
;;;###tramp-autoload
|
|
(eval-after-load 'tramp
|
|
'(tramp-set-completion-function
|
|
tramp-ftp-method
|
|
'((tramp-parse-netrc "~/.netrc"))))
|
|
|
|
;;;###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))
|
|
(tramp-tramp-file-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.
|
|
(t (let* ((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)))))))
|
|
|
|
;; It must be a `defsubst' in order to push the whole code into
|
|
;; tramp-loaddefs.el. Otherwise, there would be recursive autoloading.
|
|
;;;###tramp-autoload
|
|
(defsubst tramp-ftp-file-name-p (filename)
|
|
"Check if it's a filename that should be forwarded to Ange-FTP."
|
|
(string= (tramp-file-name-method (tramp-dissect-file-name filename))
|
|
tramp-ftp-method))
|
|
|
|
;;;###tramp-autoload
|
|
(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.
|
|
|
|
;;; tramp-ftp.el ends here
|