diff options
author | Damien Miller <djm@mindrot.org> | 2009-01-28 16:14:09 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2009-01-28 16:14:09 +1100 |
commit | 62fd18a2b7e840fa3b961dafefae4ffdc5efeba6 (patch) | |
tree | 03cdde26e129609572174a0179335ccaf991a761 | |
parent | c30def96e2c7cf3cb7f11182603d457fe8d093cf (diff) |
- sobrado@cvs.openbsd.org 2008/12/09 15:35:00
[sftp.1 sftp.c]
update for the synopses displayed by the 'help' command, there are a
few missing flags; add 'bye' to the output of 'help'; sorting and spacing.
jmc@ suggested replacing .Oo/.Oc with a single .Op macro.
ok jmc@
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | sftp.1 | 6 | ||||
-rw-r--r-- | sftp.c | 63 |
3 files changed, 42 insertions, 35 deletions
@@ -8,6 +8,12 @@ | |||
8 | - djm@cvs.openbsd.org 2008/12/09 04:32:22 | 8 | - djm@cvs.openbsd.org 2008/12/09 04:32:22 |
9 | [auth2-chall.c] | 9 | [auth2-chall.c] |
10 | replace by-hand string building with xasprinf(); ok deraadt@ | 10 | replace by-hand string building with xasprinf(); ok deraadt@ |
11 | - sobrado@cvs.openbsd.org 2008/12/09 15:35:00 | ||
12 | [sftp.1 sftp.c] | ||
13 | update for the synopses displayed by the 'help' command, there are a | ||
14 | few missing flags; add 'bye' to the output of 'help'; sorting and spacing. | ||
15 | jmc@ suggested replacing .Oo/.Oc with a single .Op macro. | ||
16 | ok jmc@ | ||
11 | 17 | ||
12 | 20090107 | 18 | 20090107 |
13 | - (djm) [uidswap.c] bz#1412: Support >16 supplemental groups in OS X. | 19 | - (djm) [uidswap.c] bz#1412: Support >16 supplemental groups in OS X. |
@@ -5017,5 +5023,5 @@ | |||
5017 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 5023 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
5018 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 5024 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
5019 | 5025 | ||
5020 | $Id: ChangeLog,v 1.5162 2009/01/28 05:13:39 djm Exp $ | 5026 | $Id: ChangeLog,v 1.5163 2009/01/28 05:14:09 djm Exp $ |
5021 | 5027 | ||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: sftp.1,v 1.68 2008/12/09 03:02:37 djm Exp $ | 1 | .\" $OpenBSD: sftp.1,v 1.69 2008/12/09 15:35:00 sobrado Exp $ |
2 | .\" | 2 | .\" |
3 | .\" Copyright (c) 2001 Damien Miller. All rights reserved. | 3 | .\" Copyright (c) 2001 Damien Miller. All rights reserved. |
4 | .\" | 4 | .\" |
@@ -48,7 +48,7 @@ | |||
48 | .Nm sftp | 48 | .Nm sftp |
49 | .Oo Ar user Ns @ Oc Ns | 49 | .Oo Ar user Ns @ Oc Ns |
50 | .Ar host Ns Oo : Ns Ar dir Ns | 50 | .Ar host Ns Oo : Ns Ar dir Ns |
51 | .Oo Ar / Oc Oc | 51 | .Op Ar / Oc |
52 | .Nm sftp | 52 | .Nm sftp |
53 | .Fl b Ar batchfile | 53 | .Fl b Ar batchfile |
54 | .Oo Ar user Ns @ Oc Ns Ar host | 54 | .Oo Ar user Ns @ Oc Ns Ar host |
@@ -441,7 +441,7 @@ to | |||
441 | Display the | 441 | Display the |
442 | .Nm | 442 | .Nm |
443 | protocol version. | 443 | protocol version. |
444 | .It Ic \&! Ar command | 444 | .It Ic \&! Ns Ar command |
445 | Execute | 445 | Execute |
446 | .Ar command | 446 | .Ar command |
447 | in local shell. | 447 | in local shell. |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sftp.c,v 1.105 2008/12/09 03:04:39 djm Exp $ */ | 1 | /* $OpenBSD: sftp.c,v 1.106 2008/12/09 15:35:00 sobrado 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 | * |
@@ -207,36 +207,37 @@ cmd_interrupt(int signo) | |||
207 | static void | 207 | static void |
208 | help(void) | 208 | help(void) |
209 | { | 209 | { |
210 | printf("Available commands:\n"); | 210 | printf("Available commands:\n" |
211 | printf("cd path Change remote directory to 'path'\n"); | 211 | "bye Quit sftp\n" |
212 | printf("lcd path Change local directory to 'path'\n"); | 212 | "cd path Change remote directory to 'path'\n" |
213 | printf("chgrp grp path Change group of file 'path' to 'grp'\n"); | 213 | "chgrp grp path Change group of file 'path' to 'grp'\n" |
214 | printf("chmod mode path Change permissions of file 'path' to 'mode'\n"); | 214 | "chmod mode path Change permissions of file 'path' to 'mode'\n" |
215 | printf("chown own path Change owner of file 'path' to 'own'\n"); | 215 | "chown own path Change owner of file 'path' to 'own'\n" |
216 | printf("df [path] Display statistics for current directory or\n"); | 216 | "df [-hi] [path] Display statistics for current directory or\n" |
217 | printf(" filesystem containing 'path'\n"); | 217 | " filesystem containing 'path'\n" |
218 | printf("help Display this help text\n"); | 218 | "exit Quit sftp\n" |
219 | printf("get remote-path [local-path] Download file\n"); | 219 | "get [-P] remote-path [local-path] Download file\n" |
220 | printf("lls [ls-options [path]] Display local directory listing\n"); | 220 | "help Display this help text\n" |
221 | printf("ln oldpath newpath Symlink remote file\n"); | 221 | "lcd path Change local directory to 'path'\n" |
222 | printf("lmkdir path Create local directory\n"); | 222 | "lls [ls-options [path]] Display local directory listing\n" |
223 | printf("lpwd Print local working directory\n"); | 223 | "lmkdir path Create local directory\n" |
224 | printf("ls [path] Display remote directory listing\n"); | 224 | "ln oldpath newpath Symlink remote file\n" |
225 | printf("lumask umask Set local umask to 'umask'\n"); | 225 | "lpwd Print local working directory\n" |
226 | printf("mkdir path Create remote directory\n"); | 226 | "ls [-1aflnrSt] [path] Display remote directory listing\n" |
227 | printf("progress Toggle display of progress meter\n"); | 227 | "lumask umask Set local umask to 'umask'\n" |
228 | printf("put local-path [remote-path] Upload file\n"); | 228 | "mkdir path Create remote directory\n" |
229 | printf("pwd Display remote working directory\n"); | 229 | "progress Toggle display of progress meter\n" |
230 | printf("exit Quit sftp\n"); | 230 | "put [-P] local-path [remote-path] Upload file\n" |
231 | printf("quit Quit sftp\n"); | 231 | "pwd Display remote working directory\n" |
232 | printf("rename oldpath newpath Rename remote file\n"); | 232 | "quit Quit sftp\n" |
233 | printf("rmdir path Remove remote directory\n"); | 233 | "rename oldpath newpath Rename remote file\n" |
234 | printf("rm path Delete remote file\n"); | 234 | "rm path Delete remote file\n" |
235 | printf("symlink oldpath newpath Symlink remote file\n"); | 235 | "rmdir path Remove remote directory\n" |
236 | printf("version Show SFTP version\n"); | 236 | "symlink oldpath newpath Symlink remote file\n" |
237 | printf("!command Execute 'command' in local shell\n"); | 237 | "version Show SFTP version\n" |
238 | printf("! Escape to local shell\n"); | 238 | "!command Execute 'command' in local shell\n" |
239 | printf("? Synonym for help\n"); | 239 | "! Escape to local shell\n" |
240 | "? Synonym for help\n"); | ||
240 | } | 241 | } |
241 | 242 | ||
242 | static void | 243 | static void |