Changeset 599

Timestamp:

01/02/2011 02:13:52 PM (2 years ago)

Author:

sullo

Message:

Move all option->function calls directly to GetOpt? calling

File:

• trunk/plugins/nikto_core.plugin (modified) (4 diffs)

trunk/plugins/nikto_core.plugin

@@ -488 +488 @@
 
     GetOptions("nolookup"         => \$CLI{'skiplookup'},
+               "ask=s"            => \$CLI{'ask'},
                "config=s"         => \$CLI{'config'},
-               "update"           => \&check_updates,
-               "dbcheck"          => \&check_dbs,
                "Cgidirs=s"        => \$CLI{'forcecgi'},
                "mutate=s"         => \$CLI{'mutate'},
@@ -507 +506 @@
                "no404"            => \$CLI{'nofof'},
                "useproxy:s"       => \$CLI{'useproxy'},
-               "Help"             => \$CLI{'help'},
                "vhost=s"          => \$CLI{'vhost'},
                "host=s"           => \$CLI{'host'},
@@ -513 +511 @@
                "Format=s"         => \$CLI{'format'},
                "Display=s"        => \$CLI{'display'},
-               "Single"           => \$CLI{'Single'},
                "Tuning=s"         => \$CLI{'tuning'},
-               "Version"          => \$CLI{'version'},
                "Plugins=s"        => \$CLI{'plugins'},
-               "list-plugins"     => \$CLI{'list-plugins'},
-               "ask=s"            => \$CLI{'ask'}
-               ) or usage(0);
-
-    if    ($CLI{'help'})         { usage(2); }
-    elsif ($CLI{'version'})      { version(); }
-    elsif ($CLI{'Single'})       { single(); }
-    elsif ($CLI{'list-plugins'}) { list_plugins(); }
+               "Help"             => \&usage,
+               "Single"           => \&single,
+               "list-plugins"     => \&list_plugins,
+               "Version"          => \&version,
+               "update"           => \&check_updates,
+               "dbcheck"          => \&check_dbs,
+               ) or usage();
 
     # CLI proxy overrides nikto.conf
@@ -2408 +2403 @@
 #######################################################################
 sub usage {
-    if ($_[0] eq 2) {
+    if ($_[0] eq "Help") {
         print "
    Options: