aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPoul-Henning Kamp <phk@FreeBSD.org>1998-04-22 06:20:20 +0000
committerPoul-Henning Kamp <phk@FreeBSD.org>1998-04-22 06:20:20 +0000
commit4419bba9fb8541da374d84d8a9e8ee77a9fe06fa (patch)
treee66d0c910fea50367d123c7fc58f7789da5e31b8
parent38f86230bd6bc5ff6b7d95d5926b86af631e7d3f (diff)
Notes
-rw-r--r--sbin/ipfw/ipfw.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/sbin/ipfw/ipfw.c b/sbin/ipfw/ipfw.c
index d143d67432af..22407e65c843 100644
--- a/sbin/ipfw/ipfw.c
+++ b/sbin/ipfw/ipfw.c
@@ -16,7 +16,7 @@
*
* NEW command line interface for IP firewall facility
*
- * $Id: ipfw.c,v 1.54 1998/02/12 00:57:06 alex Exp $
+ * $Id: ipfw.c,v 1.55 1998/03/13 02:31:21 alex Exp $
*
*/
@@ -1179,6 +1179,7 @@ ipfw_main(ac,av)
/* Set the force flag for non-interactive processes */
do_force = !isatty(STDIN_FILENO);
+ optind = 1;
while ((ch = getopt(ac, av, "afqtN")) != -1)
switch(ch) {
case 'a':
@@ -1275,6 +1276,7 @@ main(ac, av)
if ((f = fopen(av[1], "r")) == NULL)
err(EX_UNAVAILABLE, "fopen: %s", av[1]);
while (fgets(buf, BUFSIZ, f)) {
+ char *p;
lineno++;
sprintf(linename, "Line %d", lineno);
@@ -1282,6 +1284,8 @@ main(ac, av)
if (*buf == '#')
continue;
+ if ((p = strchr(buf, '#')) != NULL)
+ *p = '\0';
for (i = 1, a = strtok(buf, WHITESP);
a && i < MAX_ARGS; a = strtok(NULL, WHITESP), i++)
args[i] = a;