Document freebsd extensions to netcat a bit better:

- sort the options
- document -o and -O everywhere

Reviewed by:	delphij
Approved by:	rwatson (mentor)
This commit is contained in:
antoine 2008-05-10 18:50:45 +00:00
parent 900481a7e7
commit 840e3ca1b5
2 changed files with 17 additions and 17 deletions

View File

@ -36,7 +36,7 @@
.Sh SYNOPSIS
.Nm nc
.Bk -words
.Op Fl 46DEdhklnoOrStUuvz
.Op Fl 46DdEhklnOorStUuvz
.Op Fl e Ar IPsec_policy
.Op Fl i Ar interval
.Op Fl P Ar proxy_username
@ -100,10 +100,6 @@ to use IPv6 addresses only.
Enable debugging on the socket.
.It Fl d
Do not attempt to read from stdin.
.It Fl h
Prints out
.Nm
help.
.It Fl E
Shortcut for
.Qo
@ -118,6 +114,10 @@ to be used using the syntax described in
.Xr ipsec_set_policy 3 .
This flag can be specified up to two times, as typically one policy for
each direction is needed.
.It Fl h
Prints out
.Nm
help.
.It Fl i Ar interval
Specifies a delay time interval between lines of text sent and received.
Also causes a delay time between connections to multiple ports.
@ -146,7 +146,10 @@ option are ignored.
.It Fl n
Do not do any DNS or service lookups on any specified addresses,
hostnames or ports.
.\"
.It Fl O
Disables the use of TCP options on the socket, by setting the boolean
TCP_NOOPT
socket option.
.It Fl o
.Dq Once-only mode .
By default,
@ -156,10 +159,6 @@ but continues until the network side has been closed down.
Specifying
.Fl o
will make it terminate on EOF as well.
.It Fl o
Disables the use of TCP options on the socket, by setting the boolean
TCP_NOOPT
socket option.
.It Fl P Ar proxy_username
Specifies a username to present to a proxy server that requires authentication.
If no username is specified then authentication will not be attempted.

View File

@ -868,21 +868,22 @@ help(void)
usage(0);
fprintf(stderr, "\tCommand Summary:\n\
\t-4 Use IPv4\n\
\t-6 Use IPv6\n");
\t-6 Use IPv6\n\
\t-D Enable the debug socket option\n\
\t-d Detach from stdin\n");
#ifdef IPSEC
fprintf(stderr, "\
\t-e policy Use specified IPsec policy\n\
\t-E Use IPsec ESP\n");
\t-E Use IPsec ESP\n\
\t-e policy Use specified IPsec policy\n");
#endif
fprintf(stderr, "\
\t-D Enable the debug socket option\n\
\t-d Detach from stdin\n\
\t-h This help text\n\
\t-i secs\t Delay interval for lines sent, ports scanned\n\
\t-k Keep inbound sockets open for multiple connects\n\
\t-l Listen mode, for inbound connects\n\
\t-n Suppress name/port resolutions\n\
\t-O Disable TCP options\n\
\t-o Terminate on EOF on input\n\
\t-P proxyuser\tUsername for proxy authentication\n\
\t-p port\t Specify local port for remote connects\n\
\t-r Randomize remote ports\n\
@ -930,9 +931,9 @@ void
usage(int ret)
{
#ifdef IPSEC
fprintf(stderr, "usage: nc [-46DEdhklnorStUuvz] [-e policy] [-i interval] [-P proxy_username] [-p source_port]\n");
fprintf(stderr, "usage: nc [-46DdEhklnOorStUuvz] [-e policy] [-i interval] [-P proxy_username] [-p source_port]\n");
#else
fprintf(stderr, "usage: nc [-46DdhklnorStUuvz] [-i interval] [-P proxy_username] [-p source_port]\n");
fprintf(stderr, "usage: nc [-46DdhklnOorStUuvz] [-i interval] [-P proxy_username] [-p source_port]\n");
#endif
fprintf(stderr, "\t [-s source_ip_address] [-T ToS] [-w timeout] [-X proxy_protocol]\n");
fprintf(stderr, "\t [-x proxy_address[:port]] [hostname] [port[s]]\n");