diff options
author | Darren Tucker <dtucker@zip.com.au> | 2013-10-10 10:26:21 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2013-10-10 10:26:21 +1100 |
commit | b59aaf3c4f3f449a4b86d8528668bd979be9aa5f (patch) | |
tree | fc161dcca0f238a778a467977d7298918f362f20 | |
parent | 5d80e4522d6238bdefe9d0c634f0e6d35a241e41 (diff) |
- djm@cvs.openbsd.org 2013/09/19 00:49:12
[sftp-client.c]
fix swapped pflag and printflag in sftp upload_dir; from Iain Morgan
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | sftp-client.c | 6 |
2 files changed, 6 insertions, 3 deletions
@@ -9,6 +9,9 @@ | |||
9 | [progressmeter.c] | 9 | [progressmeter.c] |
10 | store the initial file offset so the progress meter doesn't freak out | 10 | store the initial file offset so the progress meter doesn't freak out |
11 | when resuming sftp transfers. bz#2137; patch from Iain Morgan; ok dtucker@` | 11 | when resuming sftp transfers. bz#2137; patch from Iain Morgan; ok dtucker@` |
12 | - djm@cvs.openbsd.org 2013/09/19 00:49:12 | ||
13 | [sftp-client.c] | ||
14 | fix swapped pflag and printflag in sftp upload_dir; from Iain Morgan | ||
12 | 15 | ||
13 | 20131009 | 16 | 20131009 |
14 | - (djm) [openbsd-compat/arc4random.c openbsd-compat/chacha_private.h] Pull | 17 | - (djm) [openbsd-compat/arc4random.c openbsd-compat/chacha_private.h] Pull |
diff --git a/sftp-client.c b/sftp-client.c index f2ce9deb7..eb8930802 100644 --- a/sftp-client.c +++ b/sftp-client.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sftp-client.c,v 1.103 2013/08/09 03:39:13 djm Exp $ */ | 1 | /* $OpenBSD: sftp-client.c,v 1.104 2013/09/19 00:49:12 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> | 3 | * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> |
4 | * | 4 | * |
@@ -1643,8 +1643,8 @@ upload_dir_internal(struct sftp_conn *conn, char *src, char *dst, | |||
1643 | } | 1643 | } |
1644 | 1644 | ||
1645 | int | 1645 | int |
1646 | upload_dir(struct sftp_conn *conn, char *src, char *dst, int printflag, | 1646 | upload_dir(struct sftp_conn *conn, char *src, char *dst, int pflag, |
1647 | int pflag) | 1647 | int printflag) |
1648 | { | 1648 | { |
1649 | char *dst_canon; | 1649 | char *dst_canon; |
1650 | int ret; | 1650 | int ret; |