X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Fconf.c;h=d2c08de23b5e0ded212290866de3a5675c82f8a5;hb=54eb231d1d8fcb8b02c56d437152699764bcda3e;hp=34cede8feb8e007606465a21dea3554134b24a01;hpb=5b7964ec352983226bac9a2e849ee186c6d932e0;p=libucw.git

diff --git a/lib/conf.c b/lib/conf.c
index 34cede8f..d2c08de2 100644
--- a/lib/conf.c
+++ b/lib/conf.c
@@ -2,6 +2,9 @@
  *	Sherlock Library -- Reading configuration files
  *
  *	(c) 2001 Robert Spalek <robert@ucw.cz>
+ *
+ *	This software may be freely distributed and used according to the terms
+ *	of the GNU Lesser General Public License.
  */
 
 #include "lib/lib.h"
@@ -14,7 +17,7 @@
 
 #include "lib/chartype.h"
 #include "lib/fastbuf.h"
-#include "lib/lfs.h"
+#include "lib/pools.h"
 
 #include "lib/conf.h"
 
@@ -22,27 +25,77 @@
 #define	MAX_LEVEL	8
 
 static struct cfitem *cfsection;
+static struct mempool *cfpool;
+
+byte *cfdeffile = DEFAULT_CONFIG;
+
+static void CONSTRUCTOR
+conf_init(void)
+{
+	cfpool = mp_new(4096);
+}
+
+void *
+cfg_malloc(uns size)
+{
+	return mp_alloc(cfpool, size);
+}
+
+byte *
+cfg_stralloc(byte *s)
+{
+  uns l = strlen(s);
+  byte *k = cfg_malloc(l + 1);
+  strcpy(k, s);
+  return k;
+}
 
 void cf_register(struct cfitem *items)
 {
-	if(items[0].type!=CT_SECTION)
-		die("Invalid configuration section, first item must be of type CT_SECTION");
+	if(items[0].type!=CT_SECTION && items[0].type!=CT_INCOMPLETE_SECTION)
+		die("cf_register: Invalid section type");
 	items[0].var=cfsection;
 	cfsection=items;
 }
 
-byte *cf_set_item(byte *sect, byte *name, byte *value)
+int cf_item_count(void)
 {
-	struct cfitem *item;
-	byte *msg=NULL;
+	struct cfitem *sect, *item;
+	int count = 0;
+	for (sect = cfsection; sect; sect = sect->var)
+		for (item = sect+1; item->type; item++)
+			count++;
+	return count;
+}
+
+struct cfitem *cf_get_item(byte *sect, byte *name)
+{
+	struct cfitem *item, *section;
 
 	item=cfsection;
 	while(item && strcasecmp(item->name,sect))
 		item=item->var;
-	if(!item)	/* ignore unknown section */
+	if(!item)	/* unknown section */
 		return NULL;
+	section = item;
 
 	for(item++; item->type && strcasecmp(item->name,name); item++);
+	if (!item->type && section->type == CT_INCOMPLETE_SECTION)
+		return NULL;
+
+	return item;	/* item->type == 0 if not found */
+}
+
+byte *cf_set_item(byte *sect, byte *name, byte *value)
+{
+	struct cfitem *item;
+	byte *msg=NULL;
+
+	if (!*sect)
+		return "Empty section name";
+	item=cf_get_item(sect,name);
+	if(!item)	/* ignore unknown section */
+		return NULL;
 
 	switch(item->type){
 		case CT_INT:
@@ -58,10 +111,10 @@ byte *cf_set_item(byte *sect, byte *name, byte *value)
 				break;
 			}
 		case CT_STRING:
-			*((byte **) item->var) = stralloc(value);
+			*((byte **) item->var) = cfg_stralloc(value);
 			break;
 		case CT_FUNCTION:
-			msg = ((ci_func) item->var)(item, value);
+			msg = ((ci_func) item->var)(item, cfg_stralloc(value));
 			break;
 		default:
 			msg = "Unknown keyword";
@@ -84,7 +137,7 @@ static int cf_subread(byte *filename,int level)
 		return 0;
 	}
 		
-	fd=sh_open(filename,O_RDONLY, 0666);
+	fd=open(filename,O_RDONLY, 0666);
 	if(fd<0){
 		log(L_ERROR,"Cannot open configuration file %s: %m",filename);
 		return 0;
@@ -167,6 +220,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[],
@@ -200,6 +254,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)
@@ -207,9 +263,11 @@ int cf_getopt(int argc,char * const argv[],
 
 		}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);
 }
-