X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=lib%2Futils_disk.c;h=5be2b2c07bd498e991b8f6519d7348bb31d8f7a9;hb=1a5a83bb82c35d888229fe9f815fbc663c0f4d3c;hp=74708c0e3a2807200c2c4c0829dc981b166396fe;hpb=958162b45fb77dcacb302e6c65cc5fb45df47692;p=nagiosplug.git diff --git a/lib/utils_disk.c b/lib/utils_disk.c index 74708c0..5be2b2c 100644 --- a/lib/utils_disk.c +++ b/lib/utils_disk.c @@ -1,32 +1,28 @@ -/**************************************************************************** -* Utils for check_disk -* +/***************************************************************************** +* +* Library for check_disk +* * License: GPL -* Copyright (c) 1999-2006 nagios-plugins team -* -* Last Modified: $Date$ -* +* Copyright (c) 1999-2007 Nagios Plugins Development Team +* * Description: -* +* * This file contains utilities for check_disk. These are tested by libtap -* -* License Information: -* -* This program is free software; you can redistribute it and/or modify +* +* +* This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or +* the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -* -* $Id$ +* along with this program. If not, see . +* * *****************************************************************************/ @@ -61,6 +57,20 @@ np_add_parameter(struct parameter_list **list, const char *name) new_path->usedspace_percent = NULL; new_path->usedinodes_percent = NULL; new_path->freeinodes_percent = NULL; + new_path->group = NULL; + new_path->dfree_pct = -1; + new_path->dused_pct = -1; + new_path->total = 0; + new_path->available = 0; + new_path->available_to_root = 0; + new_path->used = 0; + new_path->dused_units = 0; + new_path->dfree_units = 0; + new_path->dtotal_units = 0; + new_path->inodes_total = 0; + new_path->inodes_free = 0; + new_path->dused_inodes_percent = 0; + new_path->dfree_inodes_percent = 0; if (current == NULL) { *list = new_path; @@ -73,39 +83,74 @@ np_add_parameter(struct parameter_list **list, const char *name) return new_path; } +/* Delete a given parameter from list and return pointer to next element*/ +struct parameter_list * +np_del_parameter(struct parameter_list *item, struct parameter_list *prev) +{ + struct parameter_list *next; + + if (item->name_next) + next = item->name_next; + else + next = NULL; + + free(item); + if (prev) + prev->name_next = next; + + return next; +} + + +/* returns a pointer to the struct found in the list */ +struct parameter_list * +np_find_parameter(struct parameter_list *list, const char *name) +{ + struct parameter_list *temp_list; + for (temp_list = list; temp_list; temp_list = temp_list->name_next) { + if (! strcmp(temp_list->name, name)) + return temp_list; + } + + return NULL; +} + void np_set_best_match(struct parameter_list *desired, struct mount_entry *mount_list, int exact) { struct parameter_list *d; for (d = desired; d; d= d->name_next) { - struct mount_entry *me; - size_t name_len = strlen(d->name); - size_t best_match_len = 0; - struct mount_entry *best_match = NULL; - - for (me = mount_list; me; me = me->me_next) { - size_t len = strlen (me->me_mountdir); - if ((exact == FALSE && (best_match_len <= len && len <= name_len && - (len == 1 || strncmp (me->me_mountdir, d->name, len) == 0))) - || (exact == TRUE && strcmp(me->me_mountdir, d->name)==0)) - { - best_match = me; - best_match_len = len; - } else { - len = strlen (me->me_devname); - if ((exact == FALSE && (best_match_len <= len && len <= name_len && - (len == 1 || strncmp (me->me_devname, d->name, len) == 0))) - || (exact == TRUE && strcmp(me->me_devname, d->name)==0)) - { + if (! d->best_match) { + struct mount_entry *me; + size_t name_len = strlen(d->name); + size_t best_match_len = 0; + struct mount_entry *best_match = NULL; + + /* set best match if path name exactly matches a mounted device name */ + for (me = mount_list; me; me = me->me_next) { + if (strcmp(me->me_devname, d->name)==0) best_match = me; - best_match_len = len; + } + + /* set best match by directory name if no match was found by devname */ + if (! best_match) { + for (me = mount_list; me; me = me->me_next) { + size_t len = strlen (me->me_mountdir); + if ((exact == FALSE && (best_match_len <= len && len <= name_len && + (len == 1 || strncmp (me->me_mountdir, d->name, len) == 0))) + || (exact == TRUE && strcmp(me->me_mountdir, d->name)==0)) + { + best_match = me; + best_match_len = len; + } } } - } - if (best_match) { - d->best_match = best_match; - } else { - d->best_match = NULL; /* Not sure why this is needed as it should be null on initialisation */ + + if (best_match) { + d->best_match = best_match; + } else { + d->best_match = NULL; /* Not sure why this is needed as it should be null on initialisation */ + } } } } @@ -139,3 +184,14 @@ np_seen_name(struct name_list *list, const char *name) return FALSE; } +int +np_regex_match_mount_entry (struct mount_entry* me, regex_t* re) +{ + if (regexec(re, me->me_devname, (size_t) 0, NULL, 0) == 0 || + regexec(re, me->me_mountdir, (size_t) 0, NULL, 0) == 0 ) { + return TRUE; + } else { + return FALSE; + } +} +