summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--plugins/utils.c40
-rw-r--r--plugins/utils.h27
2 files changed, 25 insertions, 42 deletions
diff --git a/plugins/utils.c b/plugins/utils.c
index 128052d..5f770a1 100644
--- a/plugins/utils.c
+++ b/plugins/utils.c
@@ -11,49 +11,19 @@
11 * $Date$ 11 * $Date$
12 ****************************************************************************/ 12 ****************************************************************************/
13 13
14#define LOCAL_TIMEOUT_ALARM_HANDLER
15
14#include "config.h" 16#include "config.h"
15#include "common.h" 17#include "common.h"
18#include "utils.h"
16#include <stdarg.h> 19#include <stdarg.h>
17#include <limits.h> 20#include <limits.h>
18 21
19#include <arpa/inet.h> 22#include <arpa/inet.h>
20 23
21extern void print_usage (void); 24extern void print_usage (void);
22extern int timeout_interval;
23extern const char *progname; 25extern const char *progname;
24 26
25void support (void);
26char *clean_revstring (const char *);
27void print_revision (const char *, const char *);
28void die (int result, const char *fmt, ...);
29void terminate (int result, const char *fmt, ...);
30RETSIGTYPE timeout_alarm_handler (int);
31
32int is_integer (char *);
33int is_intpos (char *);
34int is_intneg (char *);
35int is_intnonneg (char *);
36int is_intpercent (char *);
37
38int is_numeric (char *);
39int is_positive (char *);
40int is_negative (char *);
41int is_nonnegative (char *);
42int is_percentage (char *);
43
44int is_option (char *str);
45
46double delta_time (struct timeval tv);
47
48void strip (char *);
49char *strscpy (char *dest, const char *src);
50char *strscat (char *dest, char *src);
51char *strnl (char *str);
52char *strpcpy (char *dest, const char *src, const char *str);
53char *strpcat (char *dest, const char *src, const char *str);
54
55char *state_text (int result);
56
57#define STRLEN 64 27#define STRLEN 64
58#define TXTBLK 128 28#define TXTBLK 128
59 29
@@ -65,8 +35,6 @@ char *state_text (int result);
65 * Note that numerically the above does not hold 35 * Note that numerically the above does not hold
66 ****************************************************************************/ 36 ****************************************************************************/
67 37
68#define max(a,b) (((a)>(b))?(a):(b))
69
70int 38int
71max_state (int a, int b) 39max_state (int a, int b)
72{ 40{
@@ -398,7 +366,7 @@ strscpy (char *dest, const char *src)
398 *****************************************************************************/ 366 *****************************************************************************/
399 367
400char * 368char *
401strscat (char *dest, char *src) 369strscat (char *dest, const char *src)
402{ 370{
403 371
404 if (dest == NULL) 372 if (dest == NULL)
diff --git a/plugins/utils.h b/plugins/utils.h
index b10f0e5..e581afa 100644
--- a/plugins/utils.h
+++ b/plugins/utils.h
@@ -13,18 +13,23 @@ suite of plugins. */
13 13
14/* Standardize version information, termination */ 14/* Standardize version information, termination */
15 15
16char *my_basename (char *);
17void support (void); 16void support (void);
18char *clean_revstring (const char *revstring); 17char *clean_revstring (const char *revstring);
19void print_revision (const char *, const char *); 18void print_revision (const char *, const char *);
20void die (int result, const char *fmt, ...); 19void die (int result, const char *fmt, ...);
21void terminate (int result, char *msg, ...); 20void terminate (int result, const char *msg, ...);
22extern RETSIGTYPE timeout_alarm_handler (int);
23 21
24/* Handle timeouts */ 22/* Handle timeouts */
25 23
26time_t start_time, end_time; 24#ifdef LOCAL_TIMEOUT_ALARM_HANDLER
25extern int timeout_interval;
26RETSIGTYPE timeout_alarm_handler (int);
27#else
27int timeout_interval = DEFAULT_SOCKET_TIMEOUT; 28int timeout_interval = DEFAULT_SOCKET_TIMEOUT;
29extern RETSIGTYPE timeout_alarm_handler (int);
30#endif
31
32time_t start_time, end_time;
28 33
29/* Test input types */ 34/* Test input types */
30 35
@@ -59,8 +64,8 @@ double delta_time (struct timeval tv);
59/* Handle strings safely */ 64/* Handle strings safely */
60 65
61void strip (char *buffer); 66void strip (char *buffer);
62char *strscpy (char *dest, char *src); 67char *strscpy (char *dest, const char *src);
63char *strscat (char *dest, char *src); 68char *strscat (char *dest, const char *src);
64char *strnl (char *str); 69char *strnl (char *str);
65char *ssprintf (char *str, const char *fmt, ...); /* deprecate for asprintf */ 70char *ssprintf (char *str, const char *fmt, ...); /* deprecate for asprintf */
66char *strpcpy (char *dest, const char *src, const char *str); 71char *strpcpy (char *dest, const char *src, const char *str);
@@ -124,3 +129,13 @@ char *state_text (int result);
124#define UT_TIMEOUT "\ 129#define UT_TIMEOUT "\
125 -t, --timeout=INTEGER\n\ 130 -t, --timeout=INTEGER\n\
126 Seconds before connection times out (default: %d)\n" 131 Seconds before connection times out (default: %d)\n"
132
133#define UT_SUPPORT "\n\
134Send email to nagios-users@lists.sourceforge.net if you have questions\n\
135regarding use of this software. To submit patches or suggest improvements,\n\
136send email to nagiosplug-devel@lists.sourceforge.net\n"
137
138#define UT_NOWARRANTY "\
139The nagios plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\n\
140copies of the plugins under the terms of the GNU General Public License.\n\
141For more information about these matters, see the file named COPYING.\n"