- jmc@cvs.openbsd.org 2010/01/13 12:48:34

[sftp.1 sftp.c]
     sftp.1: put ls -h in the right place
     sftp.c: as above, plus add -p to get/put, and shorten their arg names
     to keep the help usage nicely aligned
     ok djm
This commit is contained in:
Darren Tucker 2010-01-15 11:42:51 +11:00
parent 6abc9f68aa
commit 75fe626489
3 changed files with 18 additions and 9 deletions

View File

@ -1,3 +1,12 @@
20100115
- (dtucker) OpenBSD CVS Sync
- jmc@cvs.openbsd.org 2010/01/13 12:48:34
[sftp.1 sftp.c]
sftp.1: put ls -h in the right place
sftp.c: as above, plus add -p to get/put, and shorten their arg names
to keep the help usage nicely aligned
ok djm
20100114 20100114
- (djm) [platform.h] Add missing prototype for - (djm) [platform.h] Add missing prototype for
platform_krb5_get_principal_name platform_krb5_get_principal_name

10
sftp.1
View File

@ -1,4 +1,4 @@
.\" $OpenBSD: sftp.1,v 1.81 2010/01/13 01:40:16 djm Exp $ .\" $OpenBSD: sftp.1,v 1.82 2010/01/13 12:48:34 jmc Exp $
.\" .\"
.\" Copyright (c) 2001 Damien Miller. All rights reserved. .\" Copyright (c) 2001 Damien Miller. All rights reserved.
.\" .\"
@ -393,7 +393,7 @@ to
.It Ic lpwd .It Ic lpwd
Print local working directory. Print local working directory.
.It Xo Ic ls .It Xo Ic ls
.Op Fl 1aflhnrSt .Op Fl 1afhlnrSt
.Op Ar path .Op Ar path
.Xc .Xc
Display a remote directory listing of either Display a remote directory listing of either
@ -418,14 +418,14 @@ List files beginning with a dot
.It Fl f .It Fl f
Do not sort the listing. Do not sort the listing.
The default sort order is lexicographical. The default sort order is lexicographical.
.It Fl l
Display additional details including permissions
and ownership information.
.It Fl h .It Fl h
When used with a long format option, use unit suffixes: Byte, Kilobyte, When used with a long format option, use unit suffixes: Byte, Kilobyte,
Megabyte, Gigabyte, Terabyte, Petabyte, and Exabyte in order to reduce Megabyte, Gigabyte, Terabyte, Petabyte, and Exabyte in order to reduce
the number of digits to four or fewer using powers of 2 for sizes (K=1024, the number of digits to four or fewer using powers of 2 for sizes (K=1024,
M=1048576, etc.). M=1048576, etc.).
.It Fl l
Display additional details including permissions
and ownership information.
.It Fl n .It Fl n
Produce a long listing with user and group information presented Produce a long listing with user and group information presented
numerically. numerically.

8
sftp.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sftp.c,v 1.120 2010/01/13 04:10:50 djm Exp $ */ /* $OpenBSD: sftp.c,v 1.121 2010/01/13 12:48:34 jmc Exp $ */
/* /*
* Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
* *
@ -233,18 +233,18 @@ help(void)
"df [-hi] [path] Display statistics for current directory or\n" "df [-hi] [path] Display statistics for current directory or\n"
" filesystem containing 'path'\n" " filesystem containing 'path'\n"
"exit Quit sftp\n" "exit Quit sftp\n"
"get [-Pr] remote-path [local-path] Download file\n" "get [-Ppr] remote [local] Download file\n"
"help Display this help text\n" "help Display this help text\n"
"lcd path Change local directory to 'path'\n" "lcd path Change local directory to 'path'\n"
"lls [ls-options [path]] Display local directory listing\n" "lls [ls-options [path]] Display local directory listing\n"
"lmkdir path Create local directory\n" "lmkdir path Create local directory\n"
"ln oldpath newpath Symlink remote file\n" "ln oldpath newpath Symlink remote file\n"
"lpwd Print local working directory\n" "lpwd Print local working directory\n"
"ls [-1aflnrSt] [path] Display remote directory listing\n" "ls [-1afhlnrSt] [path] Display remote directory listing\n"
"lumask umask Set local umask to 'umask'\n" "lumask umask Set local umask to 'umask'\n"
"mkdir path Create remote directory\n" "mkdir path Create remote directory\n"
"progress Toggle display of progress meter\n" "progress Toggle display of progress meter\n"
"put [-Pr] local-path [remote-path] Upload file\n" "put [-Ppr] local [remote] Upload file\n"
"pwd Display remote working directory\n" "pwd Display remote working directory\n"
"quit Quit sftp\n" "quit Quit sftp\n"
"rename oldpath newpath Rename remote file\n" "rename oldpath newpath Rename remote file\n"