* 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"
static struct cfitem *cfsection;
static struct mempool *cfpool;
-static byte *cfdeffile = NULL;
+byte *cfdeffile = DEFAULT_CONFIG;
static void CONSTRUCTOR
conf_init(void)
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;
}
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;
}
struct cfitem *cf_get_item(byte *sect, byte *name)
{
- struct cfitem *item;
+ struct cfitem *item, *section;
item=cfsection;
while(item && strcasecmp(item->name,sect))
item=item->var;
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 */
}
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;
cfdeffile = NULL;
}
-void
-cf_default_init(byte *filename)
-{
- cfdeffile = filename;
-}
-
-void cf_default_done(void)
-{
- if (cfdeffile)
- cf_read(cfdeffile);
-}
-
int cf_getopt(int argc,char * const argv[],
const char *shortopts,const struct option *longopts,
int *longindex)
}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);
}
-