+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
- (djm) [platform.h] Add missing prototype for
platform_krb5_get_principal_name
-.\" $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.
.\"
.It Ic lpwd
Print local working directory.
.It Xo Ic ls
-.Op Fl 1aflhnrSt
+.Op Fl 1afhlnrSt
.Op Ar path
.Xc
Display a remote directory listing of either
.It Fl f
Do not sort the listing.
The default sort order is lexicographical.
-.It Fl l
-Display additional details including permissions
-and ownership information.
.It Fl h
When used with a long format option, use unit suffixes: Byte, Kilobyte,
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,
M=1048576, etc.).
+.It Fl l
+Display additional details including permissions
+and ownership information.
.It Fl n
Produce a long listing with user and group information presented
numerically.
-/* $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>
*
"df [-hi] [path] Display statistics for current directory or\n"
" filesystem containing 'path'\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"
"lcd path Change local directory to 'path'\n"
"lls [ls-options [path]] Display local directory listing\n"
"lmkdir path Create local directory\n"
"ln oldpath newpath Symlink remote file\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"
"mkdir path Create remote directory\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"
"quit Quit sftp\n"
"rename oldpath newpath Rename remote file\n"