diff options
| -rw-r--r-- | conf-parser.c | 49 | ||||
| -rw-r--r-- | conf-parser.h | 1 |
2 files changed, 50 insertions, 0 deletions
diff --git a/conf-parser.c b/conf-parser.c index c45acd7702..e50597491b 100644 --- a/conf-parser.c +++ b/conf-parser.c @@ -9,6 +9,7 @@ #include "conf-parser.h" #include "util.h" #include "macro.h" +#include "strv.h" #define WHITESPACE " \t\n" #define COMMENTS "#;\n" @@ -319,3 +320,51 @@ int config_parse_string( return 0; } + + +int config_parse_strv( + const char *filename, + unsigned line, + const char *section, + const char *lvalue, + const char *rvalue, + void *data, + void *userdata) { + + char*** sv = data; + char **n; + char *w; + unsigned k; + size_t l; + char *state; + + assert(filename); + assert(lvalue); + assert(rvalue); + assert(data); + + k = strv_length(*sv); + FOREACH_WORD(w, &l, rvalue, state) + k++; + + if (!(n = new(char*, k+1))) + return -ENOMEM; + + for (k = 0; (*sv)[k]; k++) + n[k] = (*sv)[k]; + FOREACH_WORD(w, &l, rvalue, state) + if (!(n[k++] = strndup(w, l))) + goto fail; + + n[k] = NULL; + free(*sv); + *sv = n; + + return 0; + +fail: + for (; k > 0; k--) + free(n[k-1]); + + return -ENOMEM; +} diff --git a/conf-parser.h b/conf-parser.h index 11f537918f..8eb0635f80 100644 --- a/conf-parser.h +++ b/conf-parser.h @@ -29,5 +29,6 @@ int config_parse_unsigned(const char *filename, unsigned line, const char *secti int config_parse_size(const char *filename, unsigned line, const char *section, const char *lvalue, const char *rvalue, void *data, void *userdata); int config_parse_bool(const char *filename, unsigned line, const char *section, const char *lvalue, const char *rvalue, void *data, void *userdata); int config_parse_string(const char *filename, unsigned line, const char *section, const char *lvalue, const char *rvalue, void *data, void *userdata); +int config_parse_strv(const char *filename, unsigned line, const char *section, const char *lvalue, const char *rvalue, void *data, void *userdata); #endif |