diff options
Diffstat (limited to 'sftp-client.c')
-rw-r--r-- | sftp-client.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sftp-client.c b/sftp-client.c index 3b3279e65..ffff0fe5a 100644 --- a/sftp-client.c +++ b/sftp-client.c | |||
@@ -28,7 +28,7 @@ | |||
28 | /* XXX: copy between two remote sites */ | 28 | /* XXX: copy between two remote sites */ |
29 | 29 | ||
30 | #include "includes.h" | 30 | #include "includes.h" |
31 | RCSID("$OpenBSD: sftp-client.c,v 1.42 2003/03/05 22:33:43 markus Exp $"); | 31 | RCSID("$OpenBSD: sftp-client.c,v 1.44 2003/06/28 16:23:06 deraadt Exp $"); |
32 | 32 | ||
33 | #include "openbsd-compat/sys-queue.h" | 33 | #include "openbsd-compat/sys-queue.h" |
34 | 34 | ||
@@ -71,10 +71,10 @@ send_msg(int fd, Buffer *m) | |||
71 | 71 | ||
72 | /* Send length first */ | 72 | /* Send length first */ |
73 | PUT_32BIT(mlen, buffer_len(m)); | 73 | PUT_32BIT(mlen, buffer_len(m)); |
74 | if (atomicio(write, fd, mlen, sizeof(mlen)) <= 0) | 74 | if (atomicio(vwrite, fd, mlen, sizeof(mlen)) <= 0) |
75 | fatal("Couldn't send packet: %s", strerror(errno)); | 75 | fatal("Couldn't send packet: %s", strerror(errno)); |
76 | 76 | ||
77 | if (atomicio(write, fd, buffer_ptr(m), buffer_len(m)) <= 0) | 77 | if (atomicio(vwrite, fd, buffer_ptr(m), buffer_len(m)) <= 0) |
78 | fatal("Couldn't send packet: %s", strerror(errno)); | 78 | fatal("Couldn't send packet: %s", strerror(errno)); |
79 | 79 | ||
80 | buffer_clear(m); | 80 | buffer_clear(m); |
@@ -507,7 +507,7 @@ do_lstat(struct sftp_conn *conn, char *path, int quiet) | |||
507 | if (quiet) | 507 | if (quiet) |
508 | debug("Server version does not support lstat operation"); | 508 | debug("Server version does not support lstat operation"); |
509 | else | 509 | else |
510 | log("Server version does not support lstat operation"); | 510 | logit("Server version does not support lstat operation"); |
511 | return(do_stat(conn, path, quiet)); | 511 | return(do_stat(conn, path, quiet)); |
512 | } | 512 | } |
513 | 513 | ||
@@ -875,7 +875,7 @@ do_download(struct sftp_conn *conn, char *remote_path, char *local_path, | |||
875 | fatal("Received more data than asked for " | 875 | fatal("Received more data than asked for " |
876 | "%u > %u", len, req->len); | 876 | "%u > %u", len, req->len); |
877 | if ((lseek(local_fd, req->offset, SEEK_SET) == -1 || | 877 | if ((lseek(local_fd, req->offset, SEEK_SET) == -1 || |
878 | atomicio(write, local_fd, data, len) != len) && | 878 | atomicio(vwrite, local_fd, data, len) != len) && |
879 | !write_error) { | 879 | !write_error) { |
880 | write_errno = errno; | 880 | write_errno = errno; |
881 | write_error = 1; | 881 | write_error = 1; |