Date: Thu, 28 May 2009 23:23:49 +0000 (UTC) From: Xin LI <delphij@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r193008 - head/contrib/netcat Message-ID: <200905282323.n4SNNnOG053250@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: delphij Date: Thu May 28 23:23:49 2009 New Revision: 193008 URL: http://svn.freebsd.org/changeset/base/193008 Log: Update netcat to the version carried with OpenBSD 4.5. Modified: head/contrib/netcat/ (props changed) head/contrib/netcat/nc.1 head/contrib/netcat/netcat.c Modified: head/contrib/netcat/nc.1 ============================================================================== --- head/contrib/netcat/nc.1 Thu May 28 23:17:07 2009 (r193007) +++ head/contrib/netcat/nc.1 Thu May 28 23:23:49 2009 (r193008) @@ -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, Modified: head/contrib/netcat/netcat.c ============================================================================== --- head/contrib/netcat/netcat.c Thu May 28 23:17:07 2009 (r193007) +++ head/contrib/netcat/netcat.c Thu May 28 23:23:49 2009 (r193008) @@ -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); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200905282323.n4SNNnOG053250>