diff options
author | jmc@openbsd.org <jmc@openbsd.org> | 2019-06-19 20:12:44 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-06-21 13:21:13 +1000 |
commit | 5f68ab436b0e01751d564e9a9041e6ac3673e45a (patch) | |
tree | a1e641d6365e0cec63bdeca815ef2240ed7c7bdd /sftp.c | |
parent | 99bcbbc77fbd5a5027031f42a5931b21b07c947e (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.c')
-rw-r--r-- | sftp.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sftp.c,v 1.192 2019/06/07 03:47:12 dtucker Exp $ */ | 1 | /* $OpenBSD: sftp.c,v 1.193 2019/06/19 20:12:44 jmc Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> | 3 | * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> |
4 | * | 4 | * |
@@ -284,9 +284,7 @@ help(void) | |||
284 | "df [-hi] [path] Display statistics for current directory or\n" | 284 | "df [-hi] [path] Display statistics for current directory or\n" |
285 | " filesystem containing 'path'\n" | 285 | " filesystem containing 'path'\n" |
286 | "exit Quit sftp\n" | 286 | "exit Quit sftp\n" |
287 | "get [-afPpRr] remote [local] Download file\n" | 287 | "get [-afpR] remote [local] Download file\n" |
288 | "reget [-fPpRr] remote [local] Resume download file\n" | ||
289 | "reput [-fPpRr] [local] remote Resume upload file\n" | ||
290 | "help Display this help text\n" | 288 | "help Display this help text\n" |
291 | "lcd path Change local directory to 'path'\n" | 289 | "lcd path Change local directory to 'path'\n" |
292 | "lls [ls-options [path]] Display local directory listing\n" | 290 | "lls [ls-options [path]] Display local directory listing\n" |
@@ -297,10 +295,12 @@ help(void) | |||
297 | "lumask umask Set local umask to 'umask'\n" | 295 | "lumask umask Set local umask to 'umask'\n" |
298 | "mkdir path Create remote directory\n" | 296 | "mkdir path Create remote directory\n" |
299 | "progress Toggle display of progress meter\n" | 297 | "progress Toggle display of progress meter\n" |
300 | "put [-afPpRr] local [remote] Upload file\n" | 298 | "put [-afpR] local [remote] Upload file\n" |
301 | "pwd Display remote working directory\n" | 299 | "pwd Display remote working directory\n" |
302 | "quit Quit sftp\n" | 300 | "quit Quit sftp\n" |
301 | "reget [-fpR] remote [local] Resume download file\n" | ||
303 | "rename oldpath newpath Rename remote file\n" | 302 | "rename oldpath newpath Rename remote file\n" |
303 | "reput [-fpR] local [remote] Resume upload file\n" | ||
304 | "rm path Delete remote file\n" | 304 | "rm path Delete remote file\n" |
305 | "rmdir path Remove remote directory\n" | 305 | "rmdir path Remove remote directory\n" |
306 | "symlink oldpath newpath Symlink remote file\n" | 306 | "symlink oldpath newpath Symlink remote file\n" |