[Nagiosplug-checkins] SF.net SVN: nagiosplug:[2078] nagiosplug/trunk

[dermoth at users.sourceforge.net]

Revision: 2078
          http://nagiosplug.svn.sourceforge.net/nagiosplug/?rev=2078&view=rev
Author:   dermoth
Date:     2008-11-08 16:33:15 +0000 (Sat, 08 Nov 2008)

Log Message:
-----------
Fix long options parsing in check_disk, check_dns, check_mrtg and check_mrtgtraf (check_tcp was done in an earlier commit)

Modified Paths:
--------------
    nagiosplug/trunk/NEWS
    nagiosplug/trunk/plugins/check_disk.c
    nagiosplug/trunk/plugins/check_dns.c
    nagiosplug/trunk/plugins/check_ide_smart.c
    nagiosplug/trunk/plugins/check_mrtg.c
    nagiosplug/trunk/plugins/check_mrtgtraf.c
    nagiosplug/trunk/plugins/check_mysql_query.c
    nagiosplug/trunk/plugins/check_nt.c

Modified: nagiosplug/trunk/NEWS
===================================================================
--- nagiosplug/trunk/NEWS	2008-11-08 08:38:46 UTC (rev 2077)
+++ nagiosplug/trunk/NEWS	2008-11-08 16:33:15 UTC (rev 2078)
@@ -11,7 +11,7 @@
 	Extra-opts (C plugins) does not allow trailing comments anymore (like N::P)
 	Fixed dependency issue on libtap when ./configure --enable-libtap used. Warning: will install libtap
 	Fixed segfault in extra-opts under some circumstance when reading multiple sections
-	Fix long options parsing in check_tcp
+	Fix long options parsing in check_disk, check_dns, check_mrtg, check_mrtgtraf and check_tcp.
 	check_icmp now reports min and max round trip time perfdata (Steve Rader)
 	Fixed bug where additional headers with redirection caused a segfault (Dieter Van de Walle - 2089159)
 

Modified: nagiosplug/trunk/plugins/check_disk.c
===================================================================
--- nagiosplug/trunk/plugins/check_disk.c	2008-11-08 08:38:46 UTC (rev 2077)
+++ nagiosplug/trunk/plugins/check_disk.c	2008-11-08 16:33:15 UTC (rev 2078)
@@ -477,8 +477,8 @@
     {"iwarning", required_argument, 0, 'W'},
     /* Dang, -C is taken. We might want to reshuffle this. */
     {"icritical", required_argument, 0, 'K'},
-    {"kilobytes", required_argument, 0, 'k'},
-    {"megabytes", required_argument, 0, 'm'},
+    {"kilobytes", no_argument, 0, 'k'},
+    {"megabytes", no_argument, 0, 'm'},
     {"units", required_argument, 0, 'u'},
     {"path", required_argument, 0, 'p'},
     {"partition", required_argument, 0, 'p'},

Modified: nagiosplug/trunk/plugins/check_dns.c
===================================================================
--- nagiosplug/trunk/plugins/check_dns.c	2008-11-08 08:38:46 UTC (rev 2077)
+++ nagiosplug/trunk/plugins/check_dns.c	2008-11-08 16:33:15 UTC (rev 2078)
@@ -340,8 +340,8 @@
     {"reverse-server", required_argument, 0, 'r'},
     {"expected-address", required_argument, 0, 'a'},
     {"expect-authority", no_argument, 0, 'A'},
-    {"warning", no_argument, 0, 'w'},
-    {"critical", no_argument, 0, 'c'},
+    {"warning", required_argument, 0, 'w'},
+    {"critical", required_argument, 0, 'c'},
     {0, 0, 0, 0}
   };
 

Modified: nagiosplug/trunk/plugins/check_ide_smart.c
===================================================================
--- nagiosplug/trunk/plugins/check_ide_smart.c	2008-11-08 08:38:46 UTC (rev 2077)
+++ nagiosplug/trunk/plugins/check_ide_smart.c	2008-11-08 16:33:15 UTC (rev 2078)
@@ -173,7 +173,8 @@
 		{"auto-off", no_argument, 0, '0'}, 
 		{"nagios", no_argument, 0, 'n'}, 
 		{"help", no_argument, 0, 'h'}, 
-		{"version", no_argument, 0, 'V'}, {0, 0, 0, 0} 
+		{"version", no_argument, 0, 'V'},
+		{0, 0, 0, 0}
 	};
 
 	setlocale (LC_ALL, "");

Modified: nagiosplug/trunk/plugins/check_mrtg.c
===================================================================
--- nagiosplug/trunk/plugins/check_mrtg.c	2008-11-08 08:38:46 UTC (rev 2077)
+++ nagiosplug/trunk/plugins/check_mrtg.c	2008-11-08 16:33:15 UTC (rev 2078)
@@ -181,7 +181,7 @@
 		{"warning", required_argument, 0, 'w'},
 		{"label", required_argument, 0, 'l'},
 		{"units", required_argument, 0, 'u'},
-		{"verbose", no_argument, 0, 'v'},
+		{"variable", required_argument, 0, 'v'},
 		{"version", no_argument, 0, 'V'},
 		{"help", no_argument, 0, 'h'},
 		{0, 0, 0, 0}
@@ -334,7 +334,7 @@
 
 	printf (" %s\n", "-F, --logfile=FILE");
   printf ("   %s\n", _("The MRTG log file containing the data you want to monitor"));
-  printf ("-e, --expires=MINUTES");
+  printf (" %s\n", "-e, --expires=MINUTES");
   printf ("   %s\n", _("Minutes before MRTG data is considered to be too old"));
   printf (" %s\n", "-a, --aggregation=AVG|MAX");
   printf ("   %s\n", _("Should we check average or maximum values?"));

Modified: nagiosplug/trunk/plugins/check_mrtgtraf.c
===================================================================
--- nagiosplug/trunk/plugins/check_mrtgtraf.c	2008-11-08 08:38:46 UTC (rev 2077)
+++ nagiosplug/trunk/plugins/check_mrtgtraf.c	2008-11-08 16:33:15 UTC (rev 2078)
@@ -223,13 +223,11 @@
 
 	int option = 0;
 	static struct option longopts[] = {
-		{"logfile", required_argument, 0, 'F'},
+		{"filename", required_argument, 0, 'F'},
 		{"expires", required_argument, 0, 'e'},
 		{"aggregation", required_argument, 0, 'a'},
-		{"variable", required_argument, 0, 'v'},
 		{"critical", required_argument, 0, 'c'},
 		{"warning", required_argument, 0, 'w'},
-		{"verbose", no_argument, 0, 'v'},
 		{"version", no_argument, 0, 'V'},
 		{"help", no_argument, 0, 'h'},
 		{0, 0, 0, 0}
@@ -385,6 +383,6 @@
 print_usage (void)
 {
 	printf (_("Usage"));
-  printf (" %s -F <log_file> -a <AVG | MAX> -v <variable> -w <warning_pair>",progname);
-  printf ("-c <critical_pair> [-e expire_minutes] [-t timeout] [-v]\n");
+  printf (" %s -F <log_file> -a <AVG | MAX> -w <warning_pair>\n",progname);
+  printf ("-c <critical_pair> [-e expire_minutes]\n");
 }

Modified: nagiosplug/trunk/plugins/check_mysql_query.c
===================================================================
--- nagiosplug/trunk/plugins/check_mysql_query.c	2008-11-08 08:38:46 UTC (rev 2077)
+++ nagiosplug/trunk/plugins/check_mysql_query.c	2008-11-08 16:33:15 UTC (rev 2078)
@@ -192,7 +192,7 @@
 		return ERROR;
 
 	while (1) {
-		c = getopt_long (argc, argv, "hvVSP:p:u:d:H:s:q:w:c:", longopts, &option);
+		c = getopt_long (argc, argv, "hvVP:p:u:d:H:s:q:w:c:", longopts, &option);
 
 		if (c == -1 || c == EOF)
 			break;

Modified: nagiosplug/trunk/plugins/check_nt.c
===================================================================
--- nagiosplug/trunk/plugins/check_nt.c	2008-11-08 08:38:46 UTC (rev 2077)
+++ nagiosplug/trunk/plugins/check_nt.c	2008-11-08 16:33:15 UTC (rev 2078)
@@ -745,6 +745,6 @@
 void print_usage(void)
 {
   printf (_("Usage:"));
-	printf ("%s -H host -v variable [-p port] [-w warning] [-c critical]",progname);
+	printf ("%s -H host -v variable [-p port] [-w warning] [-c critical]\n",progname);
   printf ("[-l params] [-d SHOWALL] [-t timeout]\n");
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.