Menu
▾
▴
[Nagios-checkins] CVS: nsca/src nsca.c,1.3,1.4 send_nsca.c,1.3,1.4
|
From: Ethan G. <ega...@us...> - 2002-07-09 04:42:47
|
Update of /cvsroot/nagios/nsca/src
In directory usw-pr-cvs1:/tmp/cvs-serv9045/src
Modified Files:
nsca.c send_nsca.c
Log Message:
Syntax changes, possible Solaris fix
Index: nsca.c
===================================================================
RCS file: /cvsroot/nagios/nsca/src/nsca.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** nsca.c 11 Jun 2002 04:30:38 -0000 1.3
--- nsca.c 9 Jul 2002 04:42:44 -0000 1.4
***************
*** 5,11 ****
* License: GPL
*
! * Last Modified: 06-10-2002
*
! * Command line: NSCA <config_file>
*
* Description:
--- 5,11 ----
* License: GPL
*
! * Last Modified: 07-08-2002
*
! * Command line: NSCA -c <config_file>
*
* Description:
***************
*** 59,62 ****
--- 59,63 ----
int show_help=FALSE;
int show_license=FALSE;
+ int show_version=FALSE;
static FILE *command_file_fp=NULL;
***************
*** 88,92 ****
result=process_arguments(argc,argv);
! if(result!=OK || show_help==TRUE || show_license==TRUE){
if(result!=OK)
--- 89,93 ----
result=process_arguments(argc,argv);
! if(result!=OK || show_help==TRUE || show_license==TRUE || show_version==TRUE){
if(result!=OK)
***************
*** 109,120 ****
if(result!=OK || show_help==TRUE){
! printf("Usage: %s <mode> [-c config_file]\n",argv[0]);
printf("\n");
printf("Options:\n");
! printf(" <mode> = Determines how NSCA should run. Valid modes:\n");
! printf(" -i = Run as a service under inetd or xinetd\n");
! printf(" -d = Run as a standalone multi-process daemon\n");
! printf(" -s = Run as a standalone single-process daemon\n");
! printf(" [config_file] = Name of config file to use\n");
printf("\n");
printf("Notes:\n");
--- 110,121 ----
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 NSCA should run. Valid modes:\n");
! printf(" --inetd = Run as a service under inetd or xinetd\n");
! printf(" --daemon = Run as a standalone multi-process daemon\n");
! printf(" --single = Run as a standalone single-process daemon\n");
printf("\n");
printf("Notes:\n");
***************
*** 124,136 ****
printf("standalone daemon.\n");
printf("\n");
-
- exit(STATE_UNKNOWN);
}
! if(show_license==TRUE){
!
display_license();
exit(STATE_UNKNOWN);
- }
--- 125,135 ----
printf("standalone daemon.\n");
printf("\n");
}
! if(show_license==TRUE)
display_license();
+
+ if(result!=OK || show_help==TRUE || show_license==TRUE || show_version==TRUE)
exit(STATE_UNKNOWN);
***************
*** 1061,1085 ****
show_license=TRUE;
! else if(!strcmp(argv[x-1],"-d"))
mode=MULTI_PROCESS_DAEMON;
! else if(!strcmp(argv[x-1],"-s"))
mode=SINGLE_PROCESS_DAEMON;
! else if(!strcmp(argv[x-1],"-i"))
mode=INETD;
/* config file */
! else if(!strcmp(argv[x-1],"-c") || x==3){
! if(!strcmp(argv[x-1],"-c")){
! if(x>=argc)
! return ERROR;
x++;
}
!
! /* grab the config file */
! strncpy(config_file,argv[x-1],sizeof(config_file)-1);
! config_file[sizeof(config_file)-1]='\0';
}
--- 1060,1087 ----
show_license=TRUE;
! /* show version */
! else if(!strcmp(argv[x-1],"-V") || !strcmp(argv[x-1],"--version"))
! show_version=TRUE;
!
! else if(!strcmp(argv[x-1],"-d") || !strcmp(argv[x-1],"--daemon"))
mode=MULTI_PROCESS_DAEMON;
! else if(!strcmp(argv[x-1],"-s") || !strcmp(argv[x-1],"--single"))
mode=SINGLE_PROCESS_DAEMON;
! else if(!strcmp(argv[x-1],"-i") || !strcmp(argv[x-1],"--inetd"))
mode=INETD;
/* config file */
! else if(!strcmp(argv[x-1],"-c")){
! if(x<argc){
! /* grab the config file */
! strncpy(config_file,argv[x-1],sizeof(config_file)-1);
! config_file[sizeof(config_file)-1]='\0';
x++;
}
! else
! return ERROR;
}
Index: send_nsca.c
===================================================================
RCS file: /cvsroot/nagios/nsca/src/send_nsca.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** send_nsca.c 11 Jun 2002 04:30:38 -0000 1.3
--- send_nsca.c 9 Jul 2002 04:42:44 -0000 1.4
***************
*** 5,9 ****
* Copyright (c) 2000-2002 Ethan Galstad (na...@na...)
*
! * Last Modified: 06-10-2002
*
* Command line: SEND_NSCA <host_address> [-p port] [-to to_sec] [-c config_file]
--- 5,9 ----
* Copyright (c) 2000-2002 Ethan Galstad (na...@na...)
*
! * Last Modified: 07-08-2002
*
* Command line: SEND_NSCA <host_address> [-p port] [-to to_sec] [-c config_file]
***************
*** 42,45 ****
--- 42,46 ----
int show_help=FALSE;
int show_license=FALSE;
+ int show_version=FALSE;
***************
*** 73,77 ****
result=process_arguments(argc,argv);
! if(result!=OK || show_help==TRUE || show_license==TRUE){
if(result!=OK)
--- 74,78 ----
result=process_arguments(argc,argv);
! if(result!=OK || show_help==TRUE || show_license==TRUE || show_version==TRUE){
if(result!=OK)
***************
*** 93,97 ****
if(result!=OK || show_help==TRUE){
! printf("Usage: %s <host_address> [-p port] [-to to_sec] [-d delim] [-c config_file]\n",argv[0]);
printf("\n");
printf("Options:\n");
--- 94,98 ----
if(result!=OK || show_help==TRUE){
! printf("Usage: %s -H <host_address> [-p port] [-to to_sec] [-d delim] [-c config_file]\n",argv[0]);
printf("\n");
printf("Options:\n");
***************
*** 111,124 ****
printf("<host_name>[tab]<svc_description>[tab]<return_code>[tab]<plugin_output>[newline]\n");
printf("\n");
-
- return STATE_UNKNOWN;
}
! if(show_license==TRUE){
!
display_license();
! return STATE_UNKNOWN;
! }
/* read the config file */
--- 112,124 ----
printf("<host_name>[tab]<svc_description>[tab]<return_code>[tab]<plugin_output>[newline]\n");
printf("\n");
}
! if(show_license==TRUE)
display_license();
! if(result!=OK || show_help==TRUE || show_license==TRUE || show_version==TRUE)
! exit(STATE_UNKNOWN);
!
!
/* read the config file */
***************
*** 356,359 ****
--- 356,363 ----
}
+ /* support old command-line syntax (host name first argument) */
+ strncpy(server_name,argv[1],sizeof(server_name)-1);
+ server_name[sizeof(server_name)-1]='\x0';
+
/* process arguments (host name is usually 1st argument) */
for(x=2;x<=argc;x++){
***************
*** 367,374 ****
show_license=TRUE;
/* server name/address */
! else if(x==2){
! strncpy(server_name,argv[1],sizeof(server_name)-1);
! server_name[sizeof(server_name)-1]='\x0';
}
--- 371,387 ----
show_license=TRUE;
+ /* show version */
+ else if(!strcmp(argv[x-1],"-V") || !strcmp(argv[x-1],"--version"))
+ show_version=TRUE;
+
/* server name/address */
! else if(!strcmp(argv[x-1],"-H")){
! if(x<argc){
! strncpy(server_name,argv[x],sizeof(server_name)-1);
! server_name[sizeof(server_name)-1]='\x0';
! x++;
! }
! else
! return ERROR;
}
***************
*** 417,421 ****
}
! else
return ERROR;
}
--- 430,434 ----
}
! else if(x>2)
return ERROR;
}
|