static struct cfitem *cfsection;
static struct mempool *cfpool;
+byte *cfdeffile = DEFAULT_CONFIG;
+
static void CONSTRUCTOR
conf_init(void)
{
struct cfitem *sect, *item;
int count = 0;
for (sect = cfsection; sect; sect = sect->var)
- for (item = sect+1; sect->type; sect++)
+ for (item = sect+1; item->type; item++)
count++;
return count;
}
{
if(!cf_subread(filename,0))
die("Reading config file %s failed",filename);
+ cfdeffile = NULL;
}
int cf_getopt(int argc,char * const argv[],
name=c;
}
+ if (cfdeffile)
+ cf_read(cfdeffile);
msg=cf_set_item(sect,name,value);
}
if(msg)
}else if(res=='C'){
cf_read(optarg);
- }else{ /* unhandled option */
+ }else{
+ /* unhandled option or end of options */
+ if(cfdeffile)
+ cf_read(cfdeffile);
return res;
}
}while(1);
}
-