[Nagiosplug-checkins] CVS: nagiosplug/plugins check_ping.c,1.5,1.6

[Karl DeBisschop]

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

Modified Files:
	check_ping.c 
Log Message:
remove broken call_getopt stuff

Index: check_ping.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_ping.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** check_ping.c	19 Jun 2002 05:11:52 -0000	1.5
--- check_ping.c	18 Oct 2002 03:45:02 -0000	1.6
***************
*** 86,89 ****
--- 86,90 ----
  	if (process_arguments (argc, argv) == ERROR)
  		usage ("Could not parse arguments");
+ 	exit;
  
  	/* does the host address of number of packets argument come first? */
***************
*** 151,155 ****
  process_arguments (int argc, char **argv)
  {
! 	int c;
  
  	if (argc < 2)
--- 152,169 ----
  process_arguments (int argc, char **argv)
  {
! 	int c, i = 1;
! 
! #ifdef HAVE_GETOPT_H
! 	int option_index = 0;
! 	static struct option long_options[] = {
! 		STD_LONG_OPTS,
! 		{"packets", required_argument, 0, 'p'},
! 		{"nohtml", no_argument, 0, 'n'},
! 		{"link", no_argument, 0, 'L'},
! 		{0, 0, 0, 0}
! 	};
! #endif
! 
! #define OPTCHARS "Vvht:c:w:H:p:nL"
  
  	if (argc < 2)
***************
*** 163,289 ****
  	}
  
- 	c = 0;
- 	while ((c += call_getopt (argc - c, &argv[c])) < argc) {
- 
- 		if (is_option (argv[c]))
- 			continue;
- 
- 		if (server_address == NULL) {
- 			if (is_host (argv[c]) == FALSE) {
- 				printf ("Invalid host name/address: %s\n\n", argv[c]);
- 				return ERROR;
- 			}
- 			server_address = argv[c];
- 		}
- 		else if (wpl == UNKNOWN_PACKET_LOSS) {
- 			if (is_intpercent (argv[c]) == FALSE) {
- 				printf ("<wpl> (%s) must be an integer percentage\n", argv[c]);
- 				return ERROR;
- 			}
- 			wpl = atoi (argv[c]);
- 		}
- 		else if (cpl == UNKNOWN_PACKET_LOSS) {
- 			if (is_intpercent (argv[c]) == FALSE) {
- 				printf ("<cpl> (%s) must be an integer percentage\n", argv[c]);
- 				return ERROR;
- 			}
- 			cpl = atoi (argv[c]);
- 		}
- 		else if (wrta == UNKNOWN_TRIP_TIME) {
- 			if (is_negative (argv[c])) {
- 				printf ("<wrta> (%s) must be a non-negative number\n", argv[c]);
- 				return ERROR;
- 			}
- 			wrta = atof (argv[c]);
- 		}
- 		else if (crta == UNKNOWN_TRIP_TIME) {
- 			if (is_negative (argv[c])) {
- 				printf ("<crta> (%s) must be a non-negative number\n", argv[c]);
- 				return ERROR;
- 			}
- 			crta = atof (argv[c]);
- 		}
- 		else if (max_packets == -1) {
- 			if (is_intnonneg (argv[c])) {
- 				max_packets = atoi (argv[c]);
- 			}
- 			else {
- 				printf ("<max_packets> (%s) must be a non-negative number\n",
- 								argv[c]);
- 				return ERROR;
- 			}
- 		}
- 
- 	}
- 
- 	return validate_arguments ();
- }
- 
- int
- call_getopt (int argc, char **argv)
- {
- 	int c, i = 0;
- 
- #ifdef HAVE_GETOPT_H
- 	int option_index = 0;
- 	static struct option long_options[] = {
- 		{"help", no_argument, 0, 'h'},
- 		{"version", no_argument, 0, 'V'},
- 		{"verbose", no_argument, 0, 'v'},
- 		{"nohtml", no_argument, 0, 'n'},
- 		{"link", no_argument, 0, 'L'},
- 		{"timeout", required_argument, 0, 't'},
- 		{"critical", required_argument, 0, 'c'},
- 		{"warning", required_argument, 0, 'w'},
- 		{"hostname", required_argument, 0, 'H'},
- 		{"packets", required_argument, 0, 'p'},
- 		{0, 0, 0, 0}
- 	};
- #endif
- 
  	while (1) {
  #ifdef HAVE_GETOPT_H
! 		c =
! 			getopt_long (argc, argv, "+hVvt:c:w:H:p:nL", long_options,
! 									 &option_index);
  #else
! 		c = getopt (argc, argv, "+hVvt:c:w:H:p:nL");
  #endif
! 
! 		i++;
! 
! 		if (c == -1 || c == EOF || c == 1)
  			break;
  
  		switch (c) {
! 		case 't':
! 		case 'c':
! 		case 'w':
! 		case 'H':
! 		case 'p':
! 			i++;
! 		}
! 
! 		switch (c) {
! 		case '?':									/* print short usage statement if args not parsable */
  			usage2 ("Unknown argument", optarg);
! 		case 'h':									/* help */
  			print_help ();
  			exit (STATE_OK);
! 		case 'V':									/* version */
  			print_revision (PROGNAME, REVISION);
  			exit (STATE_OK);
! 		case 't':									/* timeout period */
  			timeout_interval = atoi (optarg);
  			break;
! 		case 'v':									/* verbose mode */
  			verbose = TRUE;
  			break;
! 		case 'H':									/* hostname */
  			if (is_host (optarg) == FALSE)
  				usage2 ("Invalid host name/address", optarg);
  			server_address = optarg;
  			break;
! 		case 'p':									/* number of packets to send */
  			if (is_intnonneg (optarg))
  				max_packets = atoi (optarg);
--- 177,210 ----
  	}
  
  	while (1) {
  #ifdef HAVE_GETOPT_H
! 		c = getopt_long (argc, argv, OPTCHARS, long_options, &option_index);
  #else
! 		c = getopt (argc, argv, OPTCHARS);
  #endif
! 		if (c == -1 || c == EOF)
  			break;
  
  		switch (c) {
! 		case '?':	/* usage */
  			usage2 ("Unknown argument", optarg);
! 		case 'h':	/* help */
  			print_help ();
  			exit (STATE_OK);
! 		case 'V':	/* version */
  			print_revision (PROGNAME, REVISION);
  			exit (STATE_OK);
! 		case 't':	/* timeout period */
  			timeout_interval = atoi (optarg);
  			break;
! 		case 'v':	/* verbose mode */
  			verbose = TRUE;
  			break;
! 		case 'H':	/* hostname */
  			if (is_host (optarg) == FALSE)
  				usage2 ("Invalid host name/address", optarg);
  			server_address = optarg;
  			break;
! 		case 'p':	/* number of packets to send */
  			if (is_intnonneg (optarg))
  				max_packets = atoi (optarg);
***************
*** 291,298 ****
  				usage2 ("<max_packets> (%s) must be a non-negative number\n", optarg);
  			break;
! 		case 'n':									/* no HTML */
  			display_html = FALSE;
  			break;
! 		case 'L':									/* show HTML */
  			display_html = TRUE;
  			break;
--- 212,219 ----
  				usage2 ("<max_packets> (%s) must be a non-negative number\n", optarg);
  			break;
! 		case 'n':	/* no HTML */
  			display_html = FALSE;
  			break;
! 		case 'L':	/* show HTML */
  			display_html = TRUE;
  			break;
***************
*** 306,310 ****
  	}
  
! 	return i;
  }
  
--- 227,299 ----
  	}
  
! 	c = optind;
! 	if (c == argc)
! 		return validate_arguments ();
! 
! 	if (server_address == NULL) {
! 		if (is_host (argv[c]) == FALSE) {
! 			printf ("Invalid host name/address: %s\n\n", argv[c]);
! 			return ERROR;
! 		} else {
! 			server_address = argv[c++];
! 			if (c == argc)
! 				return validate_arguments ();
! 		}
! 	}
! 
! 	if (wpl == UNKNOWN_PACKET_LOSS) {
! 		if (is_intpercent (argv[c]) == FALSE) {
! 			printf ("<wpl> (%s) must be an integer percentage\n", argv[c]);
! 			return ERROR;
! 		} else {
! 			wpl = atoi (argv[c++]);
! 			if (c == argc)
! 				return validate_arguments ();
! 		}
! 	}
! 
! 	if (cpl == UNKNOWN_PACKET_LOSS) {
! 		if (is_intpercent (argv[c]) == FALSE) {
! 			printf ("<cpl> (%s) must be an integer percentage\n", argv[c]);
! 			return ERROR;
! 		} else {
! 			cpl = atoi (argv[c++]);
! 			if (c == argc)
! 				return validate_arguments ();
! 		}
! 	}
! 
! 	if (wrta == UNKNOWN_TRIP_TIME) {
! 		if (is_negative (argv[c])) {
! 			printf ("<wrta> (%s) must be a non-negative number\n", argv[c]);
! 			return ERROR;
! 		} else {
! 			wrta = atof (argv[c++]);
! 			if (c == argc)
! 				return validate_arguments ();
! 		}
! 	}
! 
! 	if (crta == UNKNOWN_TRIP_TIME) {
! 		if (is_negative (argv[c])) {
! 			printf ("<crta> (%s) must be a non-negative number\n", argv[c]);
! 			return ERROR;
! 		} else {
! 			crta = atof (argv[c++]);
! 			if (c == argc)
! 				return validate_arguments ();
! 		}
! 	}
! 
! 	if (max_packets == -1) {
! 		if (is_intnonneg (argv[c])) {
! 			max_packets = atoi (argv[c++]);
! 		}	else {
! 			printf ("<max_packets> (%s) must be a non-negative number\n", argv[c]);
! 			return ERROR;
! 		}
! 	}
! 
! 	return validate_arguments ();
  }
  
***************
*** 320,324 ****
  	else
  		usage2 ("%s: Warning threshold must be integer or percentage!\n\n", arg);
- 
  }
  
--- 309,312 ----