From 636ca9024742cde37769f87bf4d19b2405720222 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Fri, 5 Nov 2004 20:22:00 +1100 Subject: - djm@cvs.openbsd.org 2004/10/07 10:10:24 [scp.1 sftp.1 ssh.1 ssh_config.5] document KbdInteractiveDevices; ok markus@ --- sftp.1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sftp.1') diff --git a/sftp.1 b/sftp.1 index 3b035b1d4..fe3e4de32 100644 --- a/sftp.1 +++ b/sftp.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sftp.1,v 1.57 2004/06/21 22:41:31 djm Exp $ +.\" $OpenBSD: sftp.1,v 1.58 2004/10/07 10:10:24 djm Exp $ .\" .\" Copyright (c) 2001 Damien Miller. All rights reserved. .\" @@ -166,6 +166,7 @@ For full details of the options listed below, and their possible values, see .It HostName .It IdentityFile .It IdentitiesOnly +.It KbdInteractiveDevices .It LogLevel .It MACs .It NoHostAuthenticationForLocalhost -- cgit v1.2.3 From 0133a727acc7db7bd5a733ca0bed8a06a112f389 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Mon, 6 Dec 2004 22:44:32 +1100 Subject: - jmc@cvs.openbsd.org 2004/11/29 00:05:17 [sftp.1] missing full stop; --- ChangeLog | 5 ++++- sftp.1 | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'sftp.1') diff --git a/ChangeLog b/ChangeLog index f80f685de..3a925d505 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,9 @@ - markus@cvs.openbsd.org 2004/11/25 22:22:14 [sftp-client.c sftp.c] leak; from mpech + - jmc@cvs.openbsd.org 2004/11/29 00:05:17 + [sftp.1] + missing full stop; 20041203 - (dtucker) OpenBSD CVS Sync @@ -1877,4 +1880,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3586 2004/12/06 11:43:43 dtucker Exp $ +$Id: ChangeLog,v 1.3587 2004/12/06 11:44:32 dtucker Exp $ diff --git a/sftp.1 b/sftp.1 index fe3e4de32..f438949dd 100644 --- a/sftp.1 +++ b/sftp.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sftp.1,v 1.58 2004/10/07 10:10:24 djm Exp $ +.\" $OpenBSD: sftp.1,v 1.59 2004/11/29 00:05:17 jmc Exp $ .\" .\" Copyright (c) 2001 Damien Miller. All rights reserved. .\" @@ -193,7 +193,7 @@ For full details of the options listed below, and their possible values, see .It Fl P Ar sftp_server_path Connect directly to a local sftp server (rather than via -.Xr ssh 1 ) +.Xr ssh 1 ) . This option may be useful in debugging the client and server. .It Fl R Ar num_requests Specify how many requests may be outstanding at any one time. -- cgit v1.2.3 From 16e254d17934437a811e0019107ad53cdea8eb76 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Mon, 6 Dec 2004 22:46:45 +1100 Subject: - jaredy@cvs.openbsd.org 2004/12/05 23:55:07 [sftp.1] - explain that patterns can be used as arguments in get/put/ls/etc commands (prodded by Michael Knudsen) - describe ls flags as a list - other minor improvements ok jmc, djm --- ChangeLog | 9 ++++- sftp.1 | 116 +++++++++++++++++++++++++++++++++++++++++++++----------------- 2 files changed, 93 insertions(+), 32 deletions(-) (limited to 'sftp.1') diff --git a/ChangeLog b/ChangeLog index 520b9b485..ea529e794 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,13 @@ - djm@cvs.openbsd.org 2004/11/29 07:41:24 [sftp-client.h sftp.c] Some small fixes from moritz@jodeit.org. ok deraadt@ + - jaredy@cvs.openbsd.org 2004/12/05 23:55:07 + [sftp.1] + - explain that patterns can be used as arguments in get/put/ls/etc + commands (prodded by Michael Knudsen) + - describe ls flags as a list + - other minor improvements + ok jmc, djm 20041203 - (dtucker) OpenBSD CVS Sync @@ -1883,4 +1890,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3588 2004/12/06 11:45:53 dtucker Exp $ +$Id: ChangeLog,v 1.3589 2004/12/06 11:46:45 dtucker Exp $ diff --git a/sftp.1 b/sftp.1 index f438949dd..bcd7fdf78 100644 --- a/sftp.1 +++ b/sftp.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sftp.1,v 1.59 2004/11/29 00:05:17 jmc Exp $ +.\" $OpenBSD: sftp.1,v 1.60 2004/12/05 23:55:07 jaredy Exp $ .\" .\" Copyright (c) 2001 Damien Miller. All rights reserved. .\" @@ -71,7 +71,9 @@ The second usage format will retrieve files automatically if a non-interactive authentication method is used; otherwise it will do so after successful interactive authentication. .Pp -The third usage format allows the sftp client to start in a remote directory. +The third usage format allows +.Nm +to start in a remote directory. .Pp The final usage format allows for automated sessions using the .Fl b @@ -224,9 +226,13 @@ Once in interactive mode, .Nm understands a set of commands similar to those of .Xr ftp 1 . -Commands are case insensitive and pathnames may be enclosed in quotes if they -contain spaces. -.Bl -tag -width "lmdir path" +Commands are case insensitive. +Pathnames that contain spaces must be enclosed in quotes. +Any special characters contained within pathnames that are recognized by +.Xr glob 3 +must be escaped with backslashes +.Pq Sq \e . +.Bl -tag -width Ds .It Ic bye Quit .Nm sftp . @@ -238,6 +244,10 @@ Change group of file .Ar path to .Ar grp . +.Ar path +may contain +.Xr glob 3 +characters and may match multiple files. .Ar grp must be a numeric GID. .It Ic chmod Ar mode Ar path @@ -245,18 +255,26 @@ Change permissions of file .Ar path to .Ar mode . +.Ar path +may contain +.Xr glob 3 +characters and may match multiple files. .It Ic chown Ar own Ar path Change owner of file .Ar path to .Ar own . +.Ar path +may contain +.Xr glob 3 +characters and may match multiple files. .Ar own must be a numeric UID. .It Ic exit Quit .Nm sftp . .It Xo Ic get -.Op Ar flags +.Op Fl P .Ar remote-path .Op Ar local-path .Xc @@ -266,9 +284,18 @@ and store it on the local machine. If the local path name is not specified, it is given the same name it has on the remote machine. +.Ar remote-path +may contain +.Xr glob 3 +characters and may match multiple files. +If it does and +.Ar local-path +is specified, then +.Ar local-path +must specify a directory. If the .Fl P -flag is specified, then the file's full permission and access time are +flag is specified, then full file permissions and access times are copied too. .It Ic help Display help text. @@ -281,6 +308,14 @@ Display local directory listing of either or current directory if .Ar path is not specified. +.Ar ls-options +may contain any flags supported by the local system's +.Xr ls 1 +command. +.Ar path +may contain +.Xr glob 3 +characters and may match multiple files. .It Ic lmkdir Ar path Create local directory specified by .Ar path . @@ -292,36 +327,44 @@ to .It Ic lpwd Print local working directory. .It Xo Ic ls -.Op Ar flags +.Op Fl 1aflnrSt .Op Ar path .Xc -Display remote directory listing of either +Display a remote directory listing of either .Ar path -or current directory if +or the current directory if .Ar path is not specified. -If the -.Fl l -flag is specified, then display additional details including permissions -and ownership information. -The -.Fl n -flag will produce a long listing with user and group information presented -numerically. +.Ar path +may contain +.Xr glob 3 +characters and may match multiple files. .Pp -By default, +The following flags are recognized and alter the behaviour of .Ic ls -listings are sorted in lexicographical order. -This may be changed by specifying the -.Fl S -(sort by file size), -.Fl t -(sort by last modification time), or -.Fl f -(don't sort at all) flags. -Additionally, the sort order may be reversed using the -.Fl r -flag. +accordingly: +.Bl -tag -width Ds +.It Fl 1 +Produce single columnar output. +.It Fl a +List files beginning with a dot +.Pq Sq \&. . +.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 n +Produce a long listing with user and group information presented +numerically. +.It Fl r +Reverse the sort order of the listing. +.It Fl S +Sort the listing by file size. +.It Fl t +Sort the listing by last modification time. +.El .It Ic lumask Ar umask Set local umask to .Ar umask . @@ -331,7 +374,7 @@ Create remote directory specified by .It Ic progress Toggle display of progress meter. .It Xo Ic put -.Op Ar flags +.Op Fl P .Ar local-path .Op Ar remote-path .Xc @@ -340,6 +383,15 @@ Upload and store it on the remote machine. If the remote path name is not specified, it is given the same name it has on the local machine. +.Ar local-path +may contain +.Xr glob 3 +characters and may match multiple files. +If it does and +.Ar remote-path +is specified, then +.Ar remote-path +must specify a directory. If the .Fl P flag is specified, then the file's full permission and access time are @@ -380,10 +432,12 @@ Synonym for help. .El .Sh SEE ALSO .Xr ftp 1 , +.Xr ls 1 , .Xr scp 1 , .Xr ssh 1 , .Xr ssh-add 1 , .Xr ssh-keygen 1 , +.Xr glob 3 , .Xr ssh_config 5 , .Xr sftp-server 8 , .Xr sshd 8 -- cgit v1.2.3 From 27e9c5125e9a8a3d7cb5086a875a00a9eb556e90 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Wed, 2 Mar 2005 12:04:16 +1100 Subject: - jmc@cvs.openbsd.org 2005/03/01 17:19:35 [scp.1 sftp.1] add HashKnownHosts to -o list; ok markus@ --- ChangeLog | 6 +++++- scp.1 | 3 ++- sftp.1 | 3 ++- 3 files changed, 9 insertions(+), 3 deletions(-) (limited to 'sftp.1') diff --git a/ChangeLog b/ChangeLog index 3165f1225..538e2e3b3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,10 @@ - jmc@cvs.openbsd.org 2005/03/01 15:47:14 [ssh-keyscan.1 ssh-keyscan.c] sort options and sync usage(); + - jmc@cvs.openbsd.org 2005/03/01 17:19:35 + [scp.1 sftp.1] + add HashKnownHosts to -o list; + ok markus@ 20050301 - (djm) OpenBSD CVS sync: @@ -2237,4 +2241,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3680 2005/03/02 01:04:01 djm Exp $ +$Id: ChangeLog,v 1.3681 2005/03/02 01:04:16 djm Exp $ diff --git a/scp.1 b/scp.1 index 30049c2b6..b5191e318 100644 --- a/scp.1 +++ b/scp.1 @@ -9,7 +9,7 @@ .\" .\" Created: Sun May 7 00:14:37 1995 ylo .\" -.\" $OpenBSD: scp.1,v 1.37 2004/10/07 10:10:24 djm Exp $ +.\" $OpenBSD: scp.1,v 1.38 2005/03/01 17:19:35 jmc Exp $ .\" .Dd September 25, 1999 .Dt SCP 1 @@ -133,6 +133,7 @@ For full details of the options listed below, and their possible values, see .It GlobalKnownHostsFile .It GSSAPIAuthentication .It GSSAPIDelegateCredentials +.It HashKnownHosts .It Host .It HostbasedAuthentication .It HostKeyAlgorithms diff --git a/sftp.1 b/sftp.1 index bcd7fdf78..c89ffc30f 100644 --- a/sftp.1 +++ b/sftp.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sftp.1,v 1.60 2004/12/05 23:55:07 jaredy Exp $ +.\" $OpenBSD: sftp.1,v 1.61 2005/03/01 17:19:35 jmc Exp $ .\" .\" Copyright (c) 2001 Damien Miller. All rights reserved. .\" @@ -161,6 +161,7 @@ For full details of the options listed below, and their possible values, see .It GlobalKnownHostsFile .It GSSAPIAuthentication .It GSSAPIDelegateCredentials +.It HashKnownHosts .It Host .It HostbasedAuthentication .It HostKeyAlgorithms -- cgit v1.2.3