![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/plugins/utils.c b/plugins/utils.c
index aaa9fe5ab7c74bdb4f9b703b4a892097b3e46e24..5f770a1f5a508c339238f45209bc829a36452131 100644 (file)
--- a/plugins/utils.c
+++ b/plugins/utils.c
* $Date$
****************************************************************************/
+#define LOCAL_TIMEOUT_ALARM_HANDLER
+
#include "config.h"
#include "common.h"
-#include "version.h"
+#include "utils.h"
#include <stdarg.h>
#include <limits.h>
-extern int timeout_interval;
-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_dotted_quad (char *);
-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);
+#include <arpa/inet.h>
-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);
+extern void print_usage (void);
+extern const char *progname;
-#define LABELLEN 63
#define STRLEN 64
#define TXTBLK 128
* Note that numerically the above does not hold
****************************************************************************/
-#define max(a,b) (((a)>(b))?(a):(b))
-
int
max_state (int a, int b)
{
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"));
}
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"));
}
+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
+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, ...)
}
}
-int
-is_host (char *address)
-{
- if (is_dotted_quad (address) || is_hostname (address))
- return (TRUE);
- return (FALSE);
-}
-
-int
-is_dotted_quad (char *address)
-{
- int o1, o2, o3, o4;
- char c[1];
-
- if (!address)
- return FALSE;
-
- if (sscanf (address, "%d.%d.%d.%d%c", &o1, &o2, &o3, &o4, c) != 4)
- return FALSE;
- else if (o1 > 255 || o2 > 255 || o3 > 255 || o4 > 255)
- return FALSE;
- else if (o1 < 0 || o2 < 0 || o3 < 0 || o4 < 0)
- return FALSE;
- else
- return TRUE;
-}
-
-/* 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)
-{
- if (!s1 || strlen (s1) > 63) {
- return FALSE;
- }
- if (strcspn (s1, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUWVXYZ0123456789-.") != 0) {
- return FALSE;
- }
- if (strspn (s1, "0123456789-.") == 1) {
- return FALSE;
- }
- while ((s1 = index (s1, '.'))) {
- s1++;
- if (strspn (s1, "0123456789-.") == 1) {
- return FALSE;
- }
- }
- return TRUE;
-}
-
int
is_numeric (char *number)
{
*****************************************************************************/
char *
-strscat (char *dest, char *src)
+strscat (char *dest, const char *src)
{
if (dest == NULL)