summaryrefslogtreecommitdiff
path: root/sftp.1
diff options
context:
space:
mode:
authorjmc@openbsd.org <jmc@openbsd.org>2019-06-19 20:12:44 +0000
committerDamien Miller <djm@mindrot.org>2019-06-21 13:21:13 +1000
commit5f68ab436b0e01751d564e9a9041e6ac3673e45a (patch)
treea1e641d6365e0cec63bdeca815ef2240ed7c7bdd /sftp.1
parent99bcbbc77fbd5a5027031f42a5931b21b07c947e (diff)
upstream: from tim: - for reput, it is remote-path which is
optional, not local-path - sync help from deraadt: - prefer -R and undocument -r (but add a comment for future editors) from schwarze: - prefer -p and undocument -P (as above. the comment was schwarze's too) more: - add the -f flag to reput and reget - sort help (i can;t remember who suggested this originally) djm and deraadt were ok with earlier versions of this; tim and schwarze ok OpenBSD-Commit-ID: 3c699b53b46111f5c57eed4533f132e7e58bacdd
Diffstat (limited to 'sftp.1')
-rw-r--r--sftp.142
1 files changed, 25 insertions, 17 deletions
diff --git a/sftp.1 b/sftp.1
index 4554ae4f..a52c1cff 100644
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: sftp.1,v 1.126 2019/06/12 11:31:50 jmc Exp $
+.\" $OpenBSD: sftp.1,v 1.127 2019/06/19 20:12:44 jmc Exp $
.\"
.\" Copyright (c) 2001 Damien Miller. All rights reserved.
.\"
@@ -22,7 +22,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: June 12 2019 $
+.Dd $Mdocdate: June 19 2019 $
.Dt SFTP 1
.Os
.Sh NAME
@@ -404,7 +404,7 @@ extension.
Quit
.Nm sftp .
.It Xo Ic get
-.Op Fl afPpr
+.Op Fl afpR
.Ar remote-path
.Op Ar local-path
.Xc
@@ -439,15 +439,19 @@ flag is specified, then
will be called after the file transfer has completed to flush the file
to disk.
.Pp
-If either the
-.Fl P
-or
+If the
.Fl p
+.\" undocumented redundant alias
+.\" or
+.\" .Fl P
flag is specified, then full file permissions and access times are
copied too.
.Pp
If the
-.Fl r
+.Fl R
+.\" undocumented redundant alias
+.\" or
+.\" .Fl r
flag is specified then directories will be copied recursively.
Note that
.Nm
@@ -545,7 +549,7 @@ Create remote directory specified by
.It Ic progress
Toggle display of progress meter.
.It Xo Ic put
-.Op Fl afPpr
+.Op Fl afpR
.Ar local-path
.Op Ar remote-path
.Xc
@@ -581,15 +585,19 @@ after the file has been transferred.
Note that this is only supported by servers that implement
the "fsync@openssh.com" extension.
.Pp
-If either the
-.Fl P
-or
+If the
.Fl p
+.\" undocumented redundant alias
+.\" or
+.\" .Fl P
flag is specified, then full file permissions and access times are
copied too.
.Pp
If the
-.Fl r
+.Fl R
+.\" undocumented redundant alias
+.\" or
+.\" .Fl r
flag is specified then directories will be copied recursively.
Note that
.Nm
@@ -600,7 +608,7 @@ Display remote working directory.
Quit
.Nm sftp .
.It Xo Ic reget
-.Op Fl Ppr
+.Op Fl fpR
.Ar remote-path
.Op Ar local-path
.Xc
@@ -612,12 +620,12 @@ with the
.Fl a
flag set.
.It Xo Ic reput
-.Op Fl Ppr
-.Op Ar local-path
-.Ar remote-path
+.Op Fl fpR
+.Ar local-path
+.Op Ar remote-path
.Xc
Resume upload of
-.Op Ar local-path .
+.Ar local-path .
Equivalent to
.Ic put
with the