summaryrefslogtreecommitdiff
path: root/sftp-client.c
diff options
context:
space:
mode:
authordjm <djm>2006-10-23 17:03:02 +0000
committerdjm <djm>2006-10-23 17:03:02 +0000
commit9d860d90aa2802d723dfd84c22449a841ce0e6fa (patch)
tree7fe3d89570741df6814caad4d62751f368f5a69b /sftp-client.c
parent517ec116bcb505b7bbb3aff268a83db93c5b1375 (diff)
downloadopenssh-9d860d90aa2802d723dfd84c22449a841ce0e6fa.tar.gz
- djm@cvs.openbsd.org 2006/10/22 02:25:50
[sftp-client.c] cancel progress meter when upload write fails; ok deraadt@
Diffstat (limited to 'sftp-client.c')
-rw-r--r--sftp-client.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sftp-client.c b/sftp-client.c
index e31b2cfa..42eb2b41 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);