X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Futils.c;h=aed03c4e49402e2b0dd3c2dc53a4835e791dc0b8;hb=3a9b2491aa376e199ec9c8b2d4c9b5daa6c942aa;hp=9ac5596e419ec3936cd98e79bd12f30e8352220a;hpb=48442b777389cfecb95f07b800d69dbac24130f0;p=nagiosplug.git diff --git a/plugins/utils.c b/plugins/utils.c index 9ac5596..aed03c4 100644 --- a/plugins/utils.c +++ b/plugins/utils.c @@ -11,69 +11,30 @@ * $Date$ ****************************************************************************/ +#define LOCAL_TIMEOUT_ALARM_HANDLER + #include "config.h" #include "common.h" -#include "version.h" +#include "utils.h" #include #include #include -extern int timeout_interval; +extern void print_usage (void); extern const char *progname; -void support (void); -char *clean_revstring (const char *); -void print_revision (const char *, const char *); -void terminate (int, const char *fmt, ...); -RETSIGTYPE timeout_alarm_handler (int); - -int is_host (char *); -int is_addr (char *); -int resolve_host_or_addr (char *, int); -int is_inet_addr (char *); -#ifdef USE_IPV6 -int is_inet6_addr (char *); -#endif -int is_hostname (char *); - -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); - -#define LABELLEN 63 #define STRLEN 64 #define TXTBLK 128 /* ************************************************************************** - /* max_state(STATE_x, STATE_y) + * max_state(STATE_x, STATE_y) * compares STATE_x to STATE_y and returns result based on the following * STATE_UNKNOWN < STATE_OK < STATE_WARNING < STATE_CRITICAL * * Note that numerically the above does not hold ****************************************************************************/ -#define max(a,b) (((a)>(b))?(a):(b)) - int max_state (int a, int b) { @@ -106,7 +67,7 @@ void usage2(char *msg, char *arg) } void -usage3 (char *msg, char arg) +usage3 (char *msg, int arg) { printf ("%s: %s - %c\n", progname, msg, arg); print_usage(); @@ -117,10 +78,10 @@ usage3 (char *msg, char arg) void support (void) { - printf - ("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 (_("\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")); } @@ -141,18 +102,34 @@ print_revision (const char *command_name, const char *revision_string) if (sscanf (revision_string, "$Revision: %[0-9.]", plugin_revision) != 1) strncpy (plugin_revision, "N/A", STRLEN); - printf ("%s (nagios-plugins %s) %s\n", - progname, 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"); - + 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 * +state_text (int result) +{ + switch (result) { + case STATE_OK: + return "OK"; + case STATE_WARNING: + return "WARNING"; + case STATE_CRITICAL: + return "CRITICAL"; + case STATE_DEPENDENT: + return "DEPENDENT"; + default: + return "UNKNOWN"; + } } - void -terminate (int result, const char *fmt, ...) +die (int result, const char *fmt, ...) { va_list ap; va_start (ap, fmt); @@ -171,78 +148,6 @@ timeout_alarm_handler (int signo) } } -int -is_host (char *address) -{ - if (is_addr (address) || is_hostname (address)) - return (TRUE); - - return (FALSE); -} - -int -is_addr (char *address) -{ -#ifdef USE_IPV6 - if (is_inet_addr (address) || is_inet6_addr (address)) -#else - if (is_inet_addr (address)) -#endif - return (TRUE); - - return (FALSE); -} - -int -resolve_host_or_addr (char *address, int family) -{ - struct addrinfo hints; - struct addrinfo *res; - int retval; - - memset (&hints, 0, sizeof (hints)); - hints.ai_family = family; - retval = getaddrinfo (address, NULL, &hints, &res); - - if (retval != 0) - return FALSE; - else { - freeaddrinfo (res); - return TRUE; - } -} - -int -is_inet_addr (char *address) -{ - return resolve_host_or_addr (address, AF_INET); -} - -#ifdef USE_IPV6 -int -is_inet6_addr (char *address) -{ - return resolve_host_or_addr (address, AF_INET6); -} -#endif - -/* from RFC-1035 - * - * The labels must follow the rules for ARPANET host names. They must - * start with a letter, end with a letter or digit, and have as interior - * characters only letters, digits, and hyphen. There are also some - * restrictions on the length. Labels must be 63 characters or less. */ - -int -is_hostname (char *s1) -{ -#ifdef USE_IPV6 - return resolve_host_or_addr (s1, AF_UNSPEC); -#else - return resolve_host_or_addr (s1, AF_INET); -#endif -} - int is_numeric (char *number) { @@ -431,40 +336,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 @@ -566,7 +437,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'; @@ -610,7 +481,7 @@ 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';