diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2021-08-07 02:08:52 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2021-08-07 02:20:31 +0200 |
| commit | c677e65365d6f460c084e41e0c4807bb8a9cf601 (patch) | |
| tree | 92eb3e0e87bacf5f1cebb556eb0c6ceae3ff486a /sftp-client.c | |
| parent | upstream: factor out a structure duplicated between downloading (diff) | |
| download | openssh-c677e65365d6f460c084e41e0c4807bb8a9cf601.tar.xz openssh-c677e65365d6f460c084e41e0c4807bb8a9cf601.zip | |
upstream: make scp(1) in SFTP mode output better match original
scp(1) by suppressing "Retrieving [path]" lines that were emitted to support
the interactive sftp(1) client. ok markus@
OpenBSD-Commit-ID: 06be293df5f156a18f366079be2f33fa68001acc
Diffstat (limited to 'sftp-client.c')
| -rw-r--r-- | sftp-client.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sftp-client.c b/sftp-client.c index dc9a9a809..2d4330567 100644 --- a/sftp-client.c +++ b/sftp-client.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sftp-client.c,v 1.146 2021/08/07 00:07:18 djm Exp $ */ +/* $OpenBSD: sftp-client.c,v 1.147 2021/08/07 00:08:52 djm Exp $ */ /* * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> * @@ -1633,7 +1633,7 @@ download_dir_internal(struct sftp_conn *conn, const char *src, const char *dst, error("\"%s\" is not a directory", src); return -1; } - if (print_flag) + if (print_flag && print_flag != SFTP_PROGRESS_ONLY) mprintf("Retrieving %s\n", src); if (dirattrib->flags & SSH2_FILEXFER_ATTR_PERMISSIONS) { @@ -1957,7 +1957,7 @@ upload_dir_internal(struct sftp_conn *conn, const char *src, const char *dst, error("\"%s\" is not a directory", src); return -1; } - if (print_flag) + if (print_flag && print_flag != SFTP_PROGRESS_ONLY) mprintf("Entering %s\n", src); attrib_clear(&a); |