![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/plugins/utils.c b/plugins/utils.c
index d0999c5840c8baaebae33d1203186e64494a3af4..aed03c4e49402e2b0dd3c2dc53a4835e791dc0b8 100644 (file)
--- a/plugins/utils.c
+++ b/plugins/utils.c
* $Date$
****************************************************************************/
+#define LOCAL_TIMEOUT_ALARM_HANDLER
+
#include "config.h"
#include "common.h"
+#include "utils.h"
#include <stdarg.h>
#include <limits.h>
#include <arpa/inet.h>
-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 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
/* **************************************************************************
- /* 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)
{
}
void
-usage3 (char *msg, char arg)
+usage3 (char *msg, int arg)
{
printf ("%s: %s - %c\n", progname, msg, arg);
print_usage();
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 *
+const char *
state_text (int result)
{
switch (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);
-/******************************************************************************
- *
- * 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
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';
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';