Unverified Commit 2806a87d by Rachid Koucha Committed by GitHub

Move code/variable in smaller scope

In start.c, do not fill path[] table if not necessary Signed-off-by: 's avatarRachid Koucha <rachid.koucha@gmail.com>
parent 9752e3a9
...@@ -1132,7 +1132,6 @@ static int do_start(void *data) ...@@ -1132,7 +1132,6 @@ static int do_start(void *data)
ATTR_UNUSED __do_close_prot_errno int data_sock0 = handler->data_sock[0], ATTR_UNUSED __do_close_prot_errno int data_sock0 = handler->data_sock[0],
data_sock1 = handler->data_sock[1]; data_sock1 = handler->data_sock[1];
int ret; int ret;
char path[PATH_MAX];
uid_t new_uid; uid_t new_uid;
gid_t new_gid; gid_t new_gid;
struct lxc_list *iterator; struct lxc_list *iterator;
...@@ -1239,11 +1238,6 @@ static int do_start(void *data) ...@@ -1239,11 +1238,6 @@ static int do_start(void *data)
goto out_warn_father; goto out_warn_father;
} }
ret = snprintf(path, sizeof(path), "%s/dev/null",
handler->conf->rootfs.mount);
if (ret < 0 || ret >= sizeof(path))
goto out_warn_father;
/* In order to checkpoint restore, we need to have everything in the /* In order to checkpoint restore, we need to have everything in the
* same mount namespace. However, some containers may not have a * same mount namespace. However, some containers may not have a
* reasonable /dev (in particular, they may not have /dev/null), so we * reasonable /dev (in particular, they may not have /dev/null), so we
...@@ -1255,6 +1249,13 @@ static int do_start(void *data) ...@@ -1255,6 +1249,13 @@ static int do_start(void *data)
* where it isn't wanted. * where it isn't wanted.
*/ */
if (handler->daemonize && !handler->conf->autodev) { if (handler->daemonize && !handler->conf->autodev) {
char path[PATH_MAX];
ret = snprintf(path, sizeof(path), "%s/dev/null",
handler->conf->rootfs.mount);
if (ret < 0 || ret >= sizeof(path))
goto out_warn_father;
ret = access(path, F_OK); ret = access(path, F_OK);
if (ret != 0) { if (ret != 0) {
devnull_fd = open_devnull(); devnull_fd = open_devnull();
......
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