summaryrefslogtreecommitdiff
path: root/sftp-client.c
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2004-07-17 16:12:08 +1000
committerDarren Tucker <dtucker@zip.com.au>2004-07-17 16:12:08 +1000
commitfc9597034b819b295966f61d8dc797b53fda45c7 (patch)
treea5a9b7afc50720d7b6f89a4ae1f211abbff89f47 /sftp-client.c
parentba6de952a00558e6d93b8c9edd81806a99716411 (diff)
- deraadt@cvs.openbsd.org 2004/07/11 17:48:47
[channels.c cipher.c clientloop.c clientloop.h compat.h moduli.c readconf.c nchan.c pathnames.h progressmeter.c readconf.h servconf.c session.c sftp-client.c sftp.c ssh-agent.1 ssh-keygen.c ssh.c ssh1.h sshd.c ttymodes.h] spaces
Diffstat (limited to 'sftp-client.c')
-rw-r--r--sftp-client.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sftp-client.c b/sftp-client.c
index 88276cd4a..0ffacbccc 100644
--- a/sftp-client.c
+++ b/sftp-client.c
@@ -20,7 +20,7 @@
20/* XXX: copy between two remote sites */ 20/* XXX: copy between two remote sites */
21 21
22#include "includes.h" 22#include "includes.h"
23RCSID("$OpenBSD: sftp-client.c,v 1.50 2004/06/03 12:22:20 pedro Exp $"); 23RCSID("$OpenBSD: sftp-client.c,v 1.51 2004/07/11 17:48:47 deraadt Exp $");
24 24
25#include "openbsd-compat/sys-queue.h" 25#include "openbsd-compat/sys-queue.h"
26 26
@@ -821,7 +821,7 @@ do_download(struct sftp_conn *conn, char *remote_path, char *local_path,
821 u_int len; 821 u_int len;
822 822
823 /* 823 /*
824 * Simulate EOF on interrupt: stop sending new requests and 824 * Simulate EOF on interrupt: stop sending new requests and
825 * allow outstanding requests to drain gracefully 825 * allow outstanding requests to drain gracefully
826 */ 826 */
827 if (interrupted) { 827 if (interrupted) {
@@ -1053,9 +1053,9 @@ do_upload(struct sftp_conn *conn, char *local_path, char *remote_path,
1053 int len; 1053 int len;
1054 1054
1055 /* 1055 /*
1056 * Can't use atomicio here because it returns 0 on EOF, 1056 * Can't use atomicio here because it returns 0 on EOF,
1057 * thus losing the last block of the file. 1057 * thus losing the last block of the file.
1058 * Simulate an EOF on interrupt, allowing ACKs from the 1058 * Simulate an EOF on interrupt, allowing ACKs from the
1059 * server to drain. 1059 * server to drain.
1060 */ 1060 */
1061 if (interrupted) 1061 if (interrupted)