/*
- * Sherlock Library -- Reading of configuration files
+ * UCW Library -- Reading of configuration files
*
* (c) 2001 Robert Spalek <robert@ucw.cz>
- * (c) 2003 Martin Mares <mj@ucw.cz>
+ * (c) 2003--2005 Martin Mares <mj@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"
#include "lib/chartype.h"
#include "lib/fastbuf.h"
-#include "lib/pools.h"
+#include "lib/mempool.h"
#include "lib/conf.h"
static struct cfitem *cfsection;
struct mempool *cfpool;
+#ifndef DEFAULT_CONFIG
+#define DEFAULT_CONFIG NULL
+#endif
+
byte *cfdeffile = DEFAULT_CONFIG;
static void CONSTRUCTOR
return mp_alloc(cfpool, size);
}
+void *
+cfg_malloc_zero(uns size)
+{
+ return mp_alloc_zero(cfpool, size);
+}
+
byte *
-cfg_stralloc(byte *s)
+cfg_strdup(byte *s)
{
- uns l = strlen(s);
- byte *k = cfg_malloc(l + 1);
- strcpy(k, s);
- return k;
+ return mp_strdup(cfpool, s);
+}
+
+byte *
+cfg_printf(char *fmt, ...)
+{
+ va_list args;
+ va_start(args, fmt);
+ byte *res = mp_vprintf(cfpool, fmt, args);
+ va_end(args);
+ return res;
}
void cf_register(struct cfitem *items)
{ 0, 0, 0 }
};
+#if 0
static const struct unit *cf_lookup_unit(byte *value, byte *end, char **msg)
{
if (end && *end) {
return msg;
}
+byte *
+cf_parse_ip(byte **p, u32 *varp)
+{
+ while (Cspace(**p))
+ (*p)++;
+ if (!**p)
+ return "Missing IP address";
+ uns x = 0;
+ if (**p == '0' && *(*p + 1) | 32 == 'X')
+ {
+ errno = 0;
+ x = strtoul(*p + 2, (char **)p, 16);
+ if (errno == ERANGE || x > 0xffffffff)
+ goto error;
+ }
+ else
+ for (uns i = 0; i < 4; i++)
+ {
+ if (i)
+ {
+ while (Cspace(**p))
+ (*p)++;
+ if (*(*p)++ != '.')
+ goto error;
+ }
+ while (Cspace(**p))
+ (*p)++;
+ errno = 0;
+ uns y = strtoul(*p, (char **)p, 10);
+ if (errno == ERANGE || y > 255)
+ goto error;
+ x = (x << 8) + y;
+ }
+ *varp = x;
+ return NULL;
+error:
+ return "Invalid IP address";
+}
+#endif
+
byte *cf_set_item(byte *sect, byte *name, byte *value)
{
struct cfitem *item;
msg = cf_parse_int(value, (uns *) item->var);
break;
case CT_STRING:
- *((byte **) item->var) = cfg_stralloc(value);
+ *((byte **) item->var) = cfg_strdup(value);
break;
case CT_FUNCTION:
- msg = ((ci_func) item->var)(item, cfg_stralloc(value));
+ msg = ((ci_func) item->var)(item, cfg_strdup(value));
break;
case CT_DOUBLE:
msg = cf_parse_double(value, (double *) item->var);
cfdeffile = NULL;
}
+static void cf_opt_S(void)
+{
+ byte *sect,*name,*value;
+ byte *c;
+ byte *msg=NULL;
+ byte arg[strlen(optarg)+1];
+
+ strcpy(arg, optarg);
+ name = arg;
+ c=strchr(name,'=');
+ if(!c){
+ msg="Missing argument";
+ sect=value="";
+ }else{
+ *c++=0;
+ value=c;
+
+ c=strchr(name,'.');
+ if(!c)
+ sect="";
+ else{
+ sect=name;
+ *c++=0;
+ name=c;
+ }
+
+ if (cfdeffile)
+ cf_read(cfdeffile);
+ msg=cf_set_item(sect,name,value);
+ }
+ if(msg)
+ die("Invalid command line argument -S%s.%s=%s: %s",sect,name,value,msg);
+
+}
+
int cf_getopt(int argc,char * const argv[],
const char *shortopts,const struct option *longopts,
int *longindex)
{
int res;
+ static int other_options;
do{
res=getopt_long(argc,argv,shortopts,longopts,longindex);
+ if(res == 'S' || res == 'C') {
+ if(other_options)
+ die("The -S and -C options must precede all other arguments");
+ }
if(res=='S'){
- byte *sect,*name,*value;
- byte *c;
- byte *msg=NULL;
-
- name=optarg;
- c=strchr(name,'=');
- if(!c){
- msg="Missing argument";
- sect=value="";
- }else{
- *c++=0;
- value=c;
-
- c=strchr(name,'.');
- if(!c)
- sect="";
- else{
- sect=name;
- *c++=0;
- name=c;
- }
-
- if (cfdeffile)
- cf_read(cfdeffile);
- msg=cf_set_item(sect,name,value);
- }
- if(msg)
- die("Invalid command line argument %s.%s=%s: %s",sect,name,value,msg);
-
+ cf_opt_S();
}else if(res=='C'){
cf_read(optarg);
}else{
/* unhandled option or end of options */
if(cfdeffile)
cf_read(cfdeffile);
+ other_options++;
return res;
}
}while(1);