Added support for --extra-opts in all C plugins (disabled by default, see configure --help)

git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1991 f882894a-f735-0410-b71e-b25c423dba1c

2 files changed, 18 insertions, 1 deletions

diff --git a/plugins-root/check_dhcp.c b/plugins-root/check_dhcp.c
index 9b62b3e2..241f13ed 100644
--- a/plugins-root/check_dhcp.c
+++ b/plugins-root/check_dhcp.c
@@ -268,6 +268,9 @@ int main(int argc, char **argv){
         bindtextdomain (PACKAGE, LOCALEDIR);
         textdomain (PACKAGE);
 
+        /* Parse extra opts if any */
+        argv=np_extra_opts(&argc, argv, progname);
+
         if(process_arguments(argc,argv)!=OK){
                 usage4 (_("Could not parse arguments"));
                 }
@@ -1395,6 +1398,7 @@ void print_help(void){
         print_usage();
 
         printf (_(UT_HELP_VRSN));
+        printf (_(UT_EXTRA_OPTS));
 
         printf (_(UT_VERBOSE));
 
@@ -1411,6 +1415,12 @@ void print_help(void){
   printf (" %s\n", "-u, --unicast");
   printf ("    %s\n", _("Unicast testing: mimic a DHCP relay, requires -s"));
 
+#ifdef NP_EXTRA_OPTS
+  printf ("\n");
+  printf ("%s\n", _("Notes:"));
+  printf (_(UT_EXTRA_OPTS_NOTES));
+#endif
+
   printf (_(UT_SUPPORT));
         return;
         }
diff --git a/plugins-root/check_icmp.c b/plugins-root/check_icmp.c
index a059f266..f3e5f0d3 100644
--- a/plugins-root/check_icmp.c
+++ b/plugins-root/check_icmp.c
@@ -447,6 +447,9 @@ main(int argc, char **argv)
                 packets = 5;
         }
 
+        /* Parse extra opts if any */
+        argv=np_extra_opts(&argc, argv, progname);
+
         /* parse the arguments */
         for(i = 1; i < argc; i++) {
                 while((arg = getopt(argc, argv, "vhVw:c:n:p:t:H:s:i:b:I:l:m:")) != EOF) {
@@ -1262,6 +1265,7 @@ print_help(void)
   print_usage ();
 
   printf (_(UT_HELP_VRSN));
+  printf (_(UT_EXTRA_OPTS));
 
   printf (" %s\n", "-H");
   printf ("    %s\n", _("specify a target"));
@@ -1310,10 +1314,13 @@ print_help(void)
   printf ("%s\n\n", _("NOTE: Some systems decrease TTL when forming ICMP_ECHOREPLY, others do not."));*/
   printf ("\n");
   printf (" %s\n", _("The -v switch can be specified several times for increased verbosity."));
-
 /*  printf ("%s\n", _("Long options are currently unsupported."));
   printf ("%s\n", _("Options marked with * require an argument"));
 */
+#ifdef NP_EXTRA_OPTS
+  printf ("\n");
+  printf (_(UT_EXTRA_OPTS_NOTES));
+#endif
 
   printf (_(UT_SUPPORT));
 }