From: David Ward <david.ward@ll.mit.edu>
Date: Thu, 3 May 2012 22:50:15 +0000 (+0200)
Subject: lxc-attach: use execvp instead of execve
X-Git-Tag: lxc-0.8.0~69
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=631c07d49cb666f46990d83210d5ac916a700f21;p=thirdparty%2Flxc.git

lxc-attach: use execvp instead of execve

execvp does not require specifying the full path to the executable
(e.g., "ls" instead of "/bin/ls"), making the operation of 'lxc-attach'
consistent with 'lxc-start' and 'lxc-execute'.

Signed-off-by: David Ward <david.ward@ll.mit.edu>
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
---

diff --git a/src/lxc/lxc_attach.c b/src/lxc/lxc_attach.c
index 3571b09b3..4883327bd 100644
--- a/src/lxc/lxc_attach.c
+++ b/src/lxc/lxc_attach.c
@@ -89,7 +89,7 @@ Options :\n\
 	.checker  = NULL,
 };
 
-int main(int argc, char *argv[], char *envp[])
+int main(int argc, char *argv[])
 {
 	int ret;
 	pid_t pid, init_pid;
@@ -212,7 +212,7 @@ int main(int argc, char *argv[], char *envp[])
 		lxc_sync_fini(handler);
 
 		if (my_args.argc) {
-			execve(my_args.argv[0], my_args.argv, envp);
+			execvp(my_args.argv[0], my_args.argv);
 			SYSERROR("failed to exec '%s'", my_args.argv[0]);
 			return -1;
 		}
@@ -232,7 +232,7 @@ int main(int argc, char *argv[], char *envp[])
 				NULL,
 			};
 
-			execve(args[0], args, envp);
+			execvp(args[0], args);
 			SYSERROR("failed to exec '%s'", args[0]);
 			return -1;
 		}