Skip to content

L
lxc
Commit af06a4bf by Daniel Lezcano Committed by Daniel Lezcano
Options

use the lxc arguments dup in lxc_execute

Now we have a helper to dup the arguments, let's use it. The code gains in clarity. Signed-off-by: 's avatarDaniel Lezcano <dlezcano@fr.ibm.com>
parent fa7eddbb
Showing with 2 additions and 27 deletions
src/lxc/lxc_execute.c
...@@ -79,8 +79,6 @@ int main(int argc, char *argv[]) ...@@ -79,8 +79,6 @@ int main(int argc, char *argv[])
{ {
static char **args; static char **args;
char path[MAXPATHLEN]; char path[MAXPATHLEN];
int opt;
int nbargs = 0;
int autodestroy = 0; int autodestroy = 0;
int ret = -1; int ret = -1;
struct lxc_conf lxc_conf; struct lxc_conf lxc_conf;
...@@ -105,32 +103,9 @@ int main(int argc, char *argv[]) ...@@ -105,32 +103,9 @@ int main(int argc, char *argv[])
autodestroy = 1; autodestroy = 1;
} }
args = alloca((my_args.argc + 3)*sizeof(*args)); args = lxc_arguments_dup(LXCLIBEXECDIR "/lxc-init", &my_args);
if (!args) { if (!args)
ERROR("failed to allocate memory for '%s'", my_args.name);
goto out; goto out;
}
nbargs = 0;
args[nbargs++] = LXCLIBEXECDIR "/lxc-init";
if (my_args.log_file) {
args[nbargs++] = "--logfile";
args[nbargs++] = strdupa(my_args.log_file);
}
if (my_args.log_priority) {
args[nbargs++] = "--logpriority";
args[nbargs++] = strdupa(my_args.log_priority);
}
if (my_args.quiet) {
args[nbargs++] = "--quiet";
}
args[nbargs++] = "--";
for (opt = 0; opt < my_args.argc; opt++)
args[nbargs++] = strdupa(my_args.argv[opt]);
args[nbargs] = '\0';
ret = lxc_start(my_args.name, args); ret = lxc_start(my_args.name, args);
out: out:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment