onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-09-13 08:29:32 +02:00
Code Issues Releases Wiki Activity

fixes #869

Browse Source
This commit is contained in:
Vadim Kurland
2009-12-13 04:33:06 +00:00
parent bf4ecbf830
commit 62287a7c7c
2 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build_num
+1 -1
View File
@@ -1 +1 @@
#define BUILD_NUM 2116 #define BUILD_NUM 2117
src/iptlib/PolicyCompiler_PrintRule.cpp
+12 -4
View File
@@ -165,7 +165,9 @@ string PolicyCompiler_ipt::PrintRule::_printRuleLabel(PolicyRule *rule)
"/FWBuilderResources/Target/options/suppress_comments"); "/FWBuilderResources/Target/options/suppress_comments");
string rl=rule->getLabel(); string rl=rule->getLabel();
if (!compiler->inSingleRuleCompileMode() && rl != current_rule_label) if (rl != current_rule_label)
{
if (!compiler->inSingleRuleCompileMode())
{ {
if (!nocomm) if (!nocomm)
{ {
@@ -175,22 +177,28 @@ string PolicyCompiler_ipt::PrintRule::_printRuleLabel(PolicyRule *rule)
} }
res << "echo " << _quote(string("Rule ")+rl) << endl; res << "echo " << _quote(string("Rule ")+rl) << endl;
res << "# " << endl; res << "# " << endl;
}
/* do not put comment in the script if it is intended for linksys */ /* do not put comment in the script if it is intended for linksys */
if (!nocomm) if (!nocomm || compiler->inSingleRuleCompileMode())
{ {
string comm = rule->getComment(); string comm = rule->getComment();
if (!comm.empty())
{
string::size_type c1,c2; string::size_type c1,c2;
c1=0; c1=0;
while ( (c2=comm.find('\n',c1))!=string::npos ) { while ( (c2=comm.find('\n',c1))!=string::npos )
{
res << "# " << comm.substr(c1,c2-c1) << endl; res << "# " << comm.substr(c1,c2-c1) << endl;
c1=c2+1; c1=c2+1;
} }
res << "# " << comm.substr(c1) << endl; res << "# " << comm.substr(c1) << endl;
res << "# " << endl; res << "# " << endl;
} }
current_rule_label=rl;
} }
}
current_rule_label=rl;
string err = rule->getStr(".error_msg"); string err = rule->getStr(".error_msg");
if (!err.empty()) res << "# " << err << endl; if (!err.empty()) res << "# " << err << endl;