[Nagiosplug-checkins] nagiosplug/plugins check_nt.c,1.36,1.37

[Harper Mann]

Update of /cvsroot/nagiosplug/nagiosplug/plugins
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1826

Modified Files:
	check_nt.c 
Log Message:
Added check for "%" in COUNTER <description>.  If it exists, <description> is used as an arg to asprintf.  If it doesn't exist, <description> is used as a label.  If the formatting is wrong, the program will segv.


Index: check_nt.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_nt.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- check_nt.c	5 Dec 2004 12:59:54 -0000	1.36
+++ check_nt.c	22 Dec 2004 23:02:10 -0000	1.37
@@ -356,7 +356,12 @@
 	    		{
 	      			/* Let's format the output string, finally... */
 
-	      			asprintf (&output_message, "%s = %.2f %s", description, counter_value, counter_unit);
+					if (strstr(description, "%") == NULL) {
+						asprintf (&output_message, "%s = %.2f %s", description, counter_value, counter_unit);
+					} else {
+						/* has formatting, will segv if wrong */
+	      				asprintf (&output_message, description, counter_value);
+					}
 	      			output_message = strcat (output_message, "|");
 	      			output_message = strcat (output_message,
 							fperfdata (description, counter_value, counter_unit,
@@ -672,7 +677,8 @@
      Request a -l parameters with the following syntax:\n\
 		 -l \"\\\\<performance object>\\\\counter\",\"<description>\n\
      The <description> parameter is optional and \n\
-     is given to a printf output command which require a float parameters.\n\
+     is given to a printf output command which requires a float parameter.\n\
+     If <description> does not include \"%%\", it is used as a label.\n\
      Some examples:\n\
        \"Paging file usage is %%.2f %%%%\"\n\
        \"%%.f %%%% paging file used.\"\n"));