summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--sftp-client.c6
2 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index dccc4de8c..833e04ce7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
120020321
2 - (bal) OpenBSD CVS Sync
3 - itojun@cvs.openbsd.org 2002/03/08 06:10:16
4 [sftp-client.c]
5 printf type mismatch
6
120020317 720020317
2 - (tim) [configure.ac] Assume path given with --with-pid-dir=PATH is wanted, 8 - (tim) [configure.ac] Assume path given with --with-pid-dir=PATH is wanted,
3 warn if directory does not exist. Put system directories in front of 9 warn if directory does not exist. Put system directories in front of
@@ -7843,4 +7849,4 @@
7843 - Wrote replacements for strlcpy and mkdtemp 7849 - Wrote replacements for strlcpy and mkdtemp
7844 - Released 1.0pre1 7850 - Released 1.0pre1
7845 7851
7846$Id: ChangeLog,v 1.1923 2002/03/17 22:05:24 tim Exp $ 7852$Id: ChangeLog,v 1.1924 2002/03/22 01:00:57 mouring Exp $
diff --git a/sftp-client.c b/sftp-client.c
index 17ac14a95..f3d752cdb 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"
31RCSID("$OpenBSD: sftp-client.c,v 1.24 2002/02/24 16:57:19 markus Exp $"); 31RCSID("$OpenBSD: sftp-client.c,v 1.25 2002/03/08 06:10:16 itojun Exp $");
32 32
33#if defined(HAVE_SYS_QUEUE_H) && !defined(HAVE_BOGUS_SYS_QUEUE_H) 33#if defined(HAVE_SYS_QUEUE_H) && !defined(HAVE_BOGUS_SYS_QUEUE_H)
34#include <sys/queue.h> 34#include <sys/queue.h>
@@ -821,7 +821,9 @@ do_download(struct sftp_conn *conn, char *remote_path, char *local_path,
821 /* Send some more requests */ 821 /* Send some more requests */
822 while (num_req < max_req) { 822 while (num_req < max_req) {
823 debug3("Request range %llu -> %llu (%d/%d)", 823 debug3("Request range %llu -> %llu (%d/%d)",
824 offset, offset + buflen - 1, num_req, max_req); 824 (unsigned long long)offset,
825 (unsigned long long)offset + buflen - 1,
826 num_req, max_req);
825 req = xmalloc(sizeof(*req)); 827 req = xmalloc(sizeof(*req));
826 req->id = conn->msg_id++; 828 req->id = conn->msg_id++;
827 req->len = buflen; 829 req->len = buflen;