From: Ethan G. <ega...@us...> - 2004-11-02 01:09:07
|
Update of /cvsroot/nagios/nagios/base In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7609/base Modified Files: config.c Log Message: minor fix in mmap()'ed config file input Index: config.c =================================================================== RCS file: /cvsroot/nagios/nagios/base/config.c,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** config.c 31 Oct 2004 04:16:02 -0000 1.49 --- config.c 2 Nov 2004 01:08:47 -0000 1.50 *************** *** 4,8 **** * * Copyright (c) 1999-2004 Ethan Galstad (na...@na...) ! * Last Modified: 10-30-2004 * * License: --- 4,8 ---- * * Copyright (c) 1999-2004 Ethan Galstad (na...@na...) ! * Last Modified: 11-01-2004 * * License: *************** *** 206,210 **** /* process the main configuration file */ int read_main_config_file(char *main_config_file){ ! char *input; char variable[MAX_INPUT_BUFFER]; char value[MAX_INPUT_BUFFER]; --- 206,210 ---- /* process the main configuration file */ int read_main_config_file(char *main_config_file){ ! char *input=NULL; char variable[MAX_INPUT_BUFFER]; char value[MAX_INPUT_BUFFER]; *************** *** 242,246 **** /* process all lines in the config file */ ! for(input=mmap_fgets(thefile);input=mmap_fgets(thefile);free(input)){ current_line=thefile->current_line; --- 242,254 ---- /* process all lines in the config file */ ! while(1){ ! ! ! /* free memory */ ! free(input); ! ! /* read the next line */ ! if((input=mmap_fgets(thefile))==NULL) ! break; current_line=thefile->current_line; *************** *** 1473,1477 **** int read_resource_file(char *resource_file){ char temp_buffer[MAX_INPUT_BUFFER]; ! char *input; char variable[MAX_INPUT_BUFFER]; char value[MAX_INPUT_BUFFER]; --- 1481,1485 ---- int read_resource_file(char *resource_file){ char temp_buffer[MAX_INPUT_BUFFER]; ! char *input=NULL; char variable[MAX_INPUT_BUFFER]; char value[MAX_INPUT_BUFFER]; *************** *** 1498,1502 **** /* process all lines in the resource file */ ! for(input=mmap_fgets(thefile);input=mmap_fgets(thefile);free(input)){ current_line=thefile->current_line; --- 1506,1517 ---- /* process all lines in the resource file */ ! while(1){ ! ! /* free memory */ ! free(input); ! ! /* read the next line */ ! if((input=mmap_fgets(thefile))==NULL) ! break; current_line=thefile->current_line; |