diff --git a/lib/utils_base.c b/lib/utils_base.c
index c0bc4dc55de583d8a23fa5a9c585077f2c36116c..4303e1592700bc96cbc752930a157387215f56ad 100644 (file)
--- a/lib/utils_base.c
+++ b/lib/utils_base.c
* License: GPL
* Copyright (c) 2006 Nagios Plugins Development Team
*
-* Last Modified: $Date$
-*
* Library of useful functions for plugins
*
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
-* $Id$
*
*****************************************************************************/
-#include <stdarg.h>
#include "common.h"
+#include <stdarg.h>
#include "utils_base.h"
void
set_range_end(temp_range, end);
}
- if (temp_range->start_infinity == TRUE ||
+ if (temp_range->start_infinity == TRUE ||
temp_range->end_infinity == TRUE ||
temp_range->start <= temp_range->end) {
return temp_range;
@@ -104,7 +101,9 @@ _set_thresholds(thresholds **my_thresholds, char *warn_string, char *critical_st
{
thresholds *temp_thresholds = NULL;
- temp_thresholds = malloc(sizeof(temp_thresholds));
+ if ((temp_thresholds = malloc(sizeof(thresholds))) == NULL)
+ die(STATE_UNKNOWN, _("Cannot allocate memory: %s\n"),
+ strerror(errno));
temp_thresholds->warning = NULL;
temp_thresholds->critical = NULL;
@@ -120,10 +119,6 @@ _set_thresholds(thresholds **my_thresholds, char *warn_string, char *critical_st
}
}
- if (*my_thresholds > 0) { /* Not sure why, but sometimes could be -1 */
- /* printf("Freeing here: %d\n", *my_thresholds); */
- free(*my_thresholds);
- }
*my_thresholds = temp_thresholds;
return 0;
{
int no = FALSE;
int yes = TRUE;
-
+
if (my_range->alert_on == INSIDE) {
no = TRUE;
yes = FALSE;
}
return status;
}
+
+/*
+ * Extract the value from key/value pairs, or return NULL. The value returned
+ * can be free()ed.
+ * This function can be used to parse NTP control packet data and performance
+ * data strings.
+ */
+char *np_extract_value(const char *varlist, const char *name, char sep) {
+ char *tmp=NULL, *value=NULL;
+ int i;
+
+ while (1) {
+ /* Strip any leading space */
+ for (varlist; isspace(varlist[0]); varlist++);
+
+ if (strncmp(name, varlist, strlen(name)) == 0) {
+ varlist += strlen(name);
+ /* strip trailing spaces */
+ for (varlist; isspace(varlist[0]); varlist++);
+
+ if (varlist[0] == '=') {
+ /* We matched the key, go past the = sign */
+ varlist++;
+ /* strip leading spaces */
+ for (varlist; isspace(varlist[0]); varlist++);
+
+ if (tmp = index(varlist, sep)) {
+ /* Value is delimited by a comma */
+ if (tmp-varlist == 0) continue;
+ value = (char *)malloc(tmp-varlist+1);
+ strncpy(value, varlist, tmp-varlist);
+ value[tmp-varlist] = '\0';
+ } else {
+ /* Value is delimited by a \0 */
+ if (strlen(varlist) == 0) continue;
+ value = (char *)malloc(strlen(varlist) + 1);
+ strncpy(value, varlist, strlen(varlist));
+ value[strlen(varlist)] = '\0';
+ }
+ break;
+ }
+ }
+ if (tmp = index(varlist, sep)) {
+ /* More keys, keep going... */
+ varlist = tmp + 1;
+ } else {
+ /* We're done */
+ break;
+ }
+ }
+
+ /* Clean-up trailing spaces/newlines */
+ if (value) for (i=strlen(value)-1; isspace(value[i]); i--) value[i] = '\0';
+
+ return value;
+}
+