From: Michael Albinus <michael.albinus@gmx.de>
Date: Sun, 7 Aug 2022 14:35:50 +0000 (+0200)
Subject: Improve Tramp error message
X-Git-Tag: emacs-29.0.90~1447^2~334
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=82d22ef8db1838c84dbc512b3f1628a549559504;p=emacs.git

Improve Tramp error message

* lisp/net/tramp-sh.el (tramp-sh-handle-file-local-copy):
Simplify for empty files.  Better error message.  (Bug#56879)
---

diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 38fffadd4ec..a2b675cf885 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -3270,6 +3270,9 @@ implementation will be used."
 
       (condition-case err
 	  (cond
+	   ;; Empty file.
+	   ((zerop size))
+
 	   ;; `copy-file' handles direct copy and out-of-band methods.
 	   ((or (tramp-local-host-p v)
 		(tramp-method-out-of-band-p v size))
@@ -3285,6 +3288,11 @@ implementation will be used."
 	       v (format rem-enc (tramp-shell-quote-argument localname))
 	       "Encoding remote file failed"))
 
+	    ;; Check error.  `rem-enc' could be a pipe, which doesn't
+	    ;; flag the error in the first command.
+	    (when (zerop (buffer-size (tramp-get-buffer v)))
+	      (tramp-error v 'file-error' "Encoding remote file failed"))
+
 	    (with-tramp-progress-reporter
 		v 3 (format-message
 		     "Decoding local file `%s' with `%s'" tmpfile loc-dec)