diff options
author | Lennart Poettering <lennart@poettering.net> | 2010-04-21 22:15:06 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2010-04-21 22:15:06 +0200 |
commit | 15ae422b7471cf6f41ccf450243d8afd8ea0a054 (patch) | |
tree | 4d44b599571defe496890db757dfe987942594bd /conf-parser.c | |
parent | 020379a7f7d2cca3ab37942db3d67d06c45083fe (diff) |
execute: support basic filesystem namespacing
Diffstat (limited to 'conf-parser.c')
-rw-r--r-- | conf-parser.c | 66 |
1 files changed, 65 insertions, 1 deletions
diff --git a/conf-parser.c b/conf-parser.c index 2cf90f2def..6994211b10 100644 --- a/conf-parser.c +++ b/conf-parser.c @@ -329,7 +329,7 @@ int config_parse_path( assert(rvalue); assert(data); - if (*rvalue != '/') { + if (!path_is_absolute(rvalue)) { log_error("[%s:%u] Not an absolute path: %s", filename, line, rvalue); return -EINVAL; } @@ -394,3 +394,67 @@ fail: return -ENOMEM; } + +int config_parse_path_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; + int r; + + assert(filename); + assert(lvalue); + assert(rvalue); + assert(data); + + k = strv_length(*sv); + FOREACH_WORD_QUOTED(w, l, rvalue, state) + k++; + + if (!(n = new(char*, k+1))) + return -ENOMEM; + + k = 0; + if (*sv) + for (; (*sv)[k]; k++) + n[k] = (*sv)[k]; + + FOREACH_WORD_QUOTED(w, l, rvalue, state) { + if (!(n[k] = strndup(w, l))) { + r = -ENOMEM; + goto fail; + } + + if (!path_is_absolute(n[k])) { + log_error("[%s:%u] Not an absolute path: %s", filename, line, rvalue); + r = -EINVAL; + goto fail; + } + + k++; + } + + n[k] = NULL; + free(*sv); + *sv = n; + + return 0; + +fail: + free(n[k]); + for (; k > 0; k--) + free(n[k-1]); + free(n); + + return r; +} |