diff options
author | luigi <luigi@FreeBSD.org> | 2009-01-27 09:27:13 +0000 |
---|---|---|
committer | luigi <luigi@FreeBSD.org> | 2009-01-27 09:27:13 +0000 |
commit | 4e134bba317d2d01b583b91d430c2be800a478c8 (patch) | |
tree | 54fd9944022d18ffb52defe70640ac96c180e052 /sbin/ipfw/ipfw2.c | |
parent | a1283d80864875ab3971699c3524c52725a2ec9e (diff) | |
download | FreeBSD-src-4e134bba317d2d01b583b91d430c2be800a478c8.zip FreeBSD-src-4e134bba317d2d01b583b91d430c2be800a478c8.tar.gz |
put the usage() function inline, it was only 1 line and used once;
slightly reformat the help() text;
slightly correct the text for the 'extraneous filename' error message;
Diffstat (limited to 'sbin/ipfw/ipfw2.c')
-rw-r--r-- | sbin/ipfw/ipfw2.c | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/sbin/ipfw/ipfw2.c b/sbin/ipfw/ipfw2.c index 087ed68..4744966 100644 --- a/sbin/ipfw/ipfw2.c +++ b/sbin/ipfw/ipfw2.c @@ -245,8 +245,6 @@ static struct _s_x ether_types[] = { { NULL, 0 } }; -static void show_usage(void); - enum tokens { TOK_NULL=0, @@ -2726,20 +2724,12 @@ done: } static void -show_usage(void) -{ - fprintf(stderr, "usage: ipfw [options]\n" -"do \"ipfw -h\" or see ipfw manpage for details\n" -); - exit(EX_USAGE); -} - -static void help(void) { fprintf(stderr, -"ipfw syntax summary (but please do read the ipfw(8) manpage):\n" -"ipfw [-abcdefhnNqStTv] <command> where <command> is one of:\n" +"ipfw syntax summary (but please do read the ipfw(8) manpage):\n\n" +"\tipfw [-abcdefhnNqStTv] <command>\n\n" +"where <command> is one of the following:\n\n" "add [num] [set N] [prob x] RULE-BODY\n" "{pipe|queue} N config PIPE-BODY\n" "[pipe|queue] {zero|delete|show} [N{,N}]\n" @@ -6471,10 +6461,8 @@ ipfw_readfile(int ac, char *av[]) } - if (cmd == NULL && ac != optind + 1) { - fprintf(stderr, "ac %d, optind %d\n", ac, optind); - errx(EX_USAGE, "extraneous filename arguments"); - } + if (cmd == NULL && ac != optind + 1) + errx(EX_USAGE, "extraneous filename arguments %s", av[ac-1]); if ((f = fopen(filename, "r")) == NULL) err(EX_UNAVAILABLE, "fopen: %s", filename); @@ -6554,8 +6542,11 @@ main(int ac, char *av[]) if (ac > 1 && av[ac - 1][0] == '/' && access(av[ac - 1], R_OK) == 0) ipfw_readfile(ac, av); else { - if (ipfw_main(ac, av)) - show_usage(); + if (ipfw_main(ac, av)) { + errx(EX_USAGE, + "usage: ipfw [options]\n" + "do \"ipfw -h\" or \"man ipfw\" for details"); + } } return EX_OK; } |