From 4bff1b5ebcffc1488649199b88d3602184edf7f3 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sun, 24 Jun 2012 23:58:37 +0200 Subject: fix env var handling, add support for filling blobmsg_list from arrays --- instance.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'instance.c') diff --git a/instance.c b/instance.c index cc839d7..c70fff6 100644 --- a/instance.c +++ b/instance.c @@ -30,7 +30,7 @@ instance_run(struct service_instance *in) argc++; blobmsg_list_for_each(&in->env, var) - putenv(blobmsg_data(var->data)); + setenv(blobmsg_name(var->data), blobmsg_data(var->data), 1); argv = alloca(sizeof(char *) * argc); argc = 0; @@ -149,13 +149,13 @@ instance_config_parse(struct service_instance *in) if ((cur = tb[INSTANCE_ATTR_ENV])) { if (!blobmsg_check_attr_list(cur, BLOBMSG_TYPE_STRING)) return false; - blobmsg_list_fill(&in->env, blobmsg_data(cur), blobmsg_data_len(cur)); + blobmsg_list_fill(&in->env, blobmsg_data(cur), blobmsg_data_len(cur), false); } if ((cur = tb[INSTANCE_ATTR_DATA])) { if (!blobmsg_check_attr_list(cur, BLOBMSG_TYPE_STRING)) return false; - blobmsg_list_fill(&in->data, blobmsg_data(cur), blobmsg_data_len(cur)); + blobmsg_list_fill(&in->data, blobmsg_data(cur), blobmsg_data_len(cur), false); } return true; -- cgit v1.2.3