X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=plugins%2Futils.c;h=b9a19d3fe0c2f8f39d0fd1f5c9bfbd30c1279448;hb=187f86275426bfb501c7180c48161e1e22af1ef7;hp=5f770a1f5a508c339238f45209bc829a36452131;hpb=3c48edf660facd4bd93181333b48960afd83934b;p=nagiosplug.git diff --git a/plugins/utils.c b/plugins/utils.c index 5f770a1..b9a19d3 100644 --- a/plugins/utils.c +++ b/plugins/utils.c @@ -13,7 +13,6 @@ #define LOCAL_TIMEOUT_ALARM_HANDLER -#include "config.h" #include "common.h" #include "utils.h" #include @@ -52,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\n", 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 (); @@ -67,24 +66,21 @@ 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(); 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) { @@ -104,14 +100,9 @@ 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")); - } -char * +const char * state_text (int result) { switch (result) { @@ -130,17 +121,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); @@ -153,7 +133,7 @@ void timeout_alarm_handler (int signo) { if (signo == SIGALRM) { - printf ("CRITICAL - Plugin timed out after %d seconds\n", + printf (_("CRITICAL - Plugin timed out after %d seconds\n"), timeout_interval); exit (STATE_CRITICAL); } @@ -298,6 +278,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) @@ -317,9 +307,6 @@ strip (char *buffer) } - - - /****************************************************************************** * * Copies one string to another. Any previously existing data in @@ -345,42 +332,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, 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 @@ -450,9 +401,6 @@ strnl (char *str) } - - - /****************************************************************************** * * Like strscpy, except only the portion of the source string up to @@ -482,7 +430,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'; @@ -492,8 +440,6 @@ strpcpy (char *dest, const char *src, const char *str) - - /****************************************************************************** * * Like strscat, except only the portion of the source string up to @@ -526,10 +472,99 @@ 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; +}