CVS diff for config.l between 1.4 and 1.3:

Revision 1.3 Revision 1.4
Line 2 Line 2
#include "cow.h" 
#include "cow_config.h" 
#include "defines.h" 
#include "cow.h" 
#include "cow_config.h" 
#include "defines.h" 
 
#undef realloc 
 
#define VARMATCH(varname) (0 == strncmp(yytext, varname, strlen(varname))) 
 
 
#define VARMATCH(varname) (0 == strncmp(yytext, varname, strlen(varname))) 
 
Line 101 Line 103
 * all required variables were set properly. 
*/ 
void read_config_files(char* cfgfilename) { 
 * all required variables were set properly. 
*/ 
void read_config_files(char* cfgfilename) { 
 
    struct stat confstat;
 
    /* Set default values before parsing config file */ 
ka_max_con = KA_MAX_CON; 
ka_max_dur = KA_MAX_DUR; 
    /* Set default values before parsing config file */ 
ka_max_con = KA_MAX_CON; 
ka_max_dur = KA_MAX_DUR; 
Line 119 Line 123
    if (cfgfilename != NULL) { 
yyin = fopen(cfgfilename, "r"); 
filename = cfgfilename; 
    if (cfgfilename != NULL) { 
yyin = fopen(cfgfilename, "r"); 
filename = cfgfilename; 
 
    } else if (0 == stat("/etc/cow.conf", &confstat)) {
        yyin = fopen("/etc/cow.conf", "r");
        filename = "/etc/cow.conf";
    } else if (0 == stat("/usr/local/etc/cow.conf", &confstat)) {
        yyin = fopen("/usr/local/etc/cow.conf", "r");
        filename = "/usr/local/etc/cow.conf"; 
    } else { 
yyin = fopen("cow.conf", "r");
    } else { 
yyin = fopen("cow.conf", "r");
        filename = "cow.conf"; 
        filename = "./cow.conf"; 

 
if (yyin == NULL) { 

 
if (yyin == NULL) { 
Line 204 Line 214
    return 1; 

 
    return 1; 

 


Legend
Lines deleted from 1.4  
Lines Modified
  Lines added in revision 1.3