[Nagios-checkins] CVS: nrpe/src check_nrpe.c,1.13,1.14 nrpe.c,1.15,1.16

[Ethan G. <ega...@us...>]

Update of /cvsroot/nagios/nrpe/src
In directory sc8-pr-cvs1:/tmp/cvs-serv4218/src

Modified Files:
	check_nrpe.c nrpe.c 
Log Message:
More misc updates

Index: check_nrpe.c
===================================================================
RCS file: /cvsroot/nagios/nrpe/src/check_nrpe.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** check_nrpe.c	30 Jan 2003 04:18:09 -0000	1.13
--- check_nrpe.c	31 Jan 2003 03:46:31 -0000	1.14
***************
*** 5,9 ****
   * License: GPL
   *
!  * Last Modified: 01-29-2003
   *
   * Command line: CHECK_NRPE -H <host_address> [-p port] [-c command] [-to to_sec]
--- 5,9 ----
   * License: GPL
   *
!  * Last Modified: 01-30-2003
   *
   * Command line: CHECK_NRPE -H <host_address> [-p port] [-c command] [-to to_sec]
***************
*** 71,75 ****
  	if(result!=OK || show_help==TRUE){
  
! 		printf("Usage: check_nrpe -H <host> [-p <port>] [-t <timeout>] [-c <command>] [-a arglist...]\n");
  		printf("\n");
  		printf("Options:\n");
--- 71,75 ----
  	if(result!=OK || show_help==TRUE){
  
! 		printf("Usage: check_nrpe -H <host> [-p <port>] [-t <timeout>] [-c <command>] [-a <arglist...>]\n");
  		printf("\n");
  		printf("Options:\n");

Index: nrpe.c
===================================================================
RCS file: /cvsroot/nagios/nrpe/src/nrpe.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** nrpe.c	30 Jan 2003 04:18:09 -0000	1.15
--- nrpe.c	31 Jan 2003 03:46:31 -0000	1.16
***************
*** 5,9 ****
   * License: GPL
   *
!  * Last Modified: 01-28-2003
   *
   * Command line: nrpe -c <config_file> [--inetd | --daemon]
--- 5,9 ----
   * License: GPL
   *
!  * Last Modified: 01-30-2003
   *
   * Command line: nrpe -c <config_file> [--inetd | --daemon]
***************
*** 105,115 ****
  	else if(result!=OK || show_help==TRUE){
  
! 		printf("Usage: %s -c <config_file> [mode]\n",argv[0]);
  		printf("\n");
  		printf("Options:\n");
  		printf(" <config_file> = Name of config file to use\n");
! 		printf(" [mode]        = Determines how NRPE should run. Valid modes:\n");
! 		printf("   --inetd     = Run as a service under inetd or xinetd\n");
! 		printf("   --daemon    = Run as a standalone daemon\n");
  		printf("\n");
  		printf("Notes:\n");
--- 105,115 ----
  	else if(result!=OK || show_help==TRUE){
  
! 		printf("Usage: nrpe -c <config_file> <mode>\n");
  		printf("\n");
  		printf("Options:\n");
  		printf(" <config_file> = Name of config file to use\n");
! 		printf(" <mode>        = One of the following two operating modes:\n");  
! 		printf("   -i          =    Run as a service under inetd or xinetd\n");
! 		printf("   -d          =    Run as a standalone daemon\n");
  		printf("\n");
  		printf("Notes:\n");
***************
*** 1227,1268 ****
  /* process command line arguments */
  int process_arguments(int argc, char **argv){
! 	int x;
  	int have_mode=FALSE;
  
  	/* no options were supplied */
  	if(argc<2)
  		return ERROR;
  
! 	/* process all arguments */
! 	for(x=2;x<=argc;x++){
  
! 		if(!strcmp(argv[x-1],"-c")){
! 			if(x<argc){
! 				strncpy(config_file,argv[x],sizeof(config_file)-1);
! 				config_file[sizeof(config_file)-1]='\x0';
! 				x++;
! 			        }
! 			else
! 				return ERROR;
! 		        }
! 		else if(!strcmp(argv[x-1],"-d") || !strcmp(argv[x-1],"--daemon")){
  			use_inetd=FALSE;
  			have_mode=TRUE;
! 		        }
! 		else if(!strcmp(argv[1],"-i") || !strcmp(argv[x-1],"--inetd")){
  			use_inetd=TRUE;
  			have_mode=TRUE;
! 		        }
! 		else if(!strcmp(argv[x-1],"-h") || !strcmp(argv[x-1],"--help"))
! 			show_help=TRUE;
! 		else if(!strcmp(argv[x-1],"-l") || !strcmp(argv[x-1],"--license"))
! 			show_license=TRUE;
! 		else if(!strcmp(argv[x-1],"-V") || !strcmp(argv[x-1],"--version"))
! 			show_version=TRUE;
! 		else
  			return ERROR;
  	        }
  
! 	/* bail if we didn't get a mode */
  	if(have_mode==FALSE)
  		return ERROR;
--- 1227,1295 ----
  /* process command line arguments */
  int process_arguments(int argc, char **argv){
! 	char optchars[MAX_INPUT_BUFFER];
! 	int argindex=0;
! 	int c=1;
! 	int i=1;
  	int have_mode=FALSE;
  
+ #ifdef HAVE_GETOPT_H
+ 	int option_index=0;
+ 	static struct option long_options[]={
+ 		{"config", required_argument, 0, 'c'},
+ 		{"inetd", no_argument, 0, 'i'},
+ 		{"daemon", no_argument, 0, 'd'},
+ 		{"help", no_argument, 0, 'h'},
+ 		{"license", no_argument, 0, 'l'},
+ 		{0, 0, 0, 0}
+                 };
+ #endif
+ 
  	/* no options were supplied */
  	if(argc<2)
  		return ERROR;
  
! 	snprintf(optchars,MAX_INPUT_BUFFER,"c:idhl");
  
! 	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;
! 
! 		/* process all arguments */
! 		switch(c){
! 
! 		case '?':
! 		case 'h':
! 			show_help=TRUE;
! 			break;
! 		case 'V':
! 			show_version=TRUE;
! 			break;
! 		case 'l':
! 			show_license=TRUE;
! 			break;
! 		case 'c':
! 			strncpy(config_file,optarg,sizeof(config_file));
! 			config_file[sizeof(config_file)-1]='\x0';
! 			break;
! 		case 'd':
  			use_inetd=FALSE;
  			have_mode=TRUE;
! 			break;
! 		case 'i':
  			use_inetd=TRUE;
  			have_mode=TRUE;
! 			break;
! 		default:
  			return ERROR;
+ 			break;
+ 		        }
  	        }
  
! 	/* bail if we didn't get required args */
  	if(have_mode==FALSE)
  		return ERROR;