diff options
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | sftp.1 | 10 | ||||
-rw-r--r-- | sftp.c | 8 |
3 files changed, 18 insertions, 9 deletions
@@ -1,3 +1,12 @@ | |||
1 | 20100115 | ||
2 | - (dtucker) OpenBSD CVS Sync | ||
3 | - jmc@cvs.openbsd.org 2010/01/13 12:48:34 | ||
4 | [sftp.1 sftp.c] | ||
5 | sftp.1: put ls -h in the right place | ||
6 | sftp.c: as above, plus add -p to get/put, and shorten their arg names | ||
7 | to keep the help usage nicely aligned | ||
8 | ok djm | ||
9 | |||
1 | 20100114 | 10 | 20100114 |
2 | - (djm) [platform.h] Add missing prototype for | 11 | - (djm) [platform.h] Add missing prototype for |
3 | platform_krb5_get_principal_name | 12 | platform_krb5_get_principal_name |
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: sftp.1,v 1.81 2010/01/13 01:40:16 djm Exp $ | 1 | .\" $OpenBSD: sftp.1,v 1.82 2010/01/13 12:48:34 jmc Exp $ |
2 | .\" | 2 | .\" |
3 | .\" Copyright (c) 2001 Damien Miller. All rights reserved. | 3 | .\" Copyright (c) 2001 Damien Miller. All rights reserved. |
4 | .\" | 4 | .\" |
@@ -393,7 +393,7 @@ to | |||
393 | .It Ic lpwd | 393 | .It Ic lpwd |
394 | Print local working directory. | 394 | Print local working directory. |
395 | .It Xo Ic ls | 395 | .It Xo Ic ls |
396 | .Op Fl 1aflhnrSt | 396 | .Op Fl 1afhlnrSt |
397 | .Op Ar path | 397 | .Op Ar path |
398 | .Xc | 398 | .Xc |
399 | Display a remote directory listing of either | 399 | Display a remote directory listing of either |
@@ -418,14 +418,14 @@ List files beginning with a dot | |||
418 | .It Fl f | 418 | .It Fl f |
419 | Do not sort the listing. | 419 | Do not sort the listing. |
420 | The default sort order is lexicographical. | 420 | The default sort order is lexicographical. |
421 | .It Fl l | ||
422 | Display additional details including permissions | ||
423 | and ownership information. | ||
424 | .It Fl h | 421 | .It Fl h |
425 | When used with a long format option, use unit suffixes: Byte, Kilobyte, | 422 | When used with a long format option, use unit suffixes: Byte, Kilobyte, |
426 | Megabyte, Gigabyte, Terabyte, Petabyte, and Exabyte in order to reduce | 423 | Megabyte, Gigabyte, Terabyte, Petabyte, and Exabyte in order to reduce |
427 | the number of digits to four or fewer using powers of 2 for sizes (K=1024, | 424 | the number of digits to four or fewer using powers of 2 for sizes (K=1024, |
428 | M=1048576, etc.). | 425 | M=1048576, etc.). |
426 | .It Fl l | ||
427 | Display additional details including permissions | ||
428 | and ownership information. | ||
429 | .It Fl n | 429 | .It Fl n |
430 | Produce a long listing with user and group information presented | 430 | Produce a long listing with user and group information presented |
431 | numerically. | 431 | numerically. |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sftp.c,v 1.120 2010/01/13 04:10:50 djm Exp $ */ | 1 | /* $OpenBSD: sftp.c,v 1.121 2010/01/13 12:48:34 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 | * |
@@ -233,18 +233,18 @@ help(void) | |||
233 | "df [-hi] [path] Display statistics for current directory or\n" | 233 | "df [-hi] [path] Display statistics for current directory or\n" |
234 | " filesystem containing 'path'\n" | 234 | " filesystem containing 'path'\n" |
235 | "exit Quit sftp\n" | 235 | "exit Quit sftp\n" |
236 | "get [-Pr] remote-path [local-path] Download file\n" | 236 | "get [-Ppr] remote [local] Download file\n" |
237 | "help Display this help text\n" | 237 | "help Display this help text\n" |
238 | "lcd path Change local directory to 'path'\n" | 238 | "lcd path Change local directory to 'path'\n" |
239 | "lls [ls-options [path]] Display local directory listing\n" | 239 | "lls [ls-options [path]] Display local directory listing\n" |
240 | "lmkdir path Create local directory\n" | 240 | "lmkdir path Create local directory\n" |
241 | "ln oldpath newpath Symlink remote file\n" | 241 | "ln oldpath newpath Symlink remote file\n" |
242 | "lpwd Print local working directory\n" | 242 | "lpwd Print local working directory\n" |
243 | "ls [-1aflnrSt] [path] Display remote directory listing\n" | 243 | "ls [-1afhlnrSt] [path] Display remote directory listing\n" |
244 | "lumask umask Set local umask to 'umask'\n" | 244 | "lumask umask Set local umask to 'umask'\n" |
245 | "mkdir path Create remote directory\n" | 245 | "mkdir path Create remote directory\n" |
246 | "progress Toggle display of progress meter\n" | 246 | "progress Toggle display of progress meter\n" |
247 | "put [-Pr] local-path [remote-path] Upload file\n" | 247 | "put [-Ppr] local [remote] Upload file\n" |
248 | "pwd Display remote working directory\n" | 248 | "pwd Display remote working directory\n" |
249 | "quit Quit sftp\n" | 249 | "quit Quit sftp\n" |
250 | "rename oldpath newpath Rename remote file\n" | 250 | "rename oldpath newpath Rename remote file\n" |