From: Daniel Stenberg <daniel@haxx.se>
Date: Mon, 12 Nov 2012 09:04:44 +0000 (+0100)
Subject: SCP/SFTP: improve error code used for send failures
X-Git-Tag: curl-7_28_1~31
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1c23d2b39290032f739b1b441aba8bf89a0b834f;p=thirdparty%2Fcurl.git

SCP/SFTP: improve error code used for send failures

Instead of relying on the generic CURLE error for SCP or SFTP send
failures, try passing back a more suitable error if possible.
---

diff --git a/lib/ssh.c b/lib/ssh.c
index e8b7172738..d0dd2c7464 100644
--- a/lib/ssh.c
+++ b/lib/ssh.c
@@ -2982,6 +2982,10 @@ static ssize_t scp_send(struct connectdata *conn, int sockindex,
     *err = CURLE_AGAIN;
     nwrite = 0;
   }
+  else if(nwrite < LIBSSH2_ERROR_NONE) {
+    *err = libssh2_session_error_to_CURLE(nwrite);
+    nwrite = -1;
+  }
 
   return nwrite;
 }
@@ -3126,6 +3130,10 @@ static ssize_t sftp_send(struct connectdata *conn, int sockindex,
     *err = CURLE_AGAIN;
     nwrite = 0;
   }
+  else if(nwrite < LIBSSH2_ERROR_NONE) {
+    *err = libssh2_session_error_to_CURLE(nwrite);
+    nwrite = -1;
+  }
 
   return nwrite;
 }