On Mon, Jun 17, 2019 at 02:47:09PM +0200, Tim van der Molen wrote:
> sftp(1) has this:
>
> reput [-Ppr] [local-path] remote-path
> Resume upload of [local-path]. Equivalent to put with the -a
> flag set.
>
> remote-path should be marked optional, not local-path. Probably a pasto
> from reget.
>
> OK?
>
a bigger version of this went in after a bit more feedback.
jmc
Index: sftp.1
===================================================================
RCS file: /cvs/src/usr.bin/ssh/sftp.1,v
retrieving revision 1.126
diff -u -r1.126 sftp.1
--- sftp.1 12 Jun 2019 11:31:50 -0000 1.126
+++ sftp.1 19 Jun 2019 20:04:50 -0000
@@ -404,7 +404,7 @@
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 @@
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 @@
.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 @@
Note that this is only supported by servers that implement
the "fs...@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 @@
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 @@
.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
Index: sftp.c
===================================================================
RCS file: /cvs/src/usr.bin/ssh/sftp.c,v
retrieving revision 1.192
diff -u -r1.192 sftp.c
--- sftp.c 7 Jun 2019 03:47:12 -0000 1.192
+++ sftp.c 19 Jun 2019 20:05:01 -0000
@@ -262,9 +262,7 @@
"df [-hi] [path] Display statistics for current
directory or\n"
" filesystem containing 'path'\n"
"exit Quit sftp\n"
- "get [-afPpRr] remote [local] Download file\n"
- "reget [-fPpRr] remote [local] Resume download file\n"
- "reput [-fPpRr] [local] remote Resume upload file\n"
+ "get [-afpR] remote [local] Download file\n"
"help Display this help text\n"
"lcd path Change local directory to
'path'\n"
"lls [ls-options [path]] Display local directory
listing\n"
@@ -275,10 +273,12 @@
"lumask umask Set local umask to 'umask'\n"
"mkdir path Create remote directory\n"
"progress Toggle display of progress
meter\n"
- "put [-afPpRr] local [remote] Upload file\n"
+ "put [-afpR] local [remote] Upload file\n"
"pwd Display remote working
directory\n"
"quit Quit sftp\n"
+ "reget [-fpR] remote [local] Resume download file\n"
"rename oldpath newpath Rename remote file\n"
+ "reput [-fpR] local [remote] Resume upload file\n"
"rm path Delete remote file\n"
"rmdir path Remove remote directory\n"
"symlink oldpath newpath Symlink remote file\n"
