mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-06 06:20:55 -08:00
* doc/misc/tramp.texi: Use @dots{} where appropriate.
(External methods): Precise remark on rsync speed.
(Customizing Methods): Add incus-tramp.
(Password handling): Mention expiration of cached passwords when a
session timeout happens.
(Predefined connection information): Mention also "androidsu" as
special case of "tmpdir".
(Ad-hoc multi-hops, Frequently Asked Questions):
Improve description how ad-hoc multi-hop file names can be made
persistent. (Bug#65039, Bug#76457)
(Remote processes): Signals are not delivered to remote direct
async processes. Say, that there are restrictions for transfer of
binary data to remote direct async processes.
(Bug Reports): Explain bisecting.
(Frequently Asked Questions): Improve index. Speak about
fingerprint readers. Recommend `small-temporary-file-directory'
for ssh sockets.
(External packages): Rename subsection "Timers, process filters,
process sentinels, redisplay".
(Extension packages): New node.
(Top, Files directories and localnames): Add it to @menu.
* doc/misc/trampver.texi:
* lisp/net/trampver.el (tramp-version): Adapt Tramp versions.
(tramp-repository-branch, tramp-repository-version):
Remove ;;;###tramp-autoload cookie.
* lisp/net/tramp-adb.el:
* lisp/net/tramp-androidsu.el:
* lisp/net/tramp-cache.el:
* lisp/net/tramp-cmds.el:
* lisp/net/tramp-compat.el:
* lisp/net/tramp-container.el:
* lisp/net/tramp-crypt.el:
* lisp/net/tramp-ftp.el:
* lisp/net/tramp-fuse.el:
* lisp/net/tramp-gvfs.el:
* lisp/net/tramp-integration.el:
* lisp/net/tramp-message.el:
* lisp/net/tramp-rclone.el:
* lisp/net/tramp-sh.el:
* lisp/net/tramp-smb.el:
* lisp/net/tramp-sshfs.el:
* lisp/net/tramp-sudoedit.el:
* lisp/net/tramp.el: Use `when-let*', `if-let*' and `and-let*'
consequently. (Bug#73441)
* lisp/net/tramp-adb.el (tramp-adb-maybe-open-connection):
Move setting of sentinel up.
* lisp/net/tramp-archive.el (tramp-archive-file-name-p):
Add ;;;###tramp-autoload cookie.
(tramp-archive-local-file-name): New defun.
* lisp/net/tramp-cache.el (tramp-connection-properties): Add link
to the Tramp manual in the docstring.
(tramp-get-connection-property, tramp-set-connection-property):
Don't raise a debug message for the `tramp-cache-version' key.
(with-tramp-saved-connection-property)
(with-tramp-saved-connection-properties): Add traces.
(tramp-dump-connection-properties): Don't save connection property
"pw-spec".
* lisp/net/tramp-cmds.el (tramp-repository-branch)
(tramp-repository-version): Declare.
* lisp/net/tramp-gvfs.el (tramp-gvfs-do-copy-or-rename-file):
(tramp-gvfs-do-copy-or-rename-file): Don't use the truename.
Handle symlinks.
(tramp-gvfs-local-file-name): New defun.
* lisp/net/tramp-message.el (tramp-repository-branch)
(tramp-repository-version): Declare.
(tramp-error-with-buffer, tramp-user-error): Don't redisplay in
`sit-for'. (Bug#73718)
(tramp-warning): Fix `lwarn' call.
* lisp/net/tramp.el (tramp-read-passwd):
* lisp/net/tramp-sh.el (tramp-maybe-open-connection):
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-send-command):
Rename connection property "password-vector" to "pw-vector".
* lisp/net/tramp-sh.el (tramp-methods) <pscp, psftp>:
Adapt `tramp-copy-args' argument.
(tramp-get-remote-pipe-buf, tramp-actions-before-shell):
Use `tramp-fingerprint-prompt-regexp'.
(tramp-sh-handle-copy-directory):
Apply `tramp-do-copy-or-rename-file-directly' if possible.
(tramp-do-copy-or-rename-file): Refactor. Handle symlinks.
(Bug#76678)
(tramp-plink-option-exists-p): New defun.
(tramp-ssh-or-plink-options): Rename from
`tramp-ssh-controlmaster-options'. Adapt further plink options.
(tramp-do-copy-or-rename-file-out-of-band)
(tramp-maybe-open-connection): Adapt calls.
(tramp-sh-handle-make-process): Don't set connection property
"remote-pid", it's unused.
(tramp-sh-handle-process-file): Do proper quoting.
(tramp-vc-file-name-handler): Add `file-directory-p', which is
used in `vc-find-root'. (Bug#74026)
(tramp-maybe-open-connection): Use connection property "hop-vector".
(tramp-get-remote-pipe-buf): Make it more robust.
* lisp/net/tramp-smb.el (tramp-smb-errors): Add string.
(tramp-smb-handle-copy-directory): Don't check existence of
DIRNAME, this is done in `tramp-skeleton-copy-directory' already.
(tramp-smb-handle-copy-file, tramp-smb-handle-rename-file): Refactor.
* lisp/net/tramp-sshfs.el (tramp-sshfs-handle-process-file):
STDERR is not implemented.
* lisp/net/tramp-sudoedit.el (tramp-sudoedit-do-copy-or-rename-file):
Don't use the truename. Handle symlinks.
* lisp/net/tramp.el (tramp-mode): Set to nil on MS-DOS.
(tramp-otp-password-prompt-regexp): Add TACC HPC prompt.
(tramp-wrong-passwd-regexp): Add fingerprint messages.
(tramp-fingerprint-prompt-regexp, tramp-use-fingerprint):
New defcustoms.
(tramp-string-empty-or-nil-p):
Declare `tramp-suppress-trace' property.
(tramp-barf-if-file-missing): Accept also symlinks.
(tramp-skeleton-file-exists-p)
(tramp-handle-file-directory-p): Protect against cyclic symlinks.
(tramp-skeleton-make-symbolic-link): Drop volume letter when flushing.
(tramp-skeleton-process-file): Raise a warning if STDERR is not
implemented.
(tramp-skeleton-set-file-modes-times-uid-gid): Fix typo.
(tramp-compute-multi-hops): Check for
`tramp-sh-file-name-handler-p', it works only for this.
(tramp-handle-shell-command):
Respect `async-shell-command-display-buffer'.
(tramp-action-password, tramp-process-actions): Use connection
property "hop-vector".
(tramp-action-fingerprint, tramp-action-show-message): New defuns.
(tramp-action-show-and-confirm-message): Start check at (point-min).
(tramp-wait-for-regexp): Don't redisplay in `sit-for'. (Bug#73718)
(tramp-convert-file-attributes): Don't cache
"file-attributes-ID-FORMAT".
(tramp-read-passwd, tramp-clear-passwd): Rewrite. (Bug#74105)
* test/lisp/net/tramp-tests.el (auth-source-cache-expiry)
(ert-batch-backtrace-right-margin): Set them to nil.
(vc-handled-backends): Suppress if noninteractive.
(tramp--test-enabled): Cleanup also
`tramp-compat-temporary-file-directory'.
(tramp-test11-copy-file, tramp-test12-rename-file)
(tramp-test18-file-attributes, tramp--test-deftest-with-stat)
(tramp--test-deftest-with-perl, tramp--test-deftest-with-ls)
(tramp--test-deftest-without-file-attributes)
(tramp-test21-file-links, tramp-test28-process-file)
(tramp-test32-shell-command, tramp-test36-vc-registered)
(tramp-test39-make-lock-file-name, tramp--test-check-files)
(tramp-test42-utf8, tramp-test43-file-system-info)
(tramp-test44-file-user-group-ids, tramp-test47-read-password):
Adapt tests.
(tramp-test47-read-fingerprint): New test.
207 lines
8 KiB
EmacsLisp
207 lines
8 KiB
EmacsLisp
;;; tramp-ftp.el --- Tramp convenience functions for Ange-FTP -*- lexical-binding:t -*-
|
|
|
|
;; Copyright (C) 2002-2025 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 <https://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.
|
|
(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)))))
|
|
|
|
(with-eval-after-load 'ange-ftp
|
|
(tramp-disable-ange-ftp))
|
|
|
|
;;;###tramp-autoload
|
|
(defun tramp-ftp-enable-ange-ftp ()
|
|
"Reenable Ange-FTP, when Tramp is unloaded."
|
|
;; 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 "^[[:alpha:]]:/[^/:]*\\'" file-name-handler-alist)
|
|
(setq file-name-handler-alist
|
|
(cons '("^[:alpha:]]:/[^/:]*\\'" .
|
|
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
|
|
(tramp--with-startup
|
|
(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 (rx bos "ftp.") nil tramp-ftp-method))
|
|
(add-to-list 'tramp-default-method-alist
|
|
(list nil (rx bos (| "anonymous" "ftp") eos) tramp-ftp-method))
|
|
|
|
;; Add completion function for FTP method.
|
|
(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 and ARGS.
|
|
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)
|
|
(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".
|
|
;; For file names which look like Tramp archive files like
|
|
;; "/ftp:anonymous@ftp.gnu.org:/gnu/tramp/tramp-2.0.39.tar.gz",
|
|
;; we must disable tramp-archive.el, because in
|
|
;; `ange-ftp-get-files' this is "normalized" by
|
|
;; `file-name-as-directory' with unwelcome side side-effects.
|
|
;; This disables the file archive functionality, perhaps we
|
|
;; could fix this otherwise. (Bug#56078)
|
|
((memq operation '(file-directory-p file-exists-p))
|
|
(cl-letf (((symbol-function #'tramp-archive-file-name-handler)
|
|
(lambda (operation &rest args)
|
|
(tramp-archive-run-real-handler operation args))))
|
|
(prog1 (apply #'ange-ftp-hook-function operation args)
|
|
(let ((v (tramp-dissect-file-name (car args) t)))
|
|
(setf (tramp-file-name-method v) tramp-ftp-method)
|
|
(tramp-set-connection-property v "started" t)))))
|
|
|
|
;; 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 (vec-or-filename)
|
|
"Check if it's a VEC-OR-FILENAME that should be forwarded to Ange-FTP."
|
|
(and-let* ((vec (tramp-ensure-dissected-file-name vec-or-filename))
|
|
((string= (tramp-file-name-method vec) tramp-ftp-method)))))
|
|
|
|
;;;###tramp-autoload
|
|
(tramp--with-startup
|
|
(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
|