diff options
author | sobrado <> | 2008-09-19 13:24:41 +0000 |
---|---|---|
committer | sobrado <> | 2008-09-19 13:24:41 +0000 |
commit | 911f77342624aadce3c3044ec39eaca7218afd83 (patch) | |
tree | 4defe26ac5700d813c0dba92403537515318197a /src | |
parent | d8a728372d924a59e821c02139ecd7915c848b4d (diff) | |
download | openbsd-911f77342624aadce3c3044ec39eaca7218afd83.tar.gz openbsd-911f77342624aadce3c3044ec39eaca7218afd83.tar.bz2 openbsd-911f77342624aadce3c3044ec39eaca7218afd83.zip |
documentation tweaks; synchronize synopsis and usage.
written with help by jmc@
ok jmc@
Diffstat (limited to 'src')
-rw-r--r-- | src/usr.bin/nc/nc.1 | 10 | ||||
-rw-r--r-- | src/usr.bin/nc/netcat.c | 11 |
2 files changed, 11 insertions, 10 deletions
diff --git a/src/usr.bin/nc/nc.1 b/src/usr.bin/nc/nc.1 index 75410e298d..e8dfeea077 100644 --- a/src/usr.bin/nc/nc.1 +++ b/src/usr.bin/nc/nc.1 | |||
@@ -1,4 +1,4 @@ | |||
1 | .\" $OpenBSD: nc.1,v 1.47 2008/05/06 16:21:03 jmc Exp $ | 1 | .\" $OpenBSD: nc.1,v 1.48 2008/09/19 13:24:41 sobrado Exp $ |
2 | .\" | 2 | .\" |
3 | .\" Copyright (c) 1996 David Sacerdote | 3 | .\" Copyright (c) 1996 David Sacerdote |
4 | .\" All rights reserved. | 4 | .\" All rights reserved. |
@@ -25,7 +25,7 @@ | |||
25 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 25 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
26 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 26 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
27 | .\" | 27 | .\" |
28 | .Dd $Mdocdate: May 6 2008 $ | 28 | .Dd $Mdocdate: September 19 2008 $ |
29 | .Dt NC 1 | 29 | .Dt NC 1 |
30 | .Os | 30 | .Os |
31 | .Sh NAME | 31 | .Sh NAME |
@@ -49,7 +49,7 @@ | |||
49 | .Ar port Oc Oc | 49 | .Ar port Oc Oc |
50 | .Xc | 50 | .Xc |
51 | .Op Ar hostname | 51 | .Op Ar hostname |
52 | .Op Ar port Ns Bq Ar s | 52 | .Op Ar port |
53 | .Ek | 53 | .Ek |
54 | .Sh DESCRIPTION | 54 | .Sh DESCRIPTION |
55 | The | 55 | The |
@@ -243,8 +243,8 @@ unless the | |||
243 | option is given | 243 | option is given |
244 | (in which case the local host is used). | 244 | (in which case the local host is used). |
245 | .Pp | 245 | .Pp |
246 | .Ar port Ns Op Ar s | 246 | .Ar port |
247 | can be single integers or ranges. | 247 | can be a single integer or a range of ports. |
248 | Ranges are in the form nn-mm. | 248 | Ranges are in the form nn-mm. |
249 | In general, | 249 | In general, |
250 | a destination port must be specified, | 250 | a destination port must be specified, |
diff --git a/src/usr.bin/nc/netcat.c b/src/usr.bin/nc/netcat.c index 48b2b673ba..e465073506 100644 --- a/src/usr.bin/nc/netcat.c +++ b/src/usr.bin/nc/netcat.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: netcat.c,v 1.91 2008/05/09 09:00:11 markus Exp $ */ | 1 | /* $OpenBSD: netcat.c,v 1.92 2008/09/19 13:24:41 sobrado Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2001 Eric Jackson <ericj@monkey.org> | 3 | * Copyright (c) 2001 Eric Jackson <ericj@monkey.org> |
4 | * | 4 | * |
@@ -863,10 +863,11 @@ help(void) | |||
863 | void | 863 | void |
864 | usage(int ret) | 864 | usage(int ret) |
865 | { | 865 | { |
866 | fprintf(stderr, "usage: nc [-46DdhklnrStUuvz] [-I receive_buffer_len] [-i interval]\n"); | 866 | fprintf(stderr, |
867 | fprintf(stderr, "\t [-O send_buffer_len] [-P proxy_username] [-p source_port]\n"); | 867 | "usage: nc [-46DdhklnrStUuvz] [-I length] [-i interval] [-O length]\n" |
868 | fprintf(stderr, "\t [-s source_ip_address] [-T ToS] [-w timeout] [-X proxy_protocol]\n"); | 868 | "\t [-P proxy_username] [-p source_port] [-s source_ip_address] [-T ToS]\n" |
869 | fprintf(stderr, "\t [-x proxy_address[:port]] [hostname] [port[s]]\n"); | 869 | "\t [-w timeout] [-X proxy_protocol] [-x proxy_address[:port]] [hostname]\n" |
870 | "\t [port]\n"); | ||
870 | if (ret) | 871 | if (ret) |
871 | exit(1); | 872 | exit(1); |
872 | } | 873 | } |