diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-04-22 17:13:20 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-04-22 17:13:20 +0000 |
commit | 4eda71d3dec578397022f1a39a1816f2db1ef79c (patch) | |
tree | 030f66f3f27ea3eafb637e7e0fda386011f5a2a0 | |
parent | f8d245756b1637637d305eba1ff9daab3425596e (diff) |
- markus@cvs.openbsd.org 2001/04/22 12:34:05
[scp.c]
scp > 2GB; niles@scyld.com; ok deraadt@, djm@
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | scp.c | 8 |
2 files changed, 8 insertions, 5 deletions
@@ -9,6 +9,9 @@ - djm@cvs.openbsd.org 2001/04/22 08:13:30 [ssh.1] typos spotted by stevesk@; ok deraadt@ + - markus@cvs.openbsd.org 2001/04/22 12:34:05 + [scp.c] + scp > 2GB; niles@scyld.com; ok deraadt@, djm@ 20010421 - OpenBSD CVS Sync @@ -5212,4 +5215,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1155 2001/04/22 17:11:56 mouring Exp $ +$Id: ChangeLog,v 1.1156 2001/04/22 17:13:20 mouring Exp $ @@ -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" @@ -115,7 +115,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; @@ -488,8 +488,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; |