===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/sftp-client.c,v
retrieving revision 1.57.2.3
retrieving revision 1.58
diff -u -r1.57.2.3 -r1.58
--- src/usr.bin/ssh/sftp-client.c	2006/11/08 00:44:05	1.57.2.3
+++ src/usr.bin/ssh/sftp-client.c	2006/01/02 01:20:31	1.58
@@ -1,4 +1,3 @@
-/* $OpenBSD: sftp-client.c,v 1.57.2.3 2006/11/08 00:44:05 brad Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *
@@ -20,27 +19,18 @@
 /* XXX: remove all logging, only return status codes */
 /* XXX: copy between two remote sites */
 
-#include <sys/types.h>
+#include "includes.h"
+RCSID("$OpenBSD: sftp-client.c,v 1.58 2006/01/02 01:20:31 djm Exp $");
+
 #include <sys/queue.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/param.h>
-#include <sys/uio.h>
 
-#include <errno.h>
-#include <fcntl.h>
-#include <signal.h>
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <stdarg.h>
-
-#include "xmalloc.h"
 #include "buffer.h"
+#include "bufaux.h"
+#include "getput.h"
+#include "xmalloc.h"
 #include "log.h"
 #include "atomicio.h"
 #include "progressmeter.h"
-#include "misc.h"
 
 #include "sftp.h"
 #include "sftp-common.h"
@@ -49,7 +39,7 @@
 extern volatile sig_atomic_t interrupted;
 extern int showprogress;
 
-/* Minimum amount of data to read at a time */
+/* Minimum amount of data to read at at time */
 #define MIN_READ_SIZE	512
 
 struct sftp_conn {
@@ -65,19 +55,16 @@
 send_msg(int fd, Buffer *m)
 {
 	u_char mlen[4];
-	struct iovec iov[2];
 
 	if (buffer_len(m) > SFTP_MAX_MSG_LENGTH)
 		fatal("Outbound message too long %u", buffer_len(m));
 
 	/* Send length first */
-	put_u32(mlen, buffer_len(m));
-	iov[0].iov_base = mlen;
-	iov[0].iov_len = sizeof(mlen);
-	iov[1].iov_base = buffer_ptr(m);
-	iov[1].iov_len = buffer_len(m);
+	PUT_32BIT(mlen, buffer_len(m));
+	if (atomicio(vwrite, fd, mlen, sizeof(mlen)) != sizeof(mlen))
+		fatal("Couldn't send packet: %s", strerror(errno));
 
-	if (atomiciov(writev, fd, iov, 2) != buffer_len(m) + sizeof(mlen))
+	if (atomicio(vwrite, fd, buffer_ptr(m), buffer_len(m)) != buffer_len(m))
 		fatal("Couldn't send packet: %s", strerror(errno));
 
 	buffer_clear(m);
@@ -401,7 +388,8 @@
 				printf("%s\n", longname);
 
 			if (dir) {
-				*dir = xrealloc(*dir, ents + 2, sizeof(**dir));
+				*dir = xrealloc(*dir, sizeof(**dir) *
+				    (ents + 2));
 				(*dir)[ents] = xmalloc(sizeof(***dir));
 				(*dir)[ents]->filename = xstrdup(filename);
 				(*dir)[ents]->longname = xstrdup(longname);
@@ -1124,8 +1112,6 @@
 			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);