diff options
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | sftp.1 | 116 |
2 files changed, 93 insertions, 32 deletions
@@ -10,6 +10,13 @@ | |||
10 | - djm@cvs.openbsd.org 2004/11/29 07:41:24 | 10 | - djm@cvs.openbsd.org 2004/11/29 07:41:24 |
11 | [sftp-client.h sftp.c] | 11 | [sftp-client.h sftp.c] |
12 | Some small fixes from moritz@jodeit.org. ok deraadt@ | 12 | Some small fixes from moritz@jodeit.org. ok deraadt@ |
13 | - jaredy@cvs.openbsd.org 2004/12/05 23:55:07 | ||
14 | [sftp.1] | ||
15 | - explain that patterns can be used as arguments in get/put/ls/etc | ||
16 | commands (prodded by Michael Knudsen) | ||
17 | - describe ls flags as a list | ||
18 | - other minor improvements | ||
19 | ok jmc, djm | ||
13 | 20 | ||
14 | 20041203 | 21 | 20041203 |
15 | - (dtucker) OpenBSD CVS Sync | 22 | - (dtucker) OpenBSD CVS Sync |
@@ -1883,4 +1890,4 @@ | |||
1883 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 1890 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
1884 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 1891 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
1885 | 1892 | ||
1886 | $Id: ChangeLog,v 1.3588 2004/12/06 11:45:53 dtucker Exp $ | 1893 | $Id: ChangeLog,v 1.3589 2004/12/06 11:46:45 dtucker Exp $ |
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: sftp.1,v 1.59 2004/11/29 00:05:17 jmc Exp $ | 1 | .\" $OpenBSD: sftp.1,v 1.60 2004/12/05 23:55:07 jaredy Exp $ |
2 | .\" | 2 | .\" |
3 | .\" Copyright (c) 2001 Damien Miller. All rights reserved. | 3 | .\" Copyright (c) 2001 Damien Miller. All rights reserved. |
4 | .\" | 4 | .\" |
@@ -71,7 +71,9 @@ The second usage format will retrieve files automatically if a non-interactive | |||
71 | authentication method is used; otherwise it will do so after | 71 | authentication method is used; otherwise it will do so after |
72 | successful interactive authentication. | 72 | successful interactive authentication. |
73 | .Pp | 73 | .Pp |
74 | The third usage format allows the sftp client to start in a remote directory. | 74 | The third usage format allows |
75 | .Nm | ||
76 | to start in a remote directory. | ||
75 | .Pp | 77 | .Pp |
76 | The final usage format allows for automated sessions using the | 78 | The final usage format allows for automated sessions using the |
77 | .Fl b | 79 | .Fl b |
@@ -224,9 +226,13 @@ Once in interactive mode, | |||
224 | .Nm | 226 | .Nm |
225 | understands a set of commands similar to those of | 227 | understands a set of commands similar to those of |
226 | .Xr ftp 1 . | 228 | .Xr ftp 1 . |
227 | Commands are case insensitive and pathnames may be enclosed in quotes if they | 229 | Commands are case insensitive. |
228 | contain spaces. | 230 | Pathnames that contain spaces must be enclosed in quotes. |
229 | .Bl -tag -width "lmdir path" | 231 | Any special characters contained within pathnames that are recognized by |
232 | .Xr glob 3 | ||
233 | must be escaped with backslashes | ||
234 | .Pq Sq \e . | ||
235 | .Bl -tag -width Ds | ||
230 | .It Ic bye | 236 | .It Ic bye |
231 | Quit | 237 | Quit |
232 | .Nm sftp . | 238 | .Nm sftp . |
@@ -238,6 +244,10 @@ Change group of file | |||
238 | .Ar path | 244 | .Ar path |
239 | to | 245 | to |
240 | .Ar grp . | 246 | .Ar grp . |
247 | .Ar path | ||
248 | may contain | ||
249 | .Xr glob 3 | ||
250 | characters and may match multiple files. | ||
241 | .Ar grp | 251 | .Ar grp |
242 | must be a numeric GID. | 252 | must be a numeric GID. |
243 | .It Ic chmod Ar mode Ar path | 253 | .It Ic chmod Ar mode Ar path |
@@ -245,18 +255,26 @@ Change permissions of file | |||
245 | .Ar path | 255 | .Ar path |
246 | to | 256 | to |
247 | .Ar mode . | 257 | .Ar mode . |
258 | .Ar path | ||
259 | may contain | ||
260 | .Xr glob 3 | ||
261 | characters and may match multiple files. | ||
248 | .It Ic chown Ar own Ar path | 262 | .It Ic chown Ar own Ar path |
249 | Change owner of file | 263 | Change owner of file |
250 | .Ar path | 264 | .Ar path |
251 | to | 265 | to |
252 | .Ar own . | 266 | .Ar own . |
267 | .Ar path | ||
268 | may contain | ||
269 | .Xr glob 3 | ||
270 | characters and may match multiple files. | ||
253 | .Ar own | 271 | .Ar own |
254 | must be a numeric UID. | 272 | must be a numeric UID. |
255 | .It Ic exit | 273 | .It Ic exit |
256 | Quit | 274 | Quit |
257 | .Nm sftp . | 275 | .Nm sftp . |
258 | .It Xo Ic get | 276 | .It Xo Ic get |
259 | .Op Ar flags | 277 | .Op Fl P |
260 | .Ar remote-path | 278 | .Ar remote-path |
261 | .Op Ar local-path | 279 | .Op Ar local-path |
262 | .Xc | 280 | .Xc |
@@ -266,9 +284,18 @@ and store it on the local machine. | |||
266 | If the local | 284 | If the local |
267 | path name is not specified, it is given the same name it has on the | 285 | path name is not specified, it is given the same name it has on the |
268 | remote machine. | 286 | remote machine. |
287 | .Ar remote-path | ||
288 | may contain | ||
289 | .Xr glob 3 | ||
290 | characters and may match multiple files. | ||
291 | If it does and | ||
292 | .Ar local-path | ||
293 | is specified, then | ||
294 | .Ar local-path | ||
295 | must specify a directory. | ||
269 | If the | 296 | If the |
270 | .Fl P | 297 | .Fl P |
271 | flag is specified, then the file's full permission and access time are | 298 | flag is specified, then full file permissions and access times are |
272 | copied too. | 299 | copied too. |
273 | .It Ic help | 300 | .It Ic help |
274 | Display help text. | 301 | Display help text. |
@@ -281,6 +308,14 @@ Display local directory listing of either | |||
281 | or current directory if | 308 | or current directory if |
282 | .Ar path | 309 | .Ar path |
283 | is not specified. | 310 | is not specified. |
311 | .Ar ls-options | ||
312 | may contain any flags supported by the local system's | ||
313 | .Xr ls 1 | ||
314 | command. | ||
315 | .Ar path | ||
316 | may contain | ||
317 | .Xr glob 3 | ||
318 | characters and may match multiple files. | ||
284 | .It Ic lmkdir Ar path | 319 | .It Ic lmkdir Ar path |
285 | Create local directory specified by | 320 | Create local directory specified by |
286 | .Ar path . | 321 | .Ar path . |
@@ -292,36 +327,44 @@ to | |||
292 | .It Ic lpwd | 327 | .It Ic lpwd |
293 | Print local working directory. | 328 | Print local working directory. |
294 | .It Xo Ic ls | 329 | .It Xo Ic ls |
295 | .Op Ar flags | 330 | .Op Fl 1aflnrSt |
296 | .Op Ar path | 331 | .Op Ar path |
297 | .Xc | 332 | .Xc |
298 | Display remote directory listing of either | 333 | Display a remote directory listing of either |
299 | .Ar path | 334 | .Ar path |
300 | or current directory if | 335 | or the current directory if |
301 | .Ar path | 336 | .Ar path |
302 | is not specified. | 337 | is not specified. |
303 | If the | 338 | .Ar path |
304 | .Fl l | 339 | may contain |
305 | flag is specified, then display additional details including permissions | 340 | .Xr glob 3 |
306 | and ownership information. | 341 | characters and may match multiple files. |
307 | The | ||
308 | .Fl n | ||
309 | flag will produce a long listing with user and group information presented | ||
310 | numerically. | ||
311 | .Pp | 342 | .Pp |
312 | By default, | 343 | The following flags are recognized and alter the behaviour of |
313 | .Ic ls | 344 | .Ic ls |
314 | listings are sorted in lexicographical order. | 345 | accordingly: |
315 | This may be changed by specifying the | 346 | .Bl -tag -width Ds |
316 | .Fl S | 347 | .It Fl 1 |
317 | (sort by file size), | 348 | Produce single columnar output. |
318 | .Fl t | 349 | .It Fl a |
319 | (sort by last modification time), or | 350 | List files beginning with a dot |
320 | .Fl f | 351 | .Pq Sq \&. . |
321 | (don't sort at all) flags. | 352 | .It Fl f |
322 | Additionally, the sort order may be reversed using the | 353 | Do not sort the listing. |
323 | .Fl r | 354 | The default sort order is lexicographical. |
324 | flag. | 355 | .It Fl l |
356 | Display additional details including permissions | ||
357 | and ownership information. | ||
358 | .It Fl n | ||
359 | Produce a long listing with user and group information presented | ||
360 | numerically. | ||
361 | .It Fl r | ||
362 | Reverse the sort order of the listing. | ||
363 | .It Fl S | ||
364 | Sort the listing by file size. | ||
365 | .It Fl t | ||
366 | Sort the listing by last modification time. | ||
367 | .El | ||
325 | .It Ic lumask Ar umask | 368 | .It Ic lumask Ar umask |
326 | Set local umask to | 369 | Set local umask to |
327 | .Ar umask . | 370 | .Ar umask . |
@@ -331,7 +374,7 @@ Create remote directory specified by | |||
331 | .It Ic progress | 374 | .It Ic progress |
332 | Toggle display of progress meter. | 375 | Toggle display of progress meter. |
333 | .It Xo Ic put | 376 | .It Xo Ic put |
334 | .Op Ar flags | 377 | .Op Fl P |
335 | .Ar local-path | 378 | .Ar local-path |
336 | .Op Ar remote-path | 379 | .Op Ar remote-path |
337 | .Xc | 380 | .Xc |
@@ -340,6 +383,15 @@ Upload | |||
340 | and store it on the remote machine. | 383 | and store it on the remote machine. |
341 | If the remote path name is not specified, it is given the same name it has | 384 | If the remote path name is not specified, it is given the same name it has |
342 | on the local machine. | 385 | on the local machine. |
386 | .Ar local-path | ||
387 | may contain | ||
388 | .Xr glob 3 | ||
389 | characters and may match multiple files. | ||
390 | If it does and | ||
391 | .Ar remote-path | ||
392 | is specified, then | ||
393 | .Ar remote-path | ||
394 | must specify a directory. | ||
343 | If the | 395 | If the |
344 | .Fl P | 396 | .Fl P |
345 | flag is specified, then the file's full permission and access time are | 397 | flag is specified, then the file's full permission and access time are |
@@ -380,10 +432,12 @@ Synonym for help. | |||
380 | .El | 432 | .El |
381 | .Sh SEE ALSO | 433 | .Sh SEE ALSO |
382 | .Xr ftp 1 , | 434 | .Xr ftp 1 , |
435 | .Xr ls 1 , | ||
383 | .Xr scp 1 , | 436 | .Xr scp 1 , |
384 | .Xr ssh 1 , | 437 | .Xr ssh 1 , |
385 | .Xr ssh-add 1 , | 438 | .Xr ssh-add 1 , |
386 | .Xr ssh-keygen 1 , | 439 | .Xr ssh-keygen 1 , |
440 | .Xr glob 3 , | ||
387 | .Xr ssh_config 5 , | 441 | .Xr ssh_config 5 , |
388 | .Xr sftp-server 8 , | 442 | .Xr sftp-server 8 , |
389 | .Xr sshd 8 | 443 | .Xr sshd 8 |