diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | sftp.c | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -82,6 +82,11 @@ | |||
82 | post-auth child. the new buffer code is more strict, and requires | 82 | post-auth child. the new buffer code is more strict, and requires |
83 | buffer_init() while the old code was happy after a bzero(); | 83 | buffer_init() while the old code was happy after a bzero(); |
84 | originally from djm@ | 84 | originally from djm@ |
85 | - logan@cvs.openbsd.org 2014/05/05 07:02:30 | ||
86 | [sftp.c] | ||
87 | Zap extra whitespace. | ||
88 | |||
89 | OK from djm@ and dtucker@ | ||
85 | 90 | ||
86 | 20140430 | 91 | 20140430 |
87 | - (dtucker) [defines.h] Define __GNUC_PREREQ__ macro if we don't already | 92 | - (dtucker) [defines.h] Define __GNUC_PREREQ__ macro if we don't already |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sftp.c,v 1.162 2014/04/29 20:36:51 dtucker Exp $ */ | 1 | /* $OpenBSD: sftp.c,v 1.163 2014/05/05 07:02:30 logan 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 | * |
@@ -728,7 +728,7 @@ process_put(struct sftp_conn *conn, char *src, char *dst, char *pwd, | |||
728 | 728 | ||
729 | resume |= global_aflag; | 729 | resume |= global_aflag; |
730 | if (!quiet && resume) | 730 | if (!quiet && resume) |
731 | printf("Resuming upload of %s to %s\n", g.gl_pathv[i], | 731 | printf("Resuming upload of %s to %s\n", g.gl_pathv[i], |
732 | abs_dst); | 732 | abs_dst); |
733 | else if (!quiet && !resume) | 733 | else if (!quiet && !resume) |
734 | printf("Uploading %s to %s\n", g.gl_pathv[i], abs_dst); | 734 | printf("Uploading %s to %s\n", g.gl_pathv[i], abs_dst); |