aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXin LI <delphij@FreeBSD.org>2009-05-28 23:16:17 +0000
committerXin LI <delphij@FreeBSD.org>2009-05-28 23:16:17 +0000
commitc788419214da9626efde82d34b9e714503193f22 (patch)
tree0bc634b5d87be0d28a2dd9b04b090d8d12b6cacb
parentf646fedc0a4d919451a7322a57701d141f8b5178 (diff)
downloadsrc-c788419214da9626efde82d34b9e714503193f22.tar.gz
src-c788419214da9626efde82d34b9e714503193f22.zip
Vendor import of netcat as of OPENBSD_4_5.vendor/netcat/4.5
Notes
Notes: svn path=/vendor/netcat/dist/; revision=193006 svn path=/vendor/netcat/4.5/; revision=193007; tag=vendor/netcat/4.5
-rw-r--r--nc.18
-rw-r--r--netcat.c11
2 files changed, 10 insertions, 9 deletions
diff --git a/nc.1 b/nc.1
index 75410e298d65..8dfecf080aac 100644
--- a/nc.1
+++ b/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.
@@ -49,7 +49,7 @@
.Ar port Oc Oc
.Xc
.Op Ar hostname
-.Op Ar port Ns Bq Ar s
+.Op Ar port
.Ek
.Sh DESCRIPTION
The
@@ -243,8 +243,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/netcat.c b/netcat.c
index 48b2b673ba4f..e46507350611 100644
--- a/netcat.c
+++ b/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>
*
@@ -863,10 +863,11 @@ help(void)
void
usage(int ret)
{
- fprintf(stderr, "usage: nc [-46DdhklnrStUuvz] [-I receive_buffer_len] [-i interval]\n");
- 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");
+ fprintf(stderr,
+ "usage: nc [-46DdhklnrStUuvz] [-I length] [-i interval] [-O length]\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);
}