[Nagiosplug-checkins] CVS: nagiosplug/plugins check_disk.c,1.25,1.26

[Ton Voon]

Update of /cvsroot/nagiosplug/nagiosplug/plugins
In directory sc8-pr-cvs1:/tmp/cvs-serv14377

Modified Files:
	check_disk.c 
Log Message:
Fixed different thresholds if using exclude lists


Index: check_disk.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_disk.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** check_disk.c	25 Jun 2003 15:43:31 -0000	1.25
--- check_disk.c	26 Jun 2003 23:33:49 -0000	1.26
***************
*** 243,247 ****
  			total_space = (float)fsp.fsu_blocks*fsp.fsu_blocksize/mult;
  			if (disk_result!=STATE_OK || verbose>=0)
! 				asprintf (&output, "%s [%.0f %s (%2.0f%%) free on %s]",
  				          output,
  				          free_space,
--- 243,247 ----
  			total_space = (float)fsp.fsu_blocks*fsp.fsu_blocksize/mult;
  			if (disk_result!=STATE_OK || verbose>=0)
! 				asprintf (&output, "%s [%.0f %s (%.0f%%) free on %s]",
  				          output,
  				          free_space,
***************
*** 249,253 ****
  				          free_space_pct,
  				          (!strcmp(file_system, "none") || display_mntp) ? me->me_devname : me->me_mountdir);
! 			asprintf (&details, "%s\n%.0f of %.0f %s (%2.0f%%) free on %s (type %s mounted on %s) warn:%d crit:%d warn%%:%.0f%% crit%%:%.0f%%",
  			          details,
  			          free_space,
--- 249,253 ----
  				          free_space_pct,
  				          (!strcmp(file_system, "none") || display_mntp) ? me->me_devname : me->me_mountdir);
! 			asprintf (&details, "%s\n%.0f of %.0f %s (%.0f%%) free on %s (type %s mounted on %s) warn:%d crit:%d warn%%:%.0f%% crit%%:%.0f%%",
  			          details,
  			          free_space,
***************
*** 554,561 ****
  		if (! strcmp(list->name, name)) {
  			list->found = 1;
! 			w_df = list->w_df;
! 			c_df = list->c_df;
! 			w_dfp = list->w_dfp;
! 			c_dfp = list->c_dfp;
  			return TRUE;
  		}
--- 554,562 ----
  		if (! strcmp(list->name, name)) {
  			list->found = 1;
! 			/* if required for name_lists that have not saved w_df, etc (eg exclude lists) */
! 			if (list->w_df) w_df = list->w_df;
! 			if (list->c_df) c_df = list->c_df;
! 			if (list->w_dfp) w_dfp = list->w_dfp;
! 			if (list->c_dfp) c_dfp = list->c_dfp;
  			return TRUE;
  		}