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

From: dfil...@freebsd.org (dfilter service)
To: bug-follo...@freebsd.org
Cc:  
Subject: Re: bin/156653: commit references a PR
Date: Wed, 13 Jul 2011 04:27:56 +0000 (UTC)

 Author: ae
 Date: Wed Jul 13 04:27:47 2011
 New Revision: 223972
 URL: http://svn.freebsd.org/changeset/base/223972
 
 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/8/sbin/ipfw/main.c
 Directory Properties:
   stable/8/sbin/ipfw/   (props changed)
 
 Modified: stable/8/sbin/ipfw/main.c
 ==============================================================================
 --- stable/8/sbin/ipfw/main.c  Wed Jul 13 00:48:36 2011        (r223971)
 +++ stable/8/sbin/ipfw/main.c  Wed Jul 13 04:27:47 2011        (r223972)
 @@ -262,7 +262,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;
 @@ -306,6 +306,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;
 @@ -603,9 +607,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-...@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
 
_______________________________________________
freebsd-ipfw@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ipfw
To unsubscribe, send any mail to "freebsd-ipfw-unsubscr...@freebsd.org"

Reply via email to