diff options
author | Damien Miller <djm@mindrot.org> | 2006-10-24 03:03:02 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2006-10-24 03:03:02 +1000 |
commit | 50455890f37724113f348f43592b1857071a695c (patch) | |
tree | cf807911f9039dd842d6d1ec9c85d2817f8f9141 | |
parent | 985a4485f57af55cd8f097ab437fdf87c365ea96 (diff) |
- djm@cvs.openbsd.org 2006/10/22 02:25:50
[sftp-client.c]
cancel progress meter when upload write fails; ok deraadt@
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | sftp-client.c | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -22,6 +22,9 @@ | |||
22 | exit instead of doing a blocking tcp send if we detect a client/server | 22 | exit instead of doing a blocking tcp send if we detect a client/server |
23 | timeout, since the tcp sendqueue might be already full (of alive | 23 | timeout, since the tcp sendqueue might be already full (of alive |
24 | requests); ok dtucker, report mpf | 24 | requests); ok dtucker, report mpf |
25 | - djm@cvs.openbsd.org 2006/10/22 02:25:50 | ||
26 | [sftp-client.c] | ||
27 | cancel progress meter when upload write fails; ok deraadt@ | ||
25 | 28 | ||
26 | 20061018 | 29 | 20061018 |
27 | - (dtucker) OpenBSD CVS Sync | 30 | - (dtucker) OpenBSD CVS Sync |
@@ -2563,4 +2566,4 @@ | |||
2563 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 2566 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
2564 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 2567 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
2565 | 2568 | ||
2566 | $Id: ChangeLog,v 1.4577 2006/10/23 17:02:41 djm Exp $ | 2569 | $Id: ChangeLog,v 1.4578 2006/10/23 17:03:02 djm Exp $ |
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 @@ | |||
1 | /* $OpenBSD: sftp-client.c,v 1.74 2006/08/03 03:34:42 deraadt Exp $ */ | 1 | /* $OpenBSD: sftp-client.c,v 1.75 2006/10/22 02:25:50 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> | 3 | * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> |
4 | * | 4 | * |
@@ -1134,6 +1134,8 @@ do_upload(struct sftp_conn *conn, char *local_path, char *remote_path, | |||
1134 | if (status != SSH2_FX_OK) { | 1134 | if (status != SSH2_FX_OK) { |
1135 | error("Couldn't write to remote file \"%s\": %s", | 1135 | error("Couldn't write to remote file \"%s\": %s", |
1136 | remote_path, fx2txt(status)); | 1136 | remote_path, fx2txt(status)); |
1137 | if (showprogress) | ||
1138 | stop_progress_meter(); | ||
1137 | do_close(conn, handle, handle_len); | 1139 | do_close(conn, handle, handle_len); |
1138 | close(local_fd); | 1140 | close(local_fd); |
1139 | xfree(data); | 1141 | xfree(data); |