[Nagios-checkins] ndoutils/src ndo2db.c, 1.8, 1.9 ndomod.c, 1.9, 1.10 utils.c, 1.2, 1.3

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

Update of /cvsroot/nagios/ndoutils/src
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv20067/src

Modified Files:
	ndo2db.c ndomod.c utils.c 
Log Message:
Additional error messages during failed startup

Index: ndomod.c
===================================================================
RCS file: /cvsroot/nagios/ndoutils/src/ndomod.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ndomod.c	31 Oct 2007 18:17:05 -0000	1.9
--- ndomod.c	25 Jan 2008 16:09:17 -0000	1.10
***************
*** 119,123 ****
  
  	/* log module info to the Nagios log file */
! 	snprintf(temp_buffer,sizeof(temp_buffer)-1,"ndomod: %s %s (%s) Copyright (c) 2005-2007 Ethan Galstad (na...@na...)",NDOMOD_NAME,NDOMOD_VERSION,NDOMOD_DATE);
  	temp_buffer[sizeof(temp_buffer)-1]='\x0';
  	ndomod_write_to_logs(temp_buffer,NSLOG_INFO_MESSAGE);
--- 119,123 ----
  
  	/* log module info to the Nagios log file */
! 	snprintf(temp_buffer,sizeof(temp_buffer)-1,"ndomod: %s %s (%s) Copyright (c) 2005-2008 Ethan Galstad (na...@na...)",NDOMOD_NAME,NDOMOD_VERSION,NDOMOD_DATE);
  	temp_buffer[sizeof(temp_buffer)-1]='\x0';
  	ndomod_write_to_logs(temp_buffer,NSLOG_INFO_MESSAGE);
***************
*** 128,137 ****
  
  	/* process arguments */
! 	if(ndomod_process_module_args(args)==NDO_ERROR)
  		return -1;
  
  	/* do some initialization stuff... */
! 	if(ndomod_init()==NDO_ERROR)
  		return -1;
  
  	return 0;
--- 128,141 ----
  
  	/* process arguments */
! 	if(ndomod_process_module_args(args)==NDO_ERROR){
! 		ndomod_write_to_logs("ndomod: An error occurred while attempting to process module arguments.",NSLOG_INFO_MESSAGE);
  		return -1;
+ 		}
  
  	/* do some initialization stuff... */
! 	if(ndomod_init()==NDO_ERROR){
! 		ndomod_write_to_logs("ndomod: An error occurred while attempting to initialize.",NSLOG_INFO_MESSAGE);
  		return -1;
+ 		}
  
  	return 0;
***************
*** 375,378 ****
--- 379,386 ----
  		return NDO_OK;
  
+ 	/* strip var/val */
+ 	ndomod_strip(var);
+ 	ndomod_strip(val);
+ 
  	/* process the variable... */
  

Index: utils.c
===================================================================
RCS file: /cvsroot/nagios/ndoutils/src/utils.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** utils.c	31 Oct 2007 18:17:05 -0000	1.2
--- utils.c	25 Jan 2008 16:09:17 -0000	1.3
***************
*** 2,7 ****
   * UTILS.C - NDO Utils
   *
!  * Copyright (c) 2005-2007 Ethan Galstad 
!  * First Written: 10-29-2007
   *
   *
--- 2,7 ----
   * UTILS.C - NDO Utils
   *
!  * Copyright (c) 2005-2008 Ethan Galstad 
!  * First Written: 01-25-2008
   *
   *
***************
*** 153,154 ****
--- 153,201 ----
  	return rename_result;
          }
+ 
+ 
+ 
+ 
+ /******************************************************************/
+ /************************ STRING FUNCTIONS ************************/
+ /******************************************************************/
+ 
+ /* strip newline, carriage return, and tab characters from beginning and end of a string */
+ void ndomod_strip(char *buffer){
+ 	register int x=0;
+ 	register int y=0;
+ 	register int z=0;
+ 
+ 	if(buffer==NULL || buffer[0]=='\x0')
+ 		return;
+ 
+ 	/* strip end of string */
+ 	y=(int)strlen(buffer);
+ 	for(x=y-1;x>=0;x--){
+ 		if(buffer[x]==' ' || buffer[x]=='\n' || buffer[x]=='\r' || buffer[x]=='\t' || buffer[x]==13)
+ 			buffer[x]='\x0';
+ 		else
+ 			break;
+ 	        }
+ 	/* save last position for later... */
+ 	z=x;
+ 
+ 	/* strip beginning of string (by shifting) */
+ 	for(x=0;;x++){
+ 		if(buffer[x]==' ' || buffer[x]=='\n' || buffer[x]=='\r' || buffer[x]=='\t' || buffer[x]==13)
+ 			continue;
+ 		else
+ 			break;
+ 	        }
+ 	if(x>0){
+ 		/* new length of the string after we stripped the end */
+ 		y=z+1;
+ 		
+ 		/* shift chars towards beginning of string to remove leading whitespace */
+ 		for(z=x;z<y;z++)
+ 			buffer[z-x]=buffer[z];
+ 		buffer[y-x]='\x0';
+ 	        }
+ 
+ 	return;
+ 	}

Index: ndo2db.c
===================================================================
RCS file: /cvsroot/nagios/ndoutils/src/ndo2db.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ndo2db.c	31 Oct 2007 18:17:05 -0000	1.8
--- ndo2db.c	25 Jan 2008 16:09:17 -0000	1.9
***************
*** 2,9 ****
   * NDO2DB.C - NDO To Database Daemon
   *
!  * Copyright (c) 2005-2007 Ethan Galstad 
   *
   * First Written: 05-19-2005
!  * Last Modified: 10-31-2007
   *
   **************************************************************/
--- 2,9 ----
   * NDO2DB.C - NDO To Database Daemon
   *
!  * Copyright (c) 2005-2008 Ethan Galstad 
   *
   * First Written: 05-19-2005
!  * Last Modified: 01-25-2008
   *
   **************************************************************/
***************
*** 86,90 ****
  		printf("\n");
  		printf("%s %s\n",NDO2DB_NAME,NDO2DB_VERSION);
! 		printf("Copyright(c) 2005-2007 Ethan Galstad (na...@na...)\n");
  		printf("Last Modified: %s\n",NDO2DB_DATE);
  		printf("License: GPL v2\n");
--- 86,90 ----
  		printf("\n");
  		printf("%s %s\n",NDO2DB_NAME,NDO2DB_VERSION);
! 		printf("Copyright(c) 2005-2008 Ethan Galstad (na...@na...)\n");
  		printf("Last Modified: %s\n",NDO2DB_DATE);
  		printf("License: GPL v2\n");