[Nagiosplug-checkins] CVS: nagiosplug/plugins check_vsz.c,1.2,1.3

[Karl DeBisschop]

Update of /cvsroot/nagiosplug/nagiosplug/plugins
In directory usw-pr-cvs1:/tmp/cvs-serv29914/plugins

Modified Files:
	check_vsz.c 
Log Message:
remove call_getopt

Index: check_vsz.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_vsz.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** check_vsz.c	19 Jun 2002 05:11:52 -0000	1.2
--- check_vsz.c	8 Nov 2002 08:06:55 -0000	1.3
***************
*** 34,37 ****
--- 34,44 ----
   *****************************************************************************/
  
+ #define PROGNAME "check_vsz"
+ #define REVISION "$Revision$"
+ #define COPYRIGHT "1999-2002"
+ #define AUTHOR "Karl DeBisschop"
+ #define EMAIL "karl at debisschop.net"
+ #define SUMMARY "Check the image size of a running program.\n"
+ 
  #include "common.h"
  #include "popen.h"
***************
*** 39,43 ****
  
  int process_arguments (int argc, char **argv);
- int call_getopt (int argc, char **argv);
  void print_help (char *cmd);
  void print_usage (char *cmd);
--- 46,49 ----
***************
*** 147,191 ****
  	int c;
  
- 	if (argc < 2)
- 		return ERROR;
- 
- 	c = 0;
- 	while (c += (call_getopt (argc - c, &argv[c]))) {
- 		if (argc <= c)
- 			break;
- 		if (warn == -1) {
- 			if (!is_intnonneg (argv[c])) {
- 				printf ("%s: critical threshold must be an integer: %s\n",
- 								my_basename (argv[0]), argv[c]);
- 				print_usage (my_basename (argv[0]));
- 				exit (STATE_UNKNOWN);
- 			}
- 			warn = atoi (argv[c]);
- 		}
- 		else if (crit == -1) {
- 			if (!is_intnonneg (argv[c])) {
- 				printf ("%s: critical threshold must be an integer: %s\n",
- 								my_basename (argv[0]), argv[c]);
- 				print_usage (my_basename (argv[0]));
- 				exit (STATE_UNKNOWN);
- 			}
- 			crit = atoi (argv[c]);
- 		}
- 		else if (proc == NULL) {
- 			proc = malloc (strlen (argv[c]) + 1);
- 			if (proc == NULL)
- 				terminate (STATE_UNKNOWN,
- 									 "check_vsz: failed malloc of proc in process_arguments");
- 			strcpy (proc, argv[c]);
- 		}
- 	}
- 	return c;
- }
- 
- int
- call_getopt (int argc, char **argv)
- {
- 	int c, i = 1;
- 
  #ifdef HAVE_GETOPT_H
  	int option_index = 0;
--- 153,156 ----
***************
*** 200,203 ****
--- 165,171 ----
  #endif
  
+ 	if (argc < 2)
+ 		return ERROR;
+ 
  	while (1) {
  #ifdef HAVE_GETOPT_H
***************
*** 209,220 ****
  			break;
  
- 		i++;
- 		switch (c) {
- 		case 'c':
- 		case 'w':
- 		case 'C':
- 			i++;
- 		}
- 
  		switch (c) {
  		case '?':									/* help */
--- 177,180 ----
***************
*** 255,259 ****
  		}
  	}
! 	return i;
  }
  
--- 215,249 ----
  		}
  	}
! 
! 	c = optind;
! 	if (warn == -1) {
! 		if (!is_intnonneg (argv[c])) {
! 			printf ("%s: critical threshold must be an integer: %s\n",
! 							PROGNAME, argv[c]);
! 			print_usage (PROGNAME);
! 			exit (STATE_UNKNOWN);
! 		}
! 		warn = atoi (argv[c++]);
! 	}
! 
! 	if (crit == -1) {
! 		if (!is_intnonneg (argv[c])) {
! 			printf ("%s: critical threshold must be an integer: %s\n",
! 							PROGNAME, argv[c]);
! 			print_usage (PROGNAME);
! 			exit (STATE_UNKNOWN);
! 		}
! 		crit = atoi (argv[c++]);
! 	}
! 
! 	if (proc == NULL) {
! 		proc = malloc (strlen (argv[c]) + 1);
! 		if (proc == NULL)
! 			terminate (STATE_UNKNOWN,
! 								 "check_vsz: failed malloc of proc in process_arguments");
! 		strcpy (proc, argv[c]);
! 	}
! 
! 	return c;
  }