bug#30595: [PATCH] Handle command line wrapping in Tramp adb.

bug#30595: [PATCH] Handle command line wrapping in Tramp adb.

[Mathieu Othacehe]

The command sent to an adb shell input might be wrapped around
terminal column count by the kernel. Remove CR and LF introduced when
it happends.

* lisp/net/tramp-adb.el (tramp-adb-send-command): Remove W32 trailing
  CR but also CR/LF introduced by command line wrapping.
---
 lisp/net/tramp-adb.el | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el
index be269aca51..532569414b 100644
--- a/lisp/net/tramp-adb.el
+++ b/lisp/net/tramp-adb.el
@@ -1178,14 +1178,17 @@ tramp-adb-send-command
   (with-current-buffer (tramp-get-connection-buffer vec)
     (save-excursion
       (goto-char (point-min))
-      ;; We can't use stty to disable echo of command.
-      (delete-matching-lines (regexp-quote command))
       ;; When the local machine is W32, there are still trailing ^M.
       ;; There must be a better solution by setting the correct coding
       ;; system, but this requires changes in core Tramp.
+      ;;
+      ;; Also remove CR and LF introduced by kernel when input command
+      ;; is longer than terminal column count.
+      (while (re-search-forward "\r+\n*" nil t)
+	(replace-match "" nil nil))
       (goto-char (point-min))
-      (while (re-search-forward "\r+$" nil t)
-	(replace-match "" nil nil)))))
+      ;; We can't use stty to disable echo of command.
+      (delete-matching-lines (regexp-quote command)))))
 
 (defun tramp-adb-send-command-and-check (vec command)
   "Run COMMAND and check its exit status.
-- 
2.16.1

bug#30595: [PATCH] Handle command line wrapping in Tramp adb.

[Michael Albinus]

Mathieu Othacehe <m.othacehe@gmail.com> writes:

Hi Mathieu,

> The command sent to an adb shell input might be wrapped around
> terminal column count by the kernel. Remove CR and LF introduced when
> it happends.

Your patch doesn't pass Tramp's test suite, using my plain Galaxy S6. It
fails in tramp-test09-insert-file-contents. Could you, pls, check?

In order to run the test suite in Tramp's git repository, apply

$ env REMOTE_TEMPORARY_FILE_DIRECTORY=/adb::/sdcard/tmp make check

If you use Emacs' git repository instead, apply

$ env REMOTE_TEMPORARY_FILE_DIRECTORY=/adb::/sdcard/tmp \
  make check -C test tramp-tests

(You might use another temporary directory on your device.)

Pls sync first with the git repository; I've pushed a patch earlier
today fixing another nasty (unrelated) bug which let Tramp fail in test.

Btw, your other patch wrt bug#30594 runs OK with the tests.

Best regards, Michael.

bug#30595: [PATCH] Handle command line wrapping in Tramp adb.

[Mathieu Othacehe]

Hi Michael,

> Pls sync first with the git repository; I've pushed a patch earlier
> today fixing another nasty (unrelated) bug which let Tramp fail in test.
>
> Btw, your other patch wrt bug#30594 runs OK with the tests.

Ok I'll try to understand why it breaks tramp tests.

Thanks for pushing the previous patch,

Mathieu

bug#30595: [PATCH] Handle command line wrapping in Tramp adb.

[Michael Albinus]

Mathieu Othacehe <m.othacehe@gmail.com> writes:

> Hi Michael,

Hi Mathieu,

>> Pls sync first with the git repository; I've pushed a patch earlier
>> today fixing another nasty (unrelated) bug which let Tramp fail in test.
>
> Ok I'll try to understand why it breaks tramp tests.

Ping.

> Mathieu

Best regards, Michael.

bug#30595: [PATCH] Handle command line wrapping in Tramp adb.

[Michael Albinus]

Michael Albinus <michael.albinus@gmx.de> writes:

> Mathieu Othacehe <m.othacehe@gmail.com> writes:

Hi Mathieu,

>>> Pls sync first with the git repository; I've pushed a patch earlier
>>> today fixing another nasty (unrelated) bug which let Tramp fail in test.
>>
>> Ok I'll try to understand why it breaks tramp tests.
>
> Ping.

No progress, so I'm closing the bug. If you still intend to propose a
patch, you could reply.

>> Mathieu

Best regards, Michael.