diff options
author | Damien Miller <djm@mindrot.org> | 2000-08-29 11:33:50 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-08-29 11:33:50 +1100 |
commit | caf6dd6d219e916e2784b3c884a7f2ce8784df37 (patch) | |
tree | aa41094fe8f805cd56791ff3d023a785fe1d1c29 /scp.c | |
parent | 4e0f5e1ec9b6318ef251180dbca50eaa01f74536 (diff) |
- More OpenBSD updates:
- deraadt@cvs.openbsd.org 2000/08/24 15:46:59
[scp.c]
off_t in sink, to fix files > 2GB, i think, test is still running ;-)
- deraadt@cvs.openbsd.org 2000/08/25 10:10:06
[session.c]
Wall
- markus@cvs.openbsd.org 2000/08/26 04:33:43
[compat.c]
ssh.com-2.3.0
- markus@cvs.openbsd.org 2000/08/27 12:18:05
[compat.c]
compatibility with future ssh.com versions
- deraadt@cvs.openbsd.org 2000/08/27 21:50:55
[auth-krb4.c session.c ssh-add.c sshconnect.c uidswap.c]
print uid/gid as unsigned
- markus@cvs.openbsd.org 2000/08/28 13:51:00
[ssh.c]
enable -n and -f for ssh2
- markus@cvs.openbsd.org 2000/08/28 14:19:53
[ssh.c]
allow combination of -N and -f
- markus@cvs.openbsd.org 2000/08/28 14:20:56
[util.c]
util.c
- markus@cvs.openbsd.org 2000/08/28 14:22:02
[util.c]
undo
- markus@cvs.openbsd.org 2000/08/28 14:23:38
[util.c]
don't complain if setting NONBLOCK fails with ENODEV
Diffstat (limited to 'scp.c')
-rw-r--r-- | scp.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -47,7 +47,7 @@ | |||
47 | */ | 47 | */ |
48 | 48 | ||
49 | #include "includes.h" | 49 | #include "includes.h" |
50 | RCSID("$OpenBSD: scp.c,v 1.35 2000/08/19 02:50:07 deraadt Exp $"); | 50 | RCSID("$OpenBSD: scp.c,v 1.36 2000/08/24 21:46:59 deraadt Exp $"); |
51 | 51 | ||
52 | #include "ssh.h" | 52 | #include "ssh.h" |
53 | #include "xmalloc.h" | 53 | #include "xmalloc.h" |
@@ -680,7 +680,8 @@ sink(argc, argv) | |||
680 | BUF *bp; | 680 | BUF *bp; |
681 | off_t i, j; | 681 | off_t i, j; |
682 | int amt, count, exists, first, mask, mode, ofd, omode; | 682 | int amt, count, exists, first, mask, mode, ofd, omode; |
683 | int setimes, size, targisdir, wrerrno = 0; | 683 | off_t size; |
684 | int setimes, targisdir, wrerrno = 0; | ||
684 | char ch, *cp, *np, *targ, *why, *vect[1], buf[2048]; | 685 | char ch, *cp, *np, *targ, *why, *vect[1], buf[2048]; |
685 | struct utimbuf ut; | 686 | struct utimbuf ut; |
686 | int dummy_usec; | 687 | int dummy_usec; |