summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-04-22 17:13:20 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-04-22 17:13:20 +0000
commit4eda71d3dec578397022f1a39a1816f2db1ef79c (patch)
tree030f66f3f27ea3eafb637e7e0fda386011f5a2a0
parentf8d245756b1637637d305eba1ff9daab3425596e (diff)
- markus@cvs.openbsd.org 2001/04/22 12:34:05
[scp.c] scp > 2GB; niles@scyld.com; ok deraadt@, djm@
-rw-r--r--ChangeLog5
-rw-r--r--scp.c8
2 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index af9dab6d5..fd7377d6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,9 @@
9 - djm@cvs.openbsd.org 2001/04/22 08:13:30 9 - djm@cvs.openbsd.org 2001/04/22 08:13:30
10 [ssh.1] 10 [ssh.1]
11 typos spotted by stevesk@; ok deraadt@ 11 typos spotted by stevesk@; ok deraadt@
12 - markus@cvs.openbsd.org 2001/04/22 12:34:05
13 [scp.c]
14 scp > 2GB; niles@scyld.com; ok deraadt@, djm@
12 15
1320010421 1620010421
14 - OpenBSD CVS Sync 17 - OpenBSD CVS Sync
@@ -5212,4 +5215,4 @@
5212 - Wrote replacements for strlcpy and mkdtemp 5215 - Wrote replacements for strlcpy and mkdtemp
5213 - Released 1.0pre1 5216 - Released 1.0pre1
5214 5217
5215$Id: ChangeLog,v 1.1155 2001/04/22 17:11:56 mouring Exp $ 5218$Id: ChangeLog,v 1.1156 2001/04/22 17:13:20 mouring Exp $
diff --git a/scp.c b/scp.c
index 6444ca885..1735693d6 100644
--- a/scp.c
+++ b/scp.c
@@ -75,7 +75,7 @@
75 */ 75 */
76 76
77#include "includes.h" 77#include "includes.h"
78RCSID("$OpenBSD: scp.c,v 1.67 2001/04/16 02:31:43 mouring Exp $"); 78RCSID("$OpenBSD: scp.c,v 1.68 2001/04/22 12:34:05 markus Exp $");
79 79
80#include "xmalloc.h" 80#include "xmalloc.h"
81#include "atomicio.h" 81#include "atomicio.h"
@@ -115,7 +115,7 @@ void addargs(char *fmt, ...) __attribute__((format(printf, 1, 2)));
115static struct timeval start; 115static struct timeval start;
116 116
117/* Number of bytes of current file transferred so far. */ 117/* Number of bytes of current file transferred so far. */
118volatile u_long statbytes; 118volatile off_t statbytes;
119 119
120/* Total size of current file. */ 120/* Total size of current file. */
121off_t totalbytes = 0; 121off_t totalbytes = 0;
@@ -488,8 +488,8 @@ source(argc, argv)
488 struct stat stb; 488 struct stat stb;
489 static BUF buffer; 489 static BUF buffer;
490 BUF *bp; 490 BUF *bp;
491 off_t i; 491 off_t i, amt, result;
492 int amt, fd, haderr, indx, result; 492 int fd, haderr, indx;
493 char *last, *name, buf[2048]; 493 char *last, *name, buf[2048];
494 int len; 494 int len;
495 495