Added check for "%" in COUNTER <description>. If it exists, <description> is used...

[nagiosplug.git] / plugins / utils.c

diff --git a/plugins/utils.c b/plugins/utils.c
index 5c809ece48fc2832061f45fb6f2c3478c4feeafc..b2948e65688d2050c2ca32f2ab18d569cf104bae 100644 (file)
--- a/plugins/utils.c
+++ b/plugins/utils.c
@@ -73,17 +73,14 @@ usage3 (const char *msg, int arg)
        exit (STATE_UNKNOWN);
 }
 
-
 void
-support (void)
+usage4 (const char *msg)
 {
-       printf (_("\n\
-Send email to nagios-users@lists.sourceforge.net if you have questions\n\
-regarding use of this software. To submit patches or suggest improvements,\n\
-send email to nagiosplug-devel@lists.sourceforge.net\n"));
+       printf ("%s: %s\n", progname, msg);
+       print_usage();
+       exit (STATE_UNKNOWN);
 }
 
-
 char *
 clean_revstring (const char *revstring)
 {
@@ -103,11 +100,6 @@ print_revision (const char *command_name, const char *revision_string)
                strncpy (plugin_revision, "N/A", STRLEN);
        printf ("%s (%s %s) %s\n",
                                        command_name, PACKAGE, VERSION, plugin_revision);
-       printf (_("\
-The nagios plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\n\
-copies of the plugins under the terms of the GNU General Public License.\n\
-For more information about these matters, see the file named COPYING.\n"));
-
 }
 
 const char *
@@ -315,9 +307,6 @@ strip (char *buffer)
 }
 
 
-
-
-
 /******************************************************************************
  *
  * Copies one string to another. Any previously existing data in
@@ -343,8 +332,6 @@ strscpy (char *dest, const char *src)
 
 
 
-
-
 /******************************************************************************
  *
  * Returns a pointer to the next line of a multiline string buffer
@@ -414,9 +401,6 @@ strnl (char *str)
 }
 
 
-
-
-
 /******************************************************************************
  *
  * Like strscpy, except only the portion of the source string up to
@@ -456,8 +440,6 @@ strpcpy (char *dest, const char *src, const char *str)
 
 
 
-
-
 /******************************************************************************
  *
  * Like strscat, except only the portion of the source string up to
@@ -497,3 +479,92 @@ strpcat (char *dest, const char *src, const char *str)
 
        return dest;
 }
+
+
+/******************************************************************************
+ *
+ * Print perfdata in a standard format
+ *
+ ******************************************************************************/
+
+char *perfdata (const char *label,
+ long int val,
+ const char *uom,
+ int warnp,
+ long int warn,
+ int critp,
+ long int crit,
+ int minp,
+ long int minv,
+ int maxp,
+ long int maxv)
+{
+       char *data = NULL;
+
+       if (strpbrk (label, "'= "))
+               asprintf (&data, "'%s'=%ld%s;", label, val, uom);
+       else
+               asprintf (&data, "%s=%ld%s;", label, val, uom);
+
+       if (warnp)
+               asprintf (&data, "%s%ld;", data, warn);
+       else
+               asprintf (&data, "%s;", data);
+
+       if (critp)
+               asprintf (&data, "%s%ld;", data, crit);
+       else
+               asprintf (&data, "%s;", data);
+
+       if (minp)
+               asprintf (&data, "%s%ld", data, minv);
+
+       if (maxp)
+               asprintf (&data, "%s;%ld", data, maxv);
+
+       return data;
+}
+
+
+char *fperfdata (const char *label,
+ double val,
+ const char *uom,
+ int warnp,
+ double warn,
+ int critp,
+ double crit,
+ int minp,
+ double minv,
+ int maxp,
+ double maxv)
+{
+       char *data = NULL;
+
+       if (strpbrk (label, "'= "))
+               asprintf (&data, "'%s'=", label);
+       else
+               asprintf (&data, "%s=", label);
+
+       asprintf (&data, "%s%f", data, val);
+       asprintf (&data, "%s%s;", data, uom);
+
+       if (warnp)
+               asprintf (&data, "%s%f", data, warn);
+
+       asprintf (&data, "%s;", data);
+
+       if (critp)
+               asprintf (&data, "%s%f", data, crit);
+
+       asprintf (&data, "%s;", data);
+
+       if (minp)
+               asprintf (&data, "%s%f", data, minv);
+
+       if (maxp) {
+               asprintf (&data, "%s;", data);
+               asprintf (&data, "%s%f", data, maxv);
+       }
+
+       return data;
+}