X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fconf.c;h=c96d9fb304cd71e029eab9353e4abdbde4baab8f;hb=b9d261cd48ef0715f3a104a875c11c992c654206;hp=b6cf5237297953fe2a6b04ab133e0815aff8639d;hpb=ddd63d22bcda367a5fad4941bd1c96334de9367d;p=libucw.git

diff --git a/lib/conf.c b/lib/conf.c
index b6cf5237..c96d9fb3 100644
--- a/lib/conf.c
+++ b/lib/conf.c
@@ -24,6 +24,8 @@
 static struct cfitem *cfsection;
 static struct mempool *cfpool;
 
+byte *cfdeffile = DEFAULT_CONFIG;
+
 static void CONSTRUCTOR
 conf_init(void)
 {
@@ -53,19 +55,40 @@ void cf_register(struct cfitem *items)
 	cfsection=items;
 }
 
-byte *cf_set_item(byte *sect, byte *name, byte *value)
+int cf_item_count(void)
+{
+	struct cfitem *sect, *item;
+	int count = 0;
+	for (sect = cfsection; sect; sect = sect->var)
+		for (item = sect+1; sect->type; sect++)
+			count++;
+	return count;
+}
+
+struct cfitem *cf_get_item(byte *sect, byte *name)
 {
 	struct cfitem *item;
-	byte *msg=NULL;
 
 	item=cfsection;
 	while(item && strcasecmp(item->name,sect))
 		item=item->var;
-	if(!item)	/* ignore unknown section */
+	if(!item)	/* unknown section */
 		return NULL;
 
 	for(item++; item->type && strcasecmp(item->name,name); item++);
 
+	return item;	/* item->type == 0 if not found */
+}
+
+byte *cf_set_item(byte *sect, byte *name, byte *value)
+{
+	struct cfitem *item;
+	byte *msg=NULL;
+
+	item=cf_get_item(sect,name);
+	if(!item)	/* ignore unknown section */
+		return NULL;
+
 	switch(item->type){
 		case CT_INT:
 			{
@@ -189,6 +212,7 @@ void cf_read(byte *filename)
 {
 	if(!cf_subread(filename,0))
 		die("Reading config file %s failed",filename);
+	cfdeffile = NULL;
 }
 
 int cf_getopt(int argc,char * const argv[],
@@ -222,6 +246,8 @@ int cf_getopt(int argc,char * const argv[],
 					name=c;
 				}
 
+				if (cfdeffile)
+					cf_read(cfdeffile);
 				msg=cf_set_item(sect,name,value);
 			}
 			if(msg)
@@ -229,6 +255,10 @@ int cf_getopt(int argc,char * const argv[],
 
 		}else if(res=='C'){
 			cf_read(optarg);
+		}else if(res==-1){
+			if(cfdeffile)
+				cf_read(cfdeffile);
+			return res;
 		}else{	/* unhandled option */
 			return res;
 		}