From: Daniel Lezcano <daniel.lezcano@free.fr>
Date: Wed, 15 Jul 2009 21:48:22 +0000 (+0200)
Subject: use the lxc arguments dup in lxc_execute
X-Git-Tag: lxc-2.1.1~3211
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=af06a4bf9447a52c86c5578be7ef0e52bad54044;p=mirror_lxc.git

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: Daniel Lezcano <dlezcano@fr.ibm.com>
---

diff --git a/src/lxc/lxc_execute.c b/src/lxc/lxc_execute.c
index 26092bb28..a43d435c8 100644
--- a/src/lxc/lxc_execute.c
+++ b/src/lxc/lxc_execute.c
@@ -79,8 +79,6 @@ int main(int argc, char *argv[])
 {
 	static char **args;
 	char path[MAXPATHLEN];
-	int opt;
-	int nbargs = 0;
 	int autodestroy = 0;
 	int ret = -1;
 	struct lxc_conf lxc_conf;
@@ -105,32 +103,9 @@ int main(int argc, char *argv[])
 		autodestroy = 1;
 	}
 
-	args = alloca((my_args.argc + 3)*sizeof(*args));
-	if (!args) {
-		ERROR("failed to allocate memory for '%s'", my_args.name);
+	args = lxc_arguments_dup(LXCLIBEXECDIR "/lxc-init", &my_args);
+	if (!args)
 		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);
 out: