From: Russ Combs <rucombs@cisco.com>
Date: Thu, 21 Aug 2014 11:25:26 +0000 (-0400)
Subject: fixup cmd line processing
X-Git-Tag: 3.0.0-233~1419^2~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7af7b4bceea55637d689e76cdd89a4757b5fb8ae;p=thirdparty%2Fsnort3.git

fixup cmd line processing
---

diff --git a/src/framework/parameter.cc b/src/framework/parameter.cc
index 85e5959cd..b0853a33a 100644
--- a/src/framework/parameter.cc
+++ b/src/framework/parameter.cc
@@ -101,6 +101,9 @@ static bool valid_real(Value& v, const char* r)
 
 static bool valid_string(Value& v, const char* r)
 {
+    if ( r && !strcmp(r, "(optional)") )
+        return true;
+
     unsigned len = strlen(v.get_string());
 
     if ( !r )
diff --git a/src/main.cc b/src/main.cc
index 7ab4df30f..d25e812cf 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -619,11 +619,10 @@ static bool set_mode()
     if ( unit_test_enabled() )
         exit(unit_test());
 #endif
-    unsigned n = get_parse_errors();
 
-    if ( n )
+    if ( int k = get_parse_errors() )
     {
-        ParseAbort("%d config errors found", n);
+        ParseAbort("see prior %d errors", k);
         return false;
     }
     if ( ScTestMode() ||
diff --git a/src/main/help.cc b/src/main/help.cc
index a192cade7..cacb0a302 100644
--- a/src/main/help.cc
+++ b/src/main/help.cc
@@ -30,22 +30,16 @@
 using namespace std;
 
 #include "config_file.h"
-#include "parser.h"
-#include "vars.h"
-#include "detection/detect.h"
 #include "helpers/process.h"
-#include "main/analyzer.h"
-#include "main/shell.h"
+#include "main/snort.h"
 #include "main/snort_module.h"
 #include "managers/event_manager.h"
 #include "managers/so_manager.h"
 #include "managers/inspector_manager.h"
 #include "managers/module_manager.h"
 #include "managers/plugin_manager.h"
-#include "packet_io/trough.h"
 #include "packet_io/sfdaq.h"
 #include "packet_io/intf.h"
-#include "parser/parser.h"
 #include "utils/util.h"
 #include "helpers/markup.h"
 #include "framework/module.h"
diff --git a/src/main/snort.cc b/src/main/snort.cc
index c45c8cfd2..2af89e39d 100644
--- a/src/main/snort.cc
+++ b/src/main/snort.cc
@@ -488,8 +488,8 @@ void snort_setup(int argc, char* argv[])
     InitGroups(ScUid(), ScGid());
     SnortUnprivilegedInit();
 
-    if ( get_parse_errors() )
-        FatalError("see prior %d errors\n", get_parse_errors());
+    if ( int k = get_parse_errors() )
+        FatalError("see prior %d errors\n", k);
 
     set_quick_exit(false);
 }
diff --git a/src/main/snort_module.cc b/src/main/snort_module.cc
index 03c20d064..bf8090dbf 100644
--- a/src/main/snort_module.cc
+++ b/src/main/snort_module.cc
@@ -225,7 +225,7 @@ static const Parameter snort_params[] =
       "creates stub rule files of all loaded rules libraries" },
 
     { "--dump-dynamic-rules", Parameter::PT_STRING, nullptr, nullptr,
-      "<path> creates stub rule files of all loaded rules libraries" },
+      "<path> creates stub rule file of all loaded rules libraries" },
 
     { "--dirty-pig", Parameter::PT_IMPLIED, nullptr, nullptr,
       "don't flush packets and release memory on shutdown" },
@@ -236,25 +236,25 @@ static const Parameter snort_params[] =
     { "--help", Parameter::PT_IMPLIED, nullptr, nullptr,
       "overview of help" },
 
-    { "--help-builtin", Parameter::PT_STRING, nullptr, nullptr,
+    { "--help-builtin", Parameter::PT_STRING, "(optional)", nullptr,
       "<module prefix> output matching builtin rules" },
 
     { "--help-buffers", Parameter::PT_IMPLIED, nullptr, nullptr,
       "output available inspection buffers" },
 
-    { "--help-commands", Parameter::PT_STRING, nullptr, nullptr,
+    { "--help-commands", Parameter::PT_STRING, "(optional)", nullptr,
       "[<module prefix>] output matching commands" },
 
-    { "--help-config", Parameter::PT_STRING, nullptr, nullptr,
+    { "--help-config", Parameter::PT_STRING, "(optional)", nullptr,
       "[<module prefix>] output matching config options" },
 
-    { "--help-gids", Parameter::PT_STRING, nullptr, nullptr,
+    { "--help-gids", Parameter::PT_STRING, "(optional)", nullptr,
       "[<module prefix>] output matching generators" },
 
     { "--help-module", Parameter::PT_STRING, nullptr, nullptr,
       "<module> output description of given module" },
 
-    { "--help-options", Parameter::PT_STRING, nullptr, nullptr,
+    { "--help-options", Parameter::PT_STRING, "(optional)", nullptr,
       "<option prefix> output matching command line option quick help" },
 
     { "--help-signals", Parameter::PT_IMPLIED, nullptr, nullptr,
@@ -652,8 +652,14 @@ bool SnortModule::set(const char*, Value& v, SnortConfig* sc)
 // singleton
 //-------------------------------------------------------------------------
 
-static SnortModule snort_module;
+static SnortModule* snort_module = nullptr;
 
 Module* get_snort_module()
-{ return &snort_module; }
+{
+    if ( !snort_module )
+        snort_module = new SnortModule;
+
+    return snort_module;
+}
+
 
diff --git a/src/parser/cmd_line.cc b/src/parser/cmd_line.cc
index 05e2b4718..653855758 100644
--- a/src/parser/cmd_line.cc
+++ b/src/parser/cmd_line.cc
@@ -24,33 +24,16 @@
 #include "config.h"
 #endif
 
-#include <syslog.h>
-#include <iostream>
 #include <string>
 using namespace std;
 
-#include "config_file.h"
-#include "vars.h"
-#include "detection/detect.h"
-#include "helpers/process.h"
-#include "main/analyzer.h"
-#include "main/snort.h"
 #include "main/snort_module.h"
-#include "main/shell.h"
 #include "framework/module.h"
 #include "framework/parameter.h"
-#include "managers/event_manager.h"
-#include "managers/so_manager.h"
-#include "managers/inspector_manager.h"
-#include "managers/module_manager.h"
-#include "managers/plugin_manager.h"
 #include "packet_io/trough.h"
-#include "packet_io/sfdaq.h"
-#include "packet_io/intf.h"
 #include "parser/arg_list.h"
 #include "parser/parser.h"
 #include "utils/util.h"
-#include "helpers/markup.h"
 
 //-------------------------------------------------------------------------
 
@@ -95,8 +78,12 @@ static bool set_arg(
     bool ok = true;
 
     if ( p->type == Parameter::PT_IMPLIED )
-        v.set(true);
-
+    {
+        if ( *val )
+            ok = false;
+        else
+            v.set(true);
+    }
     else if ( p->type == Parameter::PT_INT )
     {
         char* end = nullptr;
@@ -144,10 +131,13 @@ static void set(
     p = Parameter::find(p, key);
 
     if ( !p )
-        ParseError("unknown option %s %s\n", key, val);
+        ParseError("unknown option %s %s", key, val);
     
     else if ( !set_arg(m, p, k.c_str(), val, sc) )
-        ParseError("can't set %s %s\n", key, val);
+    {
+        ParseError("can't set %s %s", key, val);
+        ParseError("usage: %s %s", key, p->help);
+    }
 }
 
 //-------------------------------------------------------------------------
@@ -170,6 +160,10 @@ SnortConfig* parse_cmd_line(int argc, char* argv[])
         set(key, val, sc, true);
 
     check_flags(sc);
+
+    if ( int k = get_parse_errors() )
+        FatalError("see prioir %d errors\n", k);
+
     return sc;
 }