[Nagiosplug-checkins] CVS: nagiosplug/plugins check_disk.c,1.23,1.24

[Ton Voon]

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

Modified Files:
	check_disk.c 
Log Message:
Removed -d option and just check against -p parameter


Index: check_disk.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_disk.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** check_disk.c	25 Jun 2003 13:28:05 -0000	1.23
--- check_disk.c	25 Jun 2003 13:38:22 -0000	1.24
***************
*** 202,209 ****
  	for (me = mount_list; me; me = me->me_next) {
  
! 		if ((dev_select_list &&
! 		     walk_name_list (dev_select_list, me->me_devname)) ||
! 		    (path_select_list &&
! 		     walk_name_list (path_select_list, me->me_mountdir)))
  			get_fs_usage (me->me_mountdir, me->me_devname, &fsp);
  		else if (dev_select_list || path_select_list)
--- 202,208 ----
  	for (me = mount_list; me; me = me->me_next) {
  
! 		if (path_select_list &&
! 		     (walk_name_list (path_select_list, me->me_mountdir) ||
! 		      walk_name_list (path_select_list, me->me_devname) ) )
  			get_fs_usage (me->me_mountdir, me->me_devname, &fsp);
  		else if (dev_select_list || path_select_list)
***************
*** 276,284 ****
  {
  	int c;
!   struct name_list *se;
!   struct name_list **pathtail = &path_select_list;
!   struct name_list **devtail = &dev_select_list;
!   struct name_list **fstail = &fs_exclude_list;
!   struct name_list **dptail = &dp_exclude_list;
  
  	int option_index = 0;
--- 275,283 ----
  {
  	int c;
! 	struct name_list *se;
! 	struct name_list **pathtail = &path_select_list;
! 	struct name_list **devtail = &dev_select_list;
! 	struct name_list **fstail = &fs_exclude_list;
! 	struct name_list **dptail = &dp_exclude_list;
  
  	int option_index = 0;
***************
*** 293,297 ****
  		{"path", required_argument, 0, 'p'},
  		{"partition", required_argument, 0, 'p'},
- 		{"device", required_argument, 0, 'd'},
  		{"exclude_device", required_argument, 0, 'x'},
  		{"exclude-type", required_argument, 0, 'X'},
--- 292,295 ----
***************
*** 319,323 ****
  
  	while (1) {
! 		c = getopt_long (argc, argv, "+?Vqhvet:c:w:u:p:d:x:X:mklM", long_options, &option_index);
  
  		if (c == -1 || c == EOF)
--- 317,321 ----
  
  	while (1) {
! 		c = getopt_long (argc, argv, "+?Vqhvet:c:w:u:p:x:X:mklM", long_options, &option_index);
  
  		if (c == -1 || c == EOF)
***************
*** 402,412 ****
  			*pathtail = se;
  			pathtail = &se->name_next;
- 			break;
- 		case 'd':									/* select partition/device */
- 			se = (struct name_list *) malloc (sizeof (struct name_list));
- 			se->name = strdup (optarg);
- 			se->name_next = NULL;
- 			*devtail = se;
- 			devtail = &se->name_next;
  			break;
   		case 'x':									/* exclude path or partition */
--- 400,403 ----