![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/plugins/utils.c b/plugins/utils.c
index 959541bf53f382939e677b29fa450e8feeda1a29..b2948e65688d2050c2ca32f2ab18d569cf104bae 100644 (file)
--- a/plugins/utils.c
+++ b/plugins/utils.c
#define LOCAL_TIMEOUT_ALARM_HANDLER
-#include "config.h"
#include "common.h"
#include "utils.h"
#include <stdarg.h>
return max (a, b);
}
-void usage (char *msg)
+void usage (const char *msg)
{
- printf (msg);
+ printf ("%s", msg);
print_usage ();
exit (STATE_UNKNOWN);
}
-void usage2(char *msg, char *arg)
+void usage2(const char *msg, const char *arg)
{
printf ("%s: %s - %s\n",progname,msg,arg);
print_usage ();
}
void
-usage3 (char *msg, char arg)
+usage3 (const char *msg, int arg)
{
printf ("%s: %s - %c\n", progname, msg, arg);
print_usage();
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)
{
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"));
-
}
-char *
+const char *
state_text (int result)
{
switch (result) {
+long
+deltime (struct timeval tv)
+{
+ struct timeval now;
+ gettimeofday (&now, NULL);
+ return (now.tv_sec - tv.tv_sec)*1000000 + now.tv_usec - tv.tv_usec;
+}
+
+
+
void
strip (char *buffer)
}
-
-
-
/******************************************************************************
*
* Copies one string to another. Any previously existing data in
-
-
-/******************************************************************************
- *
- * Concatenates one string to the end of another
- *
- * Given a pointer destination string, which may or may not already
- * hold some text, and a source string with additional text (possibly
- * NULL or empty), returns a pointer to a string that is the first
- * string with the second concatenated to it. Uses realloc to free
- * memory held by the dest argument if new storage space is required.
- *
- * Example:
- *
- * char *str=NULL;
- * str = strscpy("This is a line of text with no trailing newline");
- * str = strscat(str,"\n");
- *
- *****************************************************************************/
-
-char *
-strscat (char *dest, const char *src)
-{
-
- if (dest == NULL)
- return src;
- if (src != NULL)
- asprintf (&dest, "%s%s", dest, src);
-
- return dest;
-}
-
-
-
-
-
/******************************************************************************
*
* Returns a pointer to the next line of a multiline string buffer
}
-
-
-
/******************************************************************************
*
* Like strscpy, except only the portion of the source string up to
-
-
/******************************************************************************
*
* Like strscat, except only the portion of the source string up to
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;
+}