===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/sftp-client.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- src/usr.bin/ssh/sftp-client.c	2002/03/11 03:19:53	1.27
+++ src/usr.bin/ssh/sftp-client.c	2002/03/19 10:49:35	1.28
@@ -28,7 +28,7 @@
 /* XXX: copy between two remote sites */
 
 #include "includes.h"
-RCSID("$OpenBSD: sftp-client.c,v 1.27 2002/03/11 03:19:53 itojun Exp $");
+RCSID("$OpenBSD: sftp-client.c,v 1.28 2002/03/19 10:49:35 markus Exp $");
 
 #include <sys/queue.h>
 
@@ -445,7 +445,7 @@
 	debug2("Sending SSH2_FXP_REMOVE \"%s\"", path);
 
 	id = conn->msg_id++;
-	send_string_request(conn->fd_out, id, SSH2_FXP_REMOVE, path, 
+	send_string_request(conn->fd_out, id, SSH2_FXP_REMOVE, path,
 	    strlen(path));
 	status = get_status(conn->fd_in, id);
 	if (status != SSH2_FX_OK)
@@ -492,8 +492,8 @@
 
 	id = conn->msg_id++;
 
-	send_string_request(conn->fd_out, id, 
-	    conn->version == 0 ? SSH2_FXP_STAT_VERSION_0 : SSH2_FXP_STAT, 
+	send_string_request(conn->fd_out, id,
+	    conn->version == 0 ? SSH2_FXP_STAT_VERSION_0 : SSH2_FXP_STAT,
 	    path, strlen(path));
 
 	return(get_decode_stat(conn->fd_in, id, quiet));
@@ -723,7 +723,7 @@
     char *handle, u_int handle_len)
 {
 	Buffer msg;
-	
+
 	buffer_init(&msg);
 	buffer_clear(&msg);
 	buffer_put_char(&msg, SSH2_FXP_READ);
@@ -733,7 +733,7 @@
 	buffer_put_int(&msg, len);
 	send_msg(fd_out, &msg);
 	buffer_free(&msg);
-}	
+}
 
 int
 do_download(struct sftp_conn *conn, char *remote_path, char *local_path,
@@ -750,7 +750,7 @@
 		u_int id;
 		u_int len;
 		u_int64_t offset;
-		TAILQ_ENTRY(request) tq; 
+		TAILQ_ENTRY(request) tq;
 	};
 	TAILQ_HEAD(reqhead, request) requests;
 	struct request *req;
@@ -816,7 +816,7 @@
 
 		/* Send some more requests */
 		while (num_req < max_req) {
-			debug3("Request range %llu -> %llu (%d/%d)", 
+			debug3("Request range %llu -> %llu (%d/%d)",
 			    (unsigned long long)offset,
 			    (unsigned long long)offset + buflen - 1,
 			    num_req, max_req);
@@ -827,7 +827,7 @@
 			offset += buflen;
 			num_req++;
 			TAILQ_INSERT_TAIL(&requests, req, tq);
-			send_read_request(conn->fd_out, req->id, req->offset, 
+			send_read_request(conn->fd_out, req->id, req->offset,
 			    req->len, handle, handle_len);
 		}
 
@@ -858,7 +858,7 @@
 		case SSH2_FXP_DATA:
 			data = buffer_get_string(&msg, &len);
 			debug3("Received data %llu -> %llu",
-			    (unsigned long long)req->offset, 
+			    (unsigned long long)req->offset,
 			    (unsigned long long)req->offset + len - 1);
 			if (len > req->len)
 				fatal("Received more data than asked for "
@@ -880,13 +880,13 @@
 				/* Resend the request for the missing data */
 				debug3("Short data block, re-requesting "
 				    "%llu -> %llu (%2d)",
-				    (unsigned long long)req->offset + len, 
+				    (unsigned long long)req->offset + len,
 				    (unsigned long long)req->offset +
 				    req->len - 1, num_req);
 				req->id = conn->msg_id++;
 				req->len -= len;
 				req->offset += len;
-				send_read_request(conn->fd_out, req->id, 
+				send_read_request(conn->fd_out, req->id,
 				    req->offset, req->len, handle, handle_len);
 				/* Reduce the request size */
 				if (len < buflen)
@@ -917,7 +917,7 @@
 		fatal("Transfer complete, but requests still in queue");
 
 	if (read_error) {
-		error("Couldn't read from remote file \"%s\" : %s", 
+		error("Couldn't read from remote file \"%s\" : %s",
 		    remote_path, fx2txt(status));
 		do_close(conn, handle, handle_len);
 	} else if (write_error) {
@@ -966,7 +966,7 @@
 		u_int id;
 		u_int len;
 		u_int64_t offset;
-		TAILQ_ENTRY(outstanding_ack) tq; 
+		TAILQ_ENTRY(outstanding_ack) tq;
 	};
 	TAILQ_HEAD(ackhead, outstanding_ack) acks;
 	struct outstanding_ack *ack;
@@ -1055,7 +1055,7 @@
 		if (ack == NULL)
 			fatal("Unexpected ACK %u", id);
 
-		if (id == startid || len == 0 || 
+		if (id == startid || len == 0 ||
 		    id - ackid >= conn->num_requests) {
 			buffer_clear(&msg);
 			get_msg(conn->fd_in, &msg);
@@ -1085,7 +1085,7 @@
 				close(local_fd);
 				goto done;
 			}
-			debug3("In write loop, ack for %u %d bytes at %llu", 
+			debug3("In write loop, ack for %u %d bytes at %llu",
 			   ack->id, ack->len, (unsigned long long)ack->offset);
 			++ackid;
 			free(ack);