summaryrefslogtreecommitdiff
path: root/sftp.1
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2018-11-16 02:30:20 +0000
committerDamien Miller <djm@mindrot.org>2018-11-16 13:51:58 +1100
commit5c1a63562cac0574c226224075b0829a50b48c9d (patch)
treeb6b6ad2964a1fd120f6ed06a5be2d8e3ff7df808 /sftp.1
parent90ef45f7aac33eaf55ec344e101548a01e570f29 (diff)
upstream: support a prefix of '@' to suppress echo of sftp batch
commands; bz#2926; ok dtucker@ OpenBSD-Commit-ID: 9d635636bc84aeae796467e059f7634de990a79d
Diffstat (limited to 'sftp.1')
-rw-r--r--sftp.111
1 files changed, 9 insertions, 2 deletions
diff --git a/sftp.1 b/sftp.1
index 50e2fef0a..7140bc19b 100644
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: sftp.1,v 1.121 2018/11/13 07:22:45 schwarze Exp $ 1.\" $OpenBSD: sftp.1,v 1.122 2018/11/16 02:30:20 djm Exp $
2.\" 2.\"
3.\" Copyright (c) 2001 Damien Miller. All rights reserved. 3.\" Copyright (c) 2001 Damien Miller. All rights reserved.
4.\" 4.\"
@@ -22,7 +22,7 @@
22.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 22.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
23.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24.\" 24.\"
25.Dd $Mdocdate: November 13 2018 $ 25.Dd $Mdocdate: November 16 2018 $
26.Dt SFTP 1 26.Dt SFTP 1
27.Os 27.Os
28.Sh NAME 28.Sh NAME
@@ -127,6 +127,7 @@ at connection time (see
127and 127and
128.Xr ssh-keygen 1 128.Xr ssh-keygen 1
129for details). 129for details).
130.Pp
130A 131A
131.Ar batchfile 132.Ar batchfile
132of 133of
@@ -141,11 +142,17 @@ commands fail:
141.Ic chgrp , lpwd , df , symlink , 142.Ic chgrp , lpwd , df , symlink ,
142and 143and
143.Ic lmkdir . 144.Ic lmkdir .
145.Pp
144Termination on error can be suppressed on a command by command basis by 146Termination on error can be suppressed on a command by command basis by
145prefixing the command with a 147prefixing the command with a
146.Sq \- 148.Sq \-
147character (for example, 149character (for example,
148.Ic -rm /tmp/blah* ) . 150.Ic -rm /tmp/blah* ) .
151Echo of the command may be suppressed by prefixing the command with a
152.Sq @
153character.
154These two prefixes may be combined in any order, for example
155.Ic -@ls /bsd .
149.It Fl C 156.It Fl C
150Enables compression (via ssh's 157Enables compression (via ssh's
151.Fl C 158.Fl C