summaryrefslogtreecommitdiff
path: root/usr.bin/ssh
diff options
context:
space:
mode:
authorMarkus Friedl <markus@cvs.openbsd.org>2001-04-22 12:34:06 +0000
committerMarkus Friedl <markus@cvs.openbsd.org>2001-04-22 12:34:06 +0000
commit807a4d005345cc66f28ec060a924c4128b82d00d (patch)
treecaf66cb8e05d05833a99fc3e2ff6788a0d662c32 /usr.bin/ssh
parent239ba6d8bfbb75dad5107466d06a682233193af0 (diff)
scp > 2GB; niles@scyld.com; ok deraadt@, djm@
Diffstat (limited to 'usr.bin/ssh')
-rw-r--r--usr.bin/ssh/scp.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/ssh/scp.c b/usr.bin/ssh/scp.c
index 274884bb69d..81d3b55b962 100644
--- a/usr.bin/ssh/scp.c
+++ b/usr.bin/ssh/scp.c
@@ -75,7 +75,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: scp.c,v 1.67 2001/04/16 02:31:43 mouring Exp $");
+RCSID("$OpenBSD: scp.c,v 1.68 2001/04/22 12:34:05 markus Exp $");
#include "xmalloc.h"
#include "atomicio.h"
@@ -100,7 +100,7 @@ void addargs(char *fmt, ...) __attribute__((format(printf, 1, 2)));
static struct timeval start;
/* Number of bytes of current file transferred so far. */
-volatile u_long statbytes;
+volatile off_t statbytes;
/* Total size of current file. */
off_t totalbytes = 0;
@@ -468,8 +468,8 @@ source(argc, argv)
struct stat stb;
static BUF buffer;
BUF *bp;
- off_t i;
- int amt, fd, haderr, indx, result;
+ off_t i, amt, result;
+ int fd, haderr, indx;
char *last, *name, buf[2048];
int len;