X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Fconf.c;h=223ff666f77e222a1dc85f7482939338db506208;hb=c806248e561584362a7a562f22c20e7013ac3bb1;hp=3eb612b5f30edfdd449064077848ddcafe85b1b0;hpb=697ce37a72ce955e811c4b73878733a405f3c038;p=libucw.git diff --git a/lib/conf.c b/lib/conf.c index 3eb612b5..223ff666 100644 --- a/lib/conf.c +++ b/lib/conf.c @@ -1,82 +1,110 @@ -/* Reading conf files - * Robert Spalek, (c) 2001, robert@ucw.cz - * $Id: conf.c,v 1.2 2001/01/08 10:26:37 robert Exp $ +/* + * Sherlock Library -- Reading configuration files + * + * (c) 2001 Robert Spalek */ +#include "lib/lib.h" + #include #include #include -#include #include #include -#include "lib/lib.h" +#include "lib/chartype.h" #include "lib/fastbuf.h" +#include "lib/pools.h" #include "lib/conf.h" #define BUFFER 1024 #define MAX_LEVEL 8 -#define MAX_SECTIONS 64 +static struct cfitem *cfsection; +static struct mempool *cfpool; -static struct { - byte *section; - struct cfitem *items; -} cfsection[MAX_SECTIONS]; -static int cfsections; +static void CONSTRUCTOR +conf_init(void) +{ + cfpool = mp_new(4096); +} -#define MAX_SHORT_OPTS 128 -#define MAX_LONG_OPTS 64 +void * +cfg_malloc(uns size) +{ + return mp_alloc(cfpool, size); +} -static byte shortopts[MAX_SHORT_OPTS] = "S:C:"; -static int shortlen=4; +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"); + items[0].var=cfsection; + cfsection=items; +} -static struct option longopts[MAX_LONG_OPTS] = +int cf_item_count(void) { - {"set", 1, 0, 'S'}, - {"config", 1, 0, 'C'} -}; -static int longlen=2; + struct cfitem *sect, *item; + int count = 0; + for (sect = cfsection; sect; sect = sect->var) + for (item = sect+1; sect->type; sect++) + count++; + return count; +} -void cf_register(byte *section,struct cfitem *items) +struct cfitem *cf_get_item(byte *sect, byte *name) { - if(cfsections>=MAX_SECTIONS) - die("too many modules %d",cfsections); - cfsection[cfsections].section=section; - cfsection[cfsections].items=items; - cfsections++; + struct cfitem *item; + + item=cfsection; + while(item && strcasecmp(item->name,sect)) + item=item->var; + if(!item) /* unknown section */ + return NULL; + + for(item++; item->type && strcasecmp(item->name,name); item++); + + return item; /* item->type == 0 if not found */ } -static byte *cf_set_item(byte *sect, byte *name, byte *value) +byte *cf_set_item(byte *sect, byte *name, byte *value) { - int idsect; struct cfitem *item; byte *msg=NULL; - idsect=0; - while(idsect=cfsections) /* ignore unknown section */ + item=cf_get_item(sect,name); + if(!item) /* ignore unknown section */ return NULL; - item=cfsection[idsect].items; - while(item->type && strcasecmp(name,item->name)) - item++; switch(item->type){ - case ct_int: + case CT_INT: { char *end; - *((uns *) item->var) = strtoul(value, &end, 0); - if (end && *end) - msg = "Invalid number"; + if(!*value) + msg="Missing number"; + else{ + *((uns *) item->var) = strtoul(value, &end, 0); + if (end && *end) + msg = "Invalid number"; + } break; } - case ct_string: - *((byte **) item->var) = stralloc(value); + case CT_STRING: + *((byte **) item->var) = cfg_stralloc(value); break; - case ct_function: - msg = ((ci_func) item->var)(item, value); + case CT_FUNCTION: + msg = ((ci_func) item->var)(item, cfg_stralloc(value)); break; default: msg = "Unknown keyword"; @@ -88,21 +116,23 @@ static byte *cf_set_item(byte *sect, byte *name, byte *value) static int cf_subread(byte *filename,int level) { + int fd; struct fastbuf *b; byte def_section[BUFFER]; int line; byte *msg=NULL; if(level>=MAX_LEVEL){ - log("Too many nested files %d",level); + log(L_ERROR,"Too many (%d) nested files when reading %s",level,filename); return 0; } - b=bopen(filename,O_RDONLY,4096); - if(!b){ - log("Cannot open file %s",filename); + fd=open(filename,O_RDONLY, 0666); + if(fd<0){ + log(L_ERROR,"Cannot open configuration file %s: %m",filename); return 0; } + b=bfdopen(fd,4096); def_section[0]=0; line=0; @@ -114,8 +144,11 @@ static int cf_subread(byte *filename,int level) break; line++; + c=buf+strlen(buf); + while(c>buf && Cspace(c[-1])) + *--c=0; c=buf; - while(*c && isspace(*c)) + while(*c && Cspace(*c)) c++; if(!*c || *c=='#') continue; @@ -123,42 +156,44 @@ static int cf_subread(byte *filename,int level) if(*c=='['){ strcpy(def_section,c+1); c=strchr(def_section,']'); - if(c) + if(c){ *c=0; - else{ + if(c[1]){ + msg="Garbage after ]"; + break; + } + }else{ msg="Missing ]"; break; } - }else if(*c=='<'){ - if(!cf_subread(c+1,level+1)){ - msg=""; - break; - } - }else{ byte *sect,*name,*value; name=c; - c=strpbrk(c," \t"); - while(c && *c && isspace(*c)) + while(*c && !Cspace(*c)) + c++; + while(*c && Cspace(*c)) *c++=0; - if(!c || !*c){ - msg="Missing argument"; - break; - } value=c; - c=strchr(name,'.'); - if(!c) - sect=def_section; - else{ - sect=name; - *c++=0; - name=c; - } + if(!strcasecmp(name,"include")){ + if(!cf_subread(value,level+1)){ + msg="Included from here"; + break; + } + }else{ + c=strchr(name,'.'); + if(!c) + sect=def_section; + else{ + sect=name; + *c++=0; + name=c; + } - msg=cf_set_item(sect,name,value); + msg=cf_set_item(sect,name,value); + } if(msg) break; } @@ -166,40 +201,20 @@ static int cf_subread(byte *filename,int level) } /* for every line */ if(msg) - log("%s, line %d: %s",filename,line,msg); + log(L_ERROR,"%s, line %d: %s",filename,line,msg); bclose(b); return !msg; } -int cf_read(byte *filename) -{ - return cf_subread(filename,0); -} - -void cf_read_err(byte *filename) +void cf_read(byte *filename) { - if(!cf_read(filename)) + if(!cf_subread(filename,0)) die("Reading config file %s failed",filename); } -void cf_register_opts(byte *so,struct option *lo) -{ - int l; - - l=strlen(so); - if(shortlen+l>=MAX_SHORT_OPTS) - die("Too many short options %d",shortlen+l); - strcat(shortopts,so); - - l=longlen; - while(lo->name){ - if(l>=MAX_LONG_OPTS) - die("Too many long options %d",l); - longopts[l++]=*lo++; - } -} - -int cf_getopt(int argc,char * const argv[], int *longindex) +int cf_getopt(int argc,char * const argv[], + const char *shortopts,const struct option *longopts, + int *longindex) { int res; @@ -210,7 +225,6 @@ int cf_getopt(int argc,char * const argv[], int *longindex) byte *c; byte *msg=NULL; - name=optarg; c=strchr(name,'='); if(!c){ @@ -235,12 +249,10 @@ int cf_getopt(int argc,char * const argv[], int *longindex) die("Invalid command line argument %s.%s=%s: %s",sect,name,value,msg); }else if(res=='C'){ - cf_read_err(optarg); - + cf_read(optarg); }else{ /* unhandled option */ return res; } - }while(1); }