X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=plugins%2Futils.c;h=bb380301a639aa899c228725cbe3cf425b7aae42;hb=2563edba02a6babb9ce0328e33eb4c5b49b437ad;hp=128052d01325939e67ba89ebeb5db91d58c27c80;hpb=930c8c9dfc43b9927f587e96b984d168e0fc9bfe;p=nagiosplug.git diff --git a/plugins/utils.c b/plugins/utils.c index 128052d..bb38030 100644 --- a/plugins/utils.c +++ b/plugins/utils.c @@ -11,49 +11,18 @@ * $Date$ ****************************************************************************/ -#include "config.h" +#define LOCAL_TIMEOUT_ALARM_HANDLER + #include "common.h" +#include "utils.h" #include #include #include extern void print_usage (void); -extern int timeout_interval; extern const char *progname; -void support (void); -char *clean_revstring (const char *); -void print_revision (const char *, const char *); -void die (int result, const char *fmt, ...); -void terminate (int result, const char *fmt, ...); -RETSIGTYPE timeout_alarm_handler (int); - -int is_integer (char *); -int is_intpos (char *); -int is_intneg (char *); -int is_intnonneg (char *); -int is_intpercent (char *); - -int is_numeric (char *); -int is_positive (char *); -int is_negative (char *); -int is_nonnegative (char *); -int is_percentage (char *); - -int is_option (char *str); - -double delta_time (struct timeval tv); - -void strip (char *); -char *strscpy (char *dest, const char *src); -char *strscat (char *dest, char *src); -char *strnl (char *str); -char *strpcpy (char *dest, const char *src, const char *str); -char *strpcat (char *dest, const char *src, const char *str); - -char *state_text (int result); - #define STRLEN 64 #define TXTBLK 128 @@ -65,8 +34,6 @@ char *state_text (int result); * Note that numerically the above does not hold ****************************************************************************/ -#define max(a,b) (((a)>(b))?(a):(b)) - int max_state (int a, int b) { @@ -84,14 +51,14 @@ max_state (int a, int b) 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 (); @@ -99,7 +66,7 @@ void usage2(char *msg, char *arg) } void -usage3 (char *msg, char arg) +usage3 (const char *msg, int arg) { printf ("%s: %s - %c\n", progname, msg, arg); print_usage(); @@ -143,7 +110,7 @@ For more information about these matters, see the file named COPYING.\n")); } -char * +const char * state_text (int result) { switch (result) { @@ -162,17 +129,6 @@ state_text (int result) void die (int result, const char *fmt, ...) -{ - va_list ap; - printf ("%s %s: ", sizeof (char) + index(progname, '_'), state_text(result)); - va_start (ap, fmt); - vprintf (fmt, ap); - va_end (ap); - exit (result); -} - -void -terminate (int result, const char *fmt, ...) { va_list ap; va_start (ap, fmt); @@ -330,6 +286,16 @@ delta_time (struct timeval tv) +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) @@ -379,40 +345,6 @@ strscpy (char *dest, const char *src) -/****************************************************************************** - * - * 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, 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 @@ -514,7 +446,7 @@ strpcpy (char *dest, const char *src, const char *str) if (dest == NULL || strlen (dest) < len) dest = realloc (dest, len + 1); if (dest == NULL) - terminate (STATE_UNKNOWN, "failed realloc in strpcpy\n"); + die (STATE_UNKNOWN, "failed realloc in strpcpy\n"); strncpy (dest, src, len); dest[len] = '\0'; @@ -558,10 +490,101 @@ strpcat (char *dest, const char *src, const char *str) dest = realloc (dest, len + l2 + 1); if (dest == NULL) - terminate (STATE_UNKNOWN, "failed malloc in strscat\n"); + die (STATE_UNKNOWN, "failed malloc in strscat\n"); strncpy (dest + len, src, l2); dest[len + l2] = '\0'; 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; +}