mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-18 10:16:51 +00:00
2fe4b1254d
* net/tramp-cache.el (tramp-dump-connection-properties): Let-bind `print-length' and `print-level' to nil, in order to avoid truncation. Reported by Christopher Schmidt <christopher@ristopher.com>. * net/tramp-cmds.el (tramp-cleanup-connection): Delete also process. * net/tramp-compat.el (tramp-compat-condition-case-unless-debug): New defmacro. (tramp-compat-copy-directory): Add optional argument COPY-CONTENTS. It is not handled yet. * net/tramp-ftp.el (tramp-disable-ange-ftp): Fix docstring. (tramp-ftp-file-name-p): Simplify. * net/tramp-gvfs.el (tramp-gvfs-handle-expand-file-name): * net/tramp-gw.el (tramp-gw-open-connection): Add hop to connection vector. * net/tramp-sh.el (tramp-copy-size-limit): Fix docstring. (tramp-methods): Do not use `tramp-password-end-of-line'. (tramp-completion-function-alist-putty): Handle UNIX case. (tramp-remote-path): Add "/opt/bin", "/opt/sbin" and "/opt/local/bin". (tramp-do-file-attributes-with-stat) (tramp-do-directory-files-and-attributes-with-stat) Return uid and gid as real numbers. They could run out of integer range on cygwin. (tramp-do-copy-or-rename-file-out-of-band): Better trace format. (tramp-sh-handle-expand-file-name): Handle hops. (tramp-open-connection-setup-interactive-shell): Use `tramp-cleanup'. Move check for busyboxes ... (tramp-find-shell): ... here. Simplify implementation. Set "remote-shell" property also for alternative shells. (tramp-remote-coding-commands): Check "test -c /dev/stdout". If failing, a regular file would be written otherwise. Reported by Dmitry Kurochkin <dmitry.kurochkin@gmail.com>. (tramp-find-inline-encoding): Cache the coding commands in the process cache. Apply test command on the remote side, if defined. (tramp-find-inline-compress): Cache the compress commands in the process cache. (tramp-compute-multi-hops): Save `tramp-default-proxies-alist' when requested. Handle hops. (tramp-current-connection): New defvar. (tramp-maybe-open-connection): Use `tramp-cleanup'. Throw `suppress', if there was a failed connection shortly before. Handle user interrupt. (Bug#10187) (tramp-get-inline-compress, tramp-get-inline-coding): Read connection properties from the process cache. * net/tramp-smb.el (tramp-smb-server-version) (tramp-smb-wrong-passwd-regexp, tramp-smb-actions-with-tar): New defconsts. (tramp-smb-prompt): Extend for powershell prompt. (tramp-smb-file-name-handler-alist): Add handlers for `process-file', `shell-command' and `start-file-process'. (tramp-smb-winexe-program, tramp-smb-winexe-shell-command) (tramp-smb-winexe-shell-command-switch): New defcustoms. (tramp-smb-file-name-p): Simplify. (tramp-smb-action-with-tar, tramp-smb-handle-process-file) (tramp-smb-kill-winexe-function, tramp-smb-call-winexe) (tramp-smb-shell-quote-argument): New defuns. (tramp-smb-handle-copy-directory): Add COPY-CONTENTS argument. Implement using "tar". By this, time-stamps are preserved. (tramp-smb-handle-copy-file): Handle also the case of directories. (tramp-smb-do-file-attributes-with-stat) (tramp-smb-get-file-entries, tramp-smb-get-cifs-capabilities): Use `tramp-get-connection-buffer'). (tramp-smb-handle-rename-file): Use "rename", when source and target are on the same share. (tramp-smb-maybe-open-connection): Handle wrong passwords. Use `tramp-smb-server-version'. (tramp-smb-wait-for-output): Remove prompt. * net/tramp.el (top): Require 'cl. (tramp-methods, tramp-rsh-end-of-line): Remove `tramp-password-end-of-line' from docstring. (tramp-save-ad-hoc-proxies): New defcustom. (tramp-completion-function-alist): Adapt docstring. (tramp-default-password-end-of-line): Remove defcustom. (tramp-shell-prompt-pattern): Allow "[]" style prompts. (Bug#11065) (tramp-user-regexp, tramp-file-name-regexp-unified) (tramp-file-name-regexp-url): Extend regexp by hop separator. (tramp-postfix-hop-format, tramp-postfix-hop-regexp) (tramp-remote-file-name-spec-regexp): New defconst. (tramp-file-name-structure): Extend structure for hops. (tramp-get-method-parameter): Move up. (tramp-file-name-p, tramp-dissect-file-name) (with-parsed-tramp-file-name): Handle hops. (tramp-file-name-hop): New defun. (tramp-make-tramp-file-name): New optional arg HOP. (tramp-message-show-progress-reporter-message): New defvar. (tramp-with-progress-reporter): Use it. We cannot use `tramp-message-show-message' here, because this suppresses also error buffers. (tramp-error-with-buffer): Suppress buffer view, if `tramp-message-show-message' is nil. Use `tramp-get-connection-buffer'. (tramp-cleanup): New defun. (tramp-rfn-eshadow-update-overlay): Let-bind `non-essential' to `t'. (tramp-file-name-handler): If `debug-on-error' is set, propagate an error unchanged. (tramp-completion-handle-file-name-all-completions): Handle hops. Fix an error when called from ido. (tramp-completion-dissect-file-name): Use better local variable name. Add hop to the vector. (tramp-handle-insert-file-contents): Use progress-reporter for the whole scenario. (tramp-action-password): Let-bind `enable-recursive-minibuffers' to `t'. (tramp-check-for-regexp): Simplify search. (tramp-enter-password): Remove it. Move implementation ... (tramp-action-password): ... here. (tramp-mode-string-to-int, tramp-local-host-p) (tramp-make-tramp-temp-file, tramp-read-passwd) (tramp-clear-passwd, tramp-time-less-p, tramp-time-diff): Set tramp-autoload cookie. * net/trampver.el: Update release number. * net/tramp.el (tramp-set-completion-function): Fix docstring. (tramp-parse-group, tramp-parse-file) (tramp-parse-shostkeys-sknownhosts): New defuns. (tramp-parse-rhosts, tramp-parse-rhosts-group, tramp-parse-shosts) (tramp-parse-shosts-group, tramp-parse-sconfig) (tramp-parse-sconfig-group, tramp-parse-shostkeys) (tramp-parse-sknownhosts, tramp-parse-hosts) (tramp-parse-hosts-group, tramp-parse-passwd, tramp-parse-netrc): Use them. (tramp-parse-passwd-group, tramp-parse-netrc-group) (tramp-parse-putty-group): Don't narrow. (tramp-parse-putty): Make a loop. (tramp-file-name-handler): Catch the `suppress' signal.
225 lines
8.4 KiB
EmacsLisp
225 lines
8.4 KiB
EmacsLisp
;;; tramp-ftp.el --- Tramp convenience functions for Ange-FTP
|
|
|
|
;; Copyright (C) 2002-2012 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' 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\\." nil tramp-ftp-method))
|
|
(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"))))
|
|
|
|
;; 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."
|
|
(string= (tramp-file-name-method (tramp-dissect-file-name filename))
|
|
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.
|
|
|
|
;;; tramp-ftp.el ends here
|