procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix bug#66093 in Tramp

Browse source 
* lisp/net/tramp-sshfs.el (tramp-methods): Use "%a".
(tramp-sshfs-handle-process-file): Replace ?a by "-t".

* lisp/net/tramp.el (tramp-methods): Adapt docstring.  (Bug#66093)
(tramp-handle-make-process): Replace ?a by "-t" if indicated.
This commit is contained in:
Michael Albinus 2023-09-24 17:15:05 +02:00
parent 7d5fee0fea
commit bee18e5273
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/net/tramp-sshfs.el
View file

@ -60,7 +60,7 @@
;; These are for remote processes. ;; These are for remote processes.
(tramp-login-program "ssh") (tramp-login-program "ssh")
(tramp-login-args (("-q") ("-l" "%u") ("-p" "%p") (tramp-login-args (("-q") ("-l" "%u") ("-p" "%p")
("-e" "none") ("-t" "-t") ("-e" "none") ("%a" "%a")
("%h") ("%l"))) ("%h") ("%l")))
(tramp-direct-async t) (tramp-direct-async t)
(tramp-remote-shell ,tramp-default-remote-shell) (tramp-remote-shell ,tramp-default-remote-shell)
@ -323,7 +323,7 @@ arguments to pass to the OPERATION."
?h (or (tramp-file-name-host v) "") ?h (or (tramp-file-name-host v) "")
?u (or (tramp-file-name-user v) "") ?u (or (tramp-file-name-user v) "")
?p (or (tramp-file-name-port v) "") ?p (or (tramp-file-name-port v) "")
?l command)) ?a "-t" ?l command))
;; Synchronize stderr. ;; Synchronize stderr.
(when tmpstderr (when tmpstderr

11
lisp/net/tramp.el
View file

@ -252,9 +252,9 @@ pair of the form (KEY VALUE). The following KEYs are defined:
\"%\" followed by a letter are expanded in the arguments as \"%\" followed by a letter are expanded in the arguments as
follows: follows:
- \"%h\" is replaced by the host name - \"%h\" is replaced by the host name.
- \"%u\" is replaced by the user name - \"%u\" is replaced by the user name.
- \"%p\" is replaced by the port number - \"%p\" is replaced by the port number.
- \"%%\" can be used to obtain a literal percent character. - \"%%\" can be used to obtain a literal percent character.
If a sub-list containing \"%h\", \"%u\" or \"%p\" is If a sub-list containing \"%h\", \"%u\" or \"%p\" is
@ -283,6 +283,8 @@ pair of the form (KEY VALUE). The following KEYs are defined:
- \"%z\" is replaced by the `tramp-scp-direct-remote-copying' - \"%z\" is replaced by the `tramp-scp-direct-remote-copying'
argument if it is supported. argument if it is supported.
- \"%d\" is replaced by the device detected by `tramp-adb-get-device'. - \"%d\" is replaced by the device detected by `tramp-adb-get-device'.
- \"%a\" adds the pseudo-terminal allocation argument \"-t\" in
asynchronous processes, if the connection type is not `pipe'.
The existence of `tramp-login-args', combined with the The existence of `tramp-login-args', combined with the
absence of `tramp-copy-args', is an indication that the absence of `tramp-copy-args', is an indication that the
@ -5033,6 +5035,7 @@ substitution. SPEC-LIST is a list of char/value pairs used for
(when adb-file-name-handler-p (when adb-file-name-handler-p
(tramp-compat-funcall (tramp-compat-funcall
'tramp-adb-get-device v))) 'tramp-adb-get-device v)))
(pta (unless (eq connection-type 'pipe) "-t"))
login-args p) login-args p)
;; Replace `login-args' place holders. Split ;; Replace `login-args' place holders. Split
@ -5049,7 +5052,7 @@ substitution. SPEC-LIST is a list of char/value pairs used for
v 'tramp-login-args v 'tramp-login-args
?h (or host "") ?u (or user "") ?p (or port "") ?h (or host "") ?u (or user "") ?p (or port "")
?c (format-spec (or options "") (format-spec-make ?t tmpfile)) ?c (format-spec (or options "") (format-spec-make ?t tmpfile))
?d (or device "") ?l "")))) ?d (or device "") ?a (or pta "") ?l ""))))
p (make-process p (make-process
:name name :buffer buffer :name name :buffer buffer
:command (append `(,login-program) login-args command) :command (append `(,login-program) login-args command)