Attachment 148746 Details for Bug 194624 – an upstream patch to fix a tramp bug on FreeBSD

[patch] an upstream patch to fix a tramp bug on FreeBSD

patch-lisp__net__tramp-sh.el (text/plain), 1.18 KB, created by Joseph Mingrone on 2014-10-28 19:12:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Joseph Mingrone

Created: 2014-10-28 19:12:30 UTC

Size: 1.18 KB

patch

obsolete

>--- lisp/net/tramp-sh.el.orig	2014-06-22 21:47:02.000000000 -0300
>+++ lisp/net/tramp-sh.el	2014-10-28 16:01:55.724344305 -0300
>@@ -4657,6 +4657,17 @@
>     (when (tramp-get-connection-property p "remote-echo" nil)
>       ;; We mark the command string that it can be erased in the output buffer.
>       (tramp-set-connection-property p "check-remote-echo" t)
>+      ;; If we put `tramp-echo-mark' after a trailing newline (which
>+      ;; is assumed to be unquoted) `tramp-send-string' doesn't see
>+      ;; that newline and adds `tramp-rsh-end-of-line' right after
>+      ;; `tramp-echo-mark', so the remote shell sees two consecutive
>+      ;; trailing line endings and sends two prompts after executing
>+      ;; the command, which confuses `tramp-wait-for-output'.
>+      (when (and (not (string= command ""))
>+		 (string-equal (substring command -1) "\n"))
>+	(setq command (substring command 0 -1)))
>+      ;; No need to restore a trailing newline here since `tramp-send-string'
>+      ;; makes sure that the string ends in `tramp-rsh-end-of-line', anyway.
>       (setq command (format "%s%s%s" tramp-echo-mark command tramp-echo-mark)))
>     ;; Send the command.
>     (tramp-message vec 6 "%s" command)

Actions: View | Diff

Attachments on bug 194624: 148692 | 148746 | 148925 | 148970 | 149121 | 149129