X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=gconfig.c;h=b7107aa652213a58af500c9c08f1f15314c78608;hb=a21be6733bfe23998f3aaec00d87d35fe0f1aefa;hp=b780e8b2ea52d8da389b5844f6f8511659c68768;hpb=32fae31fc36459230af5b156cc4e20b1b59bffa4;p=radsecproxy.git diff --git a/gconfig.c b/gconfig.c index b780e8b..b7107aa 100644 --- a/gconfig.c +++ b/gconfig.c @@ -10,8 +10,10 @@ #include #include #include +#include #include #include +#include #include #include #include "debug.h" @@ -85,7 +87,7 @@ FILE *pushgconffile(struct gconffile **cf, FILE *file, const char *description) desc = stringcopy(description, 0); if (!desc) goto errmalloc; - + if (!*cf) { newcf = malloc(sizeof(struct gconffile) * 2); if (!newcf) @@ -103,8 +105,8 @@ FILE *pushgconffile(struct gconffile **cf, FILE *file, const char *description) newcf[0].path = desc; *cf = newcf; return file; - - errmalloc: + +errmalloc: free(desc); fclose(file); debug(DBG_ERR, "malloc failed"); @@ -123,7 +125,7 @@ FILE *pushgconfpaths(struct gconffile **cf, const char *cfgpath) { FILE *f = NULL; glob_t globbuf; char *path, *curfile = NULL, *dir; - + /* if cfgpath is relative, make it relative to current config */ if (*cfgpath == '/') path = (char *)cfgpath; @@ -146,7 +148,7 @@ FILE *pushgconfpaths(struct gconffile **cf, const char *cfgpath) { } memset(&globbuf, 0, sizeof(glob_t)); if (glob(path, 0, NULL, &globbuf)) { - debug(DBG_INFO, "could not glob %s", path); + debug(DBG_WARN, "could not glob %s", path); goto exit; } @@ -154,10 +156,10 @@ FILE *pushgconfpaths(struct gconffile **cf, const char *cfgpath) { f = pushgconfpath(cf, globbuf.gl_pathv[i]); if (!f) break; - } + } globfree(&globbuf); - exit: +exit: if (curfile) { free(curfile); free(path); @@ -187,12 +189,22 @@ int popgconf(struct gconffile **cf) { return 1; } +void freegconfmstr(char **mstr) { + int i; + + if (mstr) { + for (i = 0; mstr[i]; i++) + free(mstr[i]); + free(mstr); + } +} + void freegconf(struct gconffile **cf) { int i; if (!*cf) return; - + for (i = 0; (*cf)[i].data || (*cf)[i].path; i++) { if ((*cf)[i].file) { fclose((*cf)[i].file); @@ -230,10 +242,10 @@ struct gconffile *openconfigfile(const char *file) { int getlinefromcf(struct gconffile *cf, char *line, const size_t size) { size_t i, pos; - + if (!cf) return 0; - + if (cf->file) return fgets(line, size, cf->file) ? 1 : 0; else if (cf->data) { @@ -257,11 +269,11 @@ int getconfigline(struct gconffile **cf, char *block, char **opt, char **val, in char line[1024]; char *tokens[3], *s; int tcount; - + *opt = NULL; *val = NULL; *conftype = 0; - + if (!cf || !*cf || (!(*cf)->file && !(*cf)->data)) return 1; @@ -292,7 +304,7 @@ int getconfigline(struct gconffile **cf, char *block, char **opt, char **val, in } break; } - + switch (tcount) { case 2: *opt = stringcopy(tokens[0], 0); @@ -335,13 +347,13 @@ int getconfigline(struct gconffile **cf, char *block, char **opt, char **val, in if (**val) return 1; - + debug(DBG_ERR, "configuration error, option %s needs a non-empty value", *opt); goto errexit; - errmalloc: +errmalloc: debug(DBG_ERR, "malloc failed"); - errexit: +errexit: free(*opt); *opt = NULL; free(*val); @@ -349,14 +361,39 @@ int getconfigline(struct gconffile **cf, char *block, char **opt, char **val, in return 0; } +uint8_t hexdigit2int(char d) { + if (d >= '0' && d <= '9') + return d - '0'; + if (d >= 'a' && d <= 'f') + return 10 + d - 'a'; + if (d >= 'A' && d <= 'F') + return 10 + d - 'A'; + return 0; +} + +void unhex(char *s) { + char *t; + for (t = s; *t; s++) { + if (*t == '%' && isxdigit((int)t[1]) && isxdigit((int)t[2])) { + *s = 16 * hexdigit2int(t[1]) + hexdigit2int(t[2]); + t += 3; + } else + *s = *t++; + } + *s = '\0'; +} + +typedef int (*t_fptr)(struct gconffile **, void *, char *, char *, char *); + /* returns 1 if ok, 0 on error */ /* caller must free returned values also on error */ int getgenericconfig(struct gconffile **cf, char *block, ...) { va_list ap; - char *opt = NULL, *val, *word, *optval, **str = NULL, ***mstr = NULL, **newmstr; + char *opt = NULL, *val, *word, *optval, **str = NULL, ***mstr = NULL, **newmstr, *endptr; uint8_t *bln = NULL; + long int *lint = NULL; int type = 0, conftype = 0, n; - int (*cbk)(struct gconffile **, void *, char *, char *, char *) = NULL; + t_fptr cbk = NULL; void *cbkarg = NULL; for (;;) { @@ -374,7 +411,7 @@ int getgenericconfig(struct gconffile **cf, char *block, ...) { free(val); continue; } - + va_start(ap, block); while ((word = va_arg(ap, char *))) { type = va_arg(ap, int); @@ -394,8 +431,13 @@ int getgenericconfig(struct gconffile **cf, char *block, ...) { if (!bln) goto errparam; break; + case CONF_LINT: + lint = va_arg(ap, long int *); + if (!lint) + goto errparam; + break; case CONF_CBK: - cbk = va_arg(ap, int (*)(struct gconffile **, void *, char *, char *, char *)); + cbk = va_arg(ap, t_fptr); if (!cbk) goto errparam; cbkarg = va_arg(ap, void *); @@ -407,7 +449,7 @@ int getgenericconfig(struct gconffile **cf, char *block, ...) { break; } va_end(ap); - + if (!word) { if (block) debug(DBG_ERR, "configuration error in block %s, unknown option %s", block, opt); @@ -415,7 +457,7 @@ int getgenericconfig(struct gconffile **cf, char *block, ...) { goto errexit; } - if (((type == CONF_STR || type == CONF_MSTR || type == CONF_BLN) && conftype != CONF_STR) || + if (((type == CONF_STR || type == CONF_MSTR || type == CONF_BLN || type == CONF_LINT) && conftype != CONF_STR) || (type == CONF_CBK && conftype != CONF_CBK)) { if (block) debug(DBG_ERR, "configuration error in block %s, wrong syntax for option %s", block, opt); @@ -429,6 +471,7 @@ int getgenericconfig(struct gconffile **cf, char *block, ...) { debug(DBG_ERR, "configuration error, option %s already set to %s", opt, *str); goto errexit; } + unhex(val); *str = val; break; case CONF_MSTR: @@ -441,6 +484,7 @@ int getgenericconfig(struct gconffile **cf, char *block, ...) { debug(DBG_ERR, "malloc failed"); goto errexit; } + unhex(val); newmstr[n] = val; newmstr[n + 1] = NULL; *mstr = newmstr; @@ -458,6 +502,17 @@ int getgenericconfig(struct gconffile **cf, char *block, ...) { goto errexit; } break; + case CONF_LINT: + endptr = NULL; + *lint = strtol(val, &endptr, 0); + if (*lint == LONG_MIN || *lint == LONG_MAX || !endptr || endptr == val || *endptr != '\0') { + if (block) + debug(DBG_ERR, "configuration error in block %s, value for option %s must be an integer, not %s", block, opt, val); + else + debug(DBG_ERR, "configuration error, value for option %s must be an integer, not %s", opt, val); + goto errexit; + } + break; case CONF_CBK: optval = malloc(strlen(opt) + strlen(val) + 2); if (!optval) { @@ -477,16 +532,20 @@ int getgenericconfig(struct gconffile **cf, char *block, ...) { } if (block) debug(DBG_DBG, "getgenericconfig: block %s: %s = %s", block, opt, val); - else + else debug(DBG_DBG, "getgenericconfig: %s = %s", opt, val); - if (type == CONF_BLN) + if (type == CONF_BLN || type == CONF_LINT) free(val); } - errparam: +errparam: debug(DBG_ERR, "getgenericconfig: internal parameter error"); - errexit: +errexit: free(opt); free(val); return 0; } + +/* Local Variables: */ +/* c-file-style: "stroustrup" */ +/* End: */