From owner-freebsd-ipfw@FreeBSD.ORG  Wed Jul 13 04:40:07 2011
Return-Path: <owner-freebsd-ipfw@FreeBSD.ORG>
Delivered-To: freebsd-ipfw@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C760E106566C
	for <freebsd-ipfw@hub.freebsd.org>;
	Wed, 13 Jul 2011 04:40:07 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
	[IPv6:2001:4f8:fff6::28])
	by mx1.freebsd.org (Postfix) with ESMTP id 95DA78FC14
	for <freebsd-ipfw@hub.freebsd.org>;
	Wed, 13 Jul 2011 04:40:07 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p6D4e75W015668
	for <freebsd-ipfw@freefall.freebsd.org>; Wed, 13 Jul 2011 04:40:07 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p6D4e7Te015667;
	Wed, 13 Jul 2011 04:40:07 GMT (envelope-from gnats)
Date: Wed, 13 Jul 2011 04:40:07 GMT
Message-Id: <201107130440.p6D4e7Te015667@freefall.freebsd.org>
To: freebsd-ipfw@FreeBSD.org
From: dfilter@FreeBSD.ORG (dfilter service)
Cc: 
Subject: Re: bin/156653: commit references a PR
X-BeenThere: freebsd-ipfw@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: dfilter service <dfilter@FreeBSD.ORG>
List-Id: IPFW Technical Discussions <freebsd-ipfw.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ipfw>,
	<mailto:freebsd-ipfw-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ipfw>
List-Post: <mailto:freebsd-ipfw@freebsd.org>
List-Help: <mailto:freebsd-ipfw-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ipfw>,
	<mailto:freebsd-ipfw-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 13 Jul 2011 04:40:07 -0000

The following reply was made to PR bin/156653; it has been noted by GNATS.

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/156653: commit references a PR
Date: Wed, 13 Jul 2011 04:31:06 +0000 (UTC)

 Author: ae
 Date: Wed Jul 13 04:30:16 2011
 New Revision: 223973
 URL: http://svn.freebsd.org/changeset/base/223973
 
 Log:
   MFC r223661:
     Improve error reporting. Use corresponding error message when file to be
     preprocessed is missing. Also suggest to use absolute pathname if -p
     option is specified.
   
     PR:             bin/156653
 
 Modified:
   stable/7/sbin/ipfw/main.c
 Directory Properties:
   stable/7/sbin/ipfw/   (props changed)
 
 Modified: stable/7/sbin/ipfw/main.c
 ==============================================================================
 --- stable/7/sbin/ipfw/main.c	Wed Jul 13 04:27:47 2011	(r223972)
 +++ stable/7/sbin/ipfw/main.c	Wed Jul 13 04:30:16 2011	(r223973)
 @@ -204,7 +204,7 @@ ipfw_main(int oldac, char **oldav)
  	save_av = av;
  
  	optind = optreset = 1;	/* restart getopt() */
 -	while ((ch = getopt(ac, av, "abcdefhinNqs:STtv")) != -1)
 +	while ((ch = getopt(ac, av, "abcdefhinNp:qs:STtv")) != -1)
  		switch (ch) {
  		case 'a':
  			do_acct = 1;
 @@ -248,6 +248,10 @@ ipfw_main(int oldac, char **oldav)
  			co.do_resolv = 1;
  			break;
  
 +		case 'p':
 +			errx(EX_USAGE, "An absolute pathname must be used "
 +			    "with -p option.");
 +
  		case 'q':
  			co.do_quiet = 1;
  			break;
 @@ -527,9 +531,12 @@ main(int ac, char *av[])
  	 * as a file to be preprocessed.
  	 */
  
 -	if (ac > 1 && av[ac - 1][0] == '/' && access(av[ac - 1], R_OK) == 0)
 -		ipfw_readfile(ac, av);
 -	else {
 +	if (ac > 1 && av[ac - 1][0] == '/') {
 +		if (access(av[ac - 1], R_OK) == 0)
 +			ipfw_readfile(ac, av);
 +		else
 +			err(EX_USAGE, "pathname: %s", av[ac - 1]);
 +	} else {
  		if (ipfw_main(ac, av)) {
  			errx(EX_USAGE,
  			    "usage: ipfw [options]\n"
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"