diff options
| author | delphij <delphij@FreeBSD.org> | 2009-05-28 23:23:49 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2009-05-28 23:23:49 +0000 |
| commit | 7515df23bd1cac655ac2e77705c42f9127c815d2 (patch) | |
| tree | 691b260d6d533b4dbae60e85fc746a4fd3f19b19 /contrib/netcat | |
| parent | 9d1364448be96ea5fb5e7008b24bdcbcf5e21d0e (diff) | |
| download | FreeBSD-src-7515df23bd1cac655ac2e77705c42f9127c815d2.zip FreeBSD-src-7515df23bd1cac655ac2e77705c42f9127c815d2.tar.gz | |
Update netcat to the version carried with OpenBSD 4.5.
Diffstat (limited to 'contrib/netcat')
| -rw-r--r-- | contrib/netcat/nc.1 | 8 | ||||
| -rw-r--r-- | contrib/netcat/netcat.c | 13 |
2 files changed, 11 insertions, 10 deletions
diff --git a/contrib/netcat/nc.1 b/contrib/netcat/nc.1 index 480196a..cd3507b 100644 --- a/contrib/netcat/nc.1 +++ b/contrib/netcat/nc.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: nc.1,v 1.47 2008/05/06 16:21:03 jmc Exp $ +.\" $OpenBSD: nc.1,v 1.48 2008/09/19 13:24:41 sobrado Exp $ .\" .\" Copyright (c) 1996 David Sacerdote .\" All rights reserved. @@ -53,7 +53,7 @@ .Ar port Oc Oc .Xc .Op Ar hostname -.Op Ar port Ns Bq Ar s +.Op Ar port .Ek .Sh DESCRIPTION The @@ -275,8 +275,8 @@ unless the option is given (in which case the local host is used). .Pp -.Ar port Ns Op Ar s -can be single integers or ranges. +.Ar port +can be a single integer or a range of ports. Ranges are in the form nn-mm. In general, a destination port must be specified, diff --git a/contrib/netcat/netcat.c b/contrib/netcat/netcat.c index 77ee6bd..d0c3881 100644 --- a/contrib/netcat/netcat.c +++ b/contrib/netcat/netcat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: netcat.c,v 1.91 2008/05/09 09:00:11 markus Exp $ */ +/* $OpenBSD: netcat.c,v 1.92 2008/09/19 13:24:41 sobrado Exp $ */ /* * Copyright (c) 2001 Eric Jackson <ericj@monkey.org> * @@ -967,14 +967,15 @@ add_ipsec_policy(int s, char *policy) void usage(int ret) { + fprintf(stderr, #ifdef IPSEC - fprintf(stderr, "usage: nc [-46DdEhklnorStUuvz] [-e policy] [-I receive_buffer_len] [-i interval]\n"); + "usage: nc [-46DdEhklnorStUuvz] [-e policy] [-I length] [-i interval] [-O length]\n" #else - fprintf(stderr, "usage: nc [-46DdhklnorStUuvz] [-I receive_buffer_len] [-i interval]\n"); + "usage: nc [-46DdhklnorStUuvz] [-I length] [-i interval] [-O length]\n" #endif - fprintf(stderr, "\t [-O send_buffer_len] [-P proxy_username] [-p source_port]\n"); - 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"); + "\t [-P proxy_username] [-p source_port] [-s source_ip_address] [-T ToS]\n" + "\t [-w timeout] [-X proxy_protocol] [-x proxy_address[:port]] [hostname]\n" + "\t [port]\n"); if (ret) exit(1); } |
