diff options
| author | jmc@openbsd.org <jmc@openbsd.org> | 2019-06-19 22:12:44 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2019-06-21 05:21:13 +0200 |
| commit | 5f68ab436b0e01751d564e9a9041e6ac3673e45a (patch) | |
| tree | a1e641d6365e0cec63bdeca815ef2240ed7c7bdd /sftp.c | |
| parent | upstream: check for convtime() refusing to accept times that (diff) | |
| download | openssh-5f68ab436b0e01751d564e9a9041e6ac3673e45a.tar.xz openssh-5f68ab436b0e01751d564e9a9041e6ac3673e45a.zip | |
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.c')
| -rw-r--r-- | sftp.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: sftp.c,v 1.192 2019/06/07 03:47:12 dtucker Exp $ */ +/* $OpenBSD: sftp.c,v 1.193 2019/06/19 20:12:44 jmc Exp $ */ /* * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> * @@ -284,9 +284,7 @@ help(void) "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" @@ -297,10 +295,12 @@ help(void) "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" |