From owner-svn-src-vendor@FreeBSD.ORG Thu May 28 23:16:19 2009 Return-Path: Delivered-To: svn-src-vendor@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 65610106566B; Thu, 28 May 2009 23:16:19 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 38EBA8FC20; Thu, 28 May 2009 23:16:19 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4SNGJM0053028; Thu, 28 May 2009 23:16:19 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4SNGJYe053026; Thu, 28 May 2009 23:16:19 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <200905282316.n4SNGJYe053026@svn.freebsd.org> From: Xin LI Date: Thu, 28 May 2009 23:16:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193006 - vendor/netcat/dist X-BeenThere: svn-src-vendor@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the vendor work area tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 May 2009 23:16:20 -0000 Author: delphij Date: Thu May 28 23:16:17 2009 New Revision: 193006 URL: http://svn.freebsd.org/changeset/base/193006 Log: Vendor import of netcat as of OPENBSD_4_5. Modified: vendor/netcat/dist/nc.1 vendor/netcat/dist/netcat.c Modified: vendor/netcat/dist/nc.1 ============================================================================== --- vendor/netcat/dist/nc.1 Thu May 28 23:13:53 2009 (r193005) +++ vendor/netcat/dist/nc.1 Thu May 28 23:16:17 2009 (r193006) @@ -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, Modified: vendor/netcat/dist/netcat.c ============================================================================== --- vendor/netcat/dist/netcat.c Thu May 28 23:13:53 2009 (r193005) +++ vendor/netcat/dist/netcat.c Thu May 28 23:16:17 2009 (r193006) @@ -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 * @@ -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); }