- djm@cvs.openbsd.org 2006/10/22 02:25:50

     [sftp-client.c]
     cancel progress meter when upload write fails; ok deraadt@

1 files changed, 3 insertions, 1 deletions

diff --git a/sftp-client.c b/sftp-client.c
index e31b2cfaf..42eb2b41b 100644
--- a/sftp-client.c
+++ b/sftp-client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp-client.c,v 1.74 2006/08/03 03:34:42 deraadt Exp $ */
+/* $OpenBSD: sftp-client.c,v 1.75 2006/10/22 02:25:50 djm Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *
@@ -1134,6 +1134,8 @@ do_upload(struct sftp_conn *conn, char *local_path, char *remote_path,
                         if (status != SSH2_FX_OK) {
                                 error("Couldn't write to remote file \"%s\": %s",
                                     remote_path, fx2txt(status));
+                                if (showprogress)
+                                        stop_progress_meter();
                                 do_close(conn, handle, handle_len);
                                 close(local_fd);
                                 xfree(data);