From ce0c00f511371de4e08ccd40a89f1d4d6b8f7912 Mon Sep 17 00:00:00 2001 From: luigi Date: Tue, 15 Jul 2003 10:23:43 +0000 Subject: [PATCH] Make sure that comments are printed at the end of a rule. Reported by: Patrick Tracanelli --- sbin/ipfw/ipfw2.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sbin/ipfw/ipfw2.c b/sbin/ipfw/ipfw2.c index a2e1f9ddbf14..91761bcbcd77 100644 --- a/sbin/ipfw/ipfw2.c +++ b/sbin/ipfw/ipfw2.c @@ -881,6 +881,7 @@ show_ipfw(struct ip_fw *rule, int pcwidth, int bcwidth) static int twidth = 0; int l; ipfw_insn *cmd; + char *comment = NULL; /* ptr to comment if we have one */ int proto = 0; /* default */ int flags = 0; /* prerequisites */ ipfw_insn_log *logptr = NULL; /* set if we find an O_LOG */ @@ -1263,7 +1264,7 @@ show_ipfw(struct ip_fw *rule, int pcwidth, int bcwidth) break; case O_NOP: - printf(" // %s", (char *)(cmd + 1)); + comment = (char *)(cmd + 1); break; case O_KEEP_STATE: @@ -1302,7 +1303,8 @@ show_ipfw(struct ip_fw *rule, int pcwidth, int bcwidth) } } show_prerequisites(&flags, HAVE_IP, 0); - + if (comment) + printf(" // %s", comment); printf("\n"); }