mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2025-02-08 20:58:58 +00:00
![Michael Albinus](/assets/img/avatar_default.png)
* net/tramp-cmds.el (tramp-cleanup-all-connections) (tramp-reporter-dump-variable, tramp-load-report-modules) (tramp-append-tramp-buffers): Use `tramp-compat-funcall'. (tramp-bug): Recommend setting of `tramp-verbose' to 9. * net/tramp-compat.el (top): Do not autoload `tramp-handle-file-remote-p'. Load tramp-util.el and tramp-vc.el only when `start-file-process' is not bound. (byte-compile-not-obsolete-vars): Define if not bound. (tramp-compat-funcall): New defmacro. (tramp-compat-line-beginning-position) (tramp-compat-line-end-position) (tramp-compat-temporary-file-directory) (tramp-compat-make-temp-file, tramp-compat-file-attributes) (tramp-compat-copy-file, tramp-compat-copy-directory) (tramp-compat-delete-file, tramp-compat-delete-directory) (tramp-compat-number-sequence, tramp-compat-process-running-p): Use it. (tramp-advice-file-expand-wildcards): Do not use `tramp-handle-file-remote-p'. (tramp-compat-make-temp-file): Simplify fallback implementation. (tramp-compat-copy-file): Add PRESERVE-SELINUX-CONTEXT. (tramp-compat-copy-tree): Remove function. (tramp-compat-delete-file): New defun. (tramp-compat-delete-directory): Provide implementation for older Emacsen. (tramp-compat-file-attributes): Handle only `wrong-number-of-arguments' error. * net/tramp-fish.el (tramp-fish-handle-copy-file): Add PRESERVE_SELINUX_CONTEXT. (tramp-fish-handle-delete-file): Add TRASH arg. (tramp-fish-handle-directory-files-and-attributes): Do not use `tramp-fish-handle-file-attributes. (tramp-fish-handle-file-local-copy) (tramp-fish-handle-insert-file-contents) (tramp-fish-maybe-open-connection): Use `with-progress-reporter'. * net/tramp-gvfs.el (top): Require url-util. (tramp-gvfs-mount-point): Remove. (tramp-gvfs-file-name-handler-alist): Add `file-selinux-context' and `set-file-selinux-context'. (tramp-gvfs-stringify-dbus-message, tramp-gvfs-send-command) (tramp-gvfs-handle-file-selinux-context) (tramp-gvfs-handle-set-file-selinux-context): New defuns. (with-tramp-dbus-call-method): Format trace message. (tramp-gvfs-handle-copy-file): Handle PRESERVE-SELINUX-CONTEXT. (tramp-gvfs-handle-copy-file, tramp-gvfs-handle-rename-file): Implement backup call, when operation on local files fails. Use progress reporter. Flush properties of changed files. (tramp-gvfs-handle-delete-file): Add TRASH arg. Use `tramp-compat-delete-file'. (tramp-gvfs-handle-expand-file-name): Expand "~/". (tramp-gvfs-handle-make-directory): Make more traces. (tramp-gvfs-handle-write-region): Protect deleting tmpfile. (tramp-gvfs-url-file-name): Hexify file name in url. (tramp-gvfs-fuse-file-name): Take also prefix (like dav shares) into account for the resulting file name. (tramp-gvfs-handler-askquestion): Preserve current message, in order to let progress reporter continue afterwards. (Bug#6257) Return dummy mountpoint, when the answer is "no". See `tramp-gvfs-maybe-open-connection'. (tramp-gvfs-handler-mounted-unmounted) (tramp-gvfs-connection-mounted-p): Test also for new mountspec attribute "default_location". Set "prefix" property. Handle default-location. (tramp-gvfs-mount-spec): Return both prefix and mountspec. (tramp-gvfs-maybe-open-connection): Test, whether mountpoint exists. Raise an error, if not (due to a corresponding answer "no" in interactive questions, for example). Use `tramp-compat-funcall'. * net/tramp-imap.el (top): Autoload `epg-make-context'. (tramp-imap-handle-copy-file): Add PRESERVE-SELINUX-CONTEXT. (tramp-imap-do-copy-or-rename-file) (tramp-imap-handle-insert-file-contents) (tramp-imap-handle-file-local-copy): Use `with-progress-reporter'. (tramp-imap-handle-delete-file): Add TRASH arg. * net/tramp-smb.el (tramp-smb-handle-copy-file): Add PRESERVE-SELINUX-CONTEXT. (tramp-smb-handle-copy-file) (tramp-smb-handle-file-local-copy, tramp-smb-handle-rename-file) (tramp-smb-handle-write-region, tramp-smb-maybe-open-connection): Use `with-progress-reporter'. (tramp-smb-handle-delete-file): Add TRASH arg. * net/tramp.el (tramp-methods): Move hostname to the end in all ssh `tramp-login-args'. Add `tramp-async-args' attribute where appropriate. (tramp-verbose): Describe verbose level 9. (tramp-completion-function-alist) (tramp-file-name-regexp, tramp-chunksize) (tramp-local-coding-commands, tramp-remote-coding-commands) (with-connection-property, tramp-completion-mode-p) (tramp-action-process-alive, tramp-action-out-of-band) (tramp-check-for-regexp, tramp-file-name-p, tramp-equal-remote) (tramp-exists-file-name-handler): Fix docstring. (tramp-remote-process-environment): Use `format' instead of `concat'. Protect version string by apostroph. (tramp-shell-prompt-pattern): Do not use a shy group in case of XEmacs. (tramp-file-name-regexp-unified) (tramp-completion-file-name-regexp-unified): On W32 systems, do not regard the volume letter as remote filename. (Bug#5447) (tramp-perl-file-attributes) (tramp-perl-directory-files-and-attributes): Don't pass "$3". (tramp-vc-registered-read-file-names): Read input as here-document, otherwise the command could exceed maximum length of command line. (tramp-file-name-handler-alist): Add `file-selinux-context' and `set-file-selinux-context'. (tramp-debug-message): Add `tramp-compat-funcall' to ignored backtrace functions. (tramp-error-with-buffer): Don't show the connection buffer when we are in completion mode. (tramp-progress-reporter-update, tramp-remote-selinux-p) (tramp-handle-file-selinux-context) (tramp-handle-set-file-selinux-context, tramp-process-sentinel) (tramp-connectable-p, tramp-open-shell, tramp-get-remote-trash): New defuns. (with-progress-reporter): New defmacro. (tramp-debug-outline-regexp): New defconst. (top, tramp-rfn-eshadow-setup-minibuffer) (tramp-rfn-eshadow-update-overlay, tramp-handle-set-file-times) (tramp-handle-dired-compress-file, tramp-handle-shell-command) (tramp-completion-mode-p, tramp-check-for-regexp) (tramp-open-connection-setup-interactive-shell) (tramp-compute-multi-hops, tramp-read-passwd, tramp-clear-passwd) (tramp-time-diff, tramp-coding-system-change-eol-conversion) (tramp-set-process-query-on-exit-flag, tramp-unload-tramp): Use `tramp-compat-funcall'. (tramp-handle-make-symbolic-link): Flush file properties. (tramp-handle-load, tramp-handle-file-local-copy) (tramp-handle-insert-file-contents, tramp-handle-write-region) (tramp-handle-vc-registered, tramp-maybe-send-script) (tramp-find-shell): Use `with-progress-reporter'. (tramp-do-file-attributes-with-stat): Add space in format string, in order to work around a bug in pdksh. Reported by Gilles Pion <gpion@lfdj.com>. (tramp-handle-verify-visited-file-modtime): Do not send a command when the connection is not established. (tramp-handle-set-file-times): Simplify the check for utc. (tramp-handle-directory-files-and-attributes) (tramp-get-remote-path): Use `copy-tree'. (tramp-completion-handle-file-name-all-completions): Ensure, that non remote files are still checked. Oops. (tramp-handle-copy-file, tramp-do-copy-or-rename-file): Handle PRESERVE-SELINUX-CONTEXT. (tramp-do-copy-or-rename-file): Add progress reporter. (tramp-do-copy-or-rename-file-directly): Do not use `tramp-handle-file-remote-p'. (tramp-do-copy-or-rename-file-out-of-band): Use `tramp-compat-delete-directory'. (tramp-do-copy-or-rename-file-out-of-band) (tramp-compute-multi-hops, tramp-maybe-open-connection): Use `format-spec-make'. (tramp-handle-delete-file): Add TRASH arg. (tramp-handle-dired-uncache): Flush directory cache, not only file cache. (tramp-handle-expand-file-name) (tramp-completion-handle-file-name-all-completions) (tramp-completion-handle-file-name-completion): Use `tramp-connectable-p'. (tramp-handle-start-file-process): Set connection property "vec". Use it, in order to invalidate file caches. Check only for `remote-tty' process property. Implement tty setting. (Bug#4604, Bug#6360) (tramp-file-name-for-operation): Add `call-process-region' and `set-file-selinux-context'. (tramp-find-foreign-file-name-handler) (tramp-advice-make-auto-save-file-name) (tramp-set-auto-save-file-modes): Remove superfluous check for `stringp'. This is done inside `tramp-tramp-file-p'. (tramp-file-name-handler): Trace 'quit. Catch the error for some operations when we are in completion mode. This gives the user the chance to correct the file name in the minibuffer. (tramp-completion-mode-p): Use `non-essential'. (tramp-handle-file-name-all-completions): Backward/ XEmacs compatibility: Use `completion-ignore-case' if `read-file-name-completion-ignore-case' does not exist. (tramp-get-debug-buffer): Use `tramp-debug-outline-regexp'. (tramp-find-shell, tramp-open-connection-setup-interactive-shell): `tramp-open-shell'. (tramp-action-password): Hide password prompt before next run. (tramp-process-actions): Widen connection buffer for the trace. (tramp-open-connection-setup-interactive-shell): Set `remote-tty' process property. Trace stty settings if `tramp-verbose' >= 9. Apply workaround for IRIX64 bug. Move argument of last `tramp-send-command' where it belongs to. (tramp-maybe-open-connection): Use `async-args' and `gw-args' in front of `login-args'. (tramp-get-ls-command, tramp-get-ls-command-with-dired): Run tests on "/dev/null" instead of "/". (tramp-get-ls-command-with-dired): Make test for "--dired" stronger. (tramp-set-auto-save-file-modes): Adapt version check. (tramp-set-process-query-on-exit-flag): Fix wrong parentheses. (tramp-handle-process-file): Call the program in a subshell, in order to preserve working directory. (tramp-handle-shell-command): Don't use hard-wired "/bin/sh" but `tramp-remote-sh' from `tramp-methods'. (tramp-get-ls-command): Make test for "--color=never" stronger. (tramp-check-for-regexp): Use (forward-line 1). * net/trampver.el: Update release number. * net/tramp-gvfs.el (tramp-gvfs-handle-copy-file): Do not pass empty argument to gvfs-copy. * net/tramp-compat.el (tramp-compat-delete-file): Rewrite to handle new TRASH arg of `delete-file'. * net/tramp.el (tramp-handle-insert-directory): Don't use `forward-word', its default syntax could be changed. Implement compression for inline methods. * net/tramp.el (tramp-inline-compress-start-size): New defcustom. (tramp-copy-size-limit): Allow also nil. (tramp-inline-compress-commands): New defconst. (tramp-find-inline-compress, tramp-get-inline-compress) (tramp-get-inline-coding): New defuns. (tramp-get-remote-coding, tramp-get-local-coding): Remove, replaced by `tramp-get-inline-coding'. (tramp-handle-file-local-copy, tramp-handle-write-region) (tramp-method-out-of-band-p): Use `tramp-get-inline-coding'. Detect ssh 'ControlMaster' argument automatically in some cases. * net/tramp.el (tramp-detect-ssh-controlmaster): New defun. (tramp-default-method): Use it. * net/tramp.el (tramp-file-name-for-operation): Add file-selinux-context.
221 lines
8.4 KiB
EmacsLisp
221 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
|
|
|
|
;; 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)
|
|
(autoload 'tramp-set-connection-property "tramp-cache")
|
|
|
|
(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 ...
|
|
(defcustom tramp-ftp-method "ftp"
|
|
"*When this method name is used, forward all calls to Ange-FTP."
|
|
:group 'tramp
|
|
:type 'string)
|
|
|
|
;; ... and add it to the method list.
|
|
(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))))))
|
|
|
|
(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)))))))
|
|
|
|
(defun 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)))
|
|
|
|
(add-to-list 'tramp-foreign-file-name-handler-alist
|
|
(cons 'tramp-ftp-file-name-p 'tramp-ftp-file-name-handler))
|
|
|
|
(provide 'tramp-ftp)
|
|
|
|
;;; TODO:
|
|
|
|
;; * In case of "/ftp:host:file" this works only for functions which
|
|
;; are defined in `tramp-file-name-handler-alist'. Call has to be
|
|
;; pretended in `tramp-file-name-handler' otherwise.
|
|
;; Furthermore, there are no backup files on FTP hosts.
|
|
;; Worth further investigations.
|
|
|
|
;; arch-tag: 759fb338-5c63-4b99-bd36-b4d59db91cff
|
|
;;; tramp-ftp.el ends here
|