proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-09 11:20:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

conf: s/argsin/argv/ in run_script_argv()

Browse Source 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
Christian Brauner 2018-02-16 22:11:19 +01:00
parent 6f8d00d279
commit 586b1ce72b
No known key found for this signature in database
GPG Key ID: 8EB056D53EECB12D
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/lxc/conf.c
View File

@ -354,7 +354,7 @@ static int run_buffer(char *buffer)
int run_script_argv(const char *name, unsigned int hook_version, int run_script_argv(const char *name, unsigned int hook_version,
const char *section, const char *script, const char *section, const char *script,
const char *hookname, char **argsin) const char *hookname, char **argv)
{ {
int buf_pos, i, ret; int buf_pos, i, ret;
char *buffer; char *buffer;
@ -367,8 +367,8 @@ int run_script_argv(const char *name, unsigned int hook_version,
else else
INFO("Executing script \"%s\" for container \"%s\"", script, name); INFO("Executing script \"%s\" for container \"%s\"", script, name);
for (i = 0; argsin && argsin[i]; i++) for (i = 0; argv && argv[i]; i++)
size += strlen(argsin[i]) + 1; size += strlen(argv[i]) + 1;
size += sizeof("exec"); size += sizeof("exec");
size += strlen(script); size += strlen(script);
@ -424,20 +424,20 @@ int run_script_argv(const char *name, unsigned int hook_version,
if (strcmp(section, "net") == 0) { if (strcmp(section, "net") == 0) {
char *parent; char *parent;
if (!argsin[0]) if (!argv || !argv[0])
goto on_error; goto on_error;
ret = setenv("LXC_NET_TYPE", argsin[0], 1); ret = setenv("LXC_NET_TYPE", argv[0], 1);
if (ret < 0) { if (ret < 0) {
SYSERROR("Failed to set environment variable: " SYSERROR("Failed to set environment variable: "
"LXC_NET_TYPE=%s", argsin[0]); "LXC_NET_TYPE=%s", argv[0]);
goto on_error; goto on_error;
} }
TRACE("Set environment variable: LXC_NET_TYPE=%s", argsin[0]); TRACE("Set environment variable: LXC_NET_TYPE=%s", argv[0]);
parent = argsin[1] ? argsin[1] : ""; parent = argv[1] ? argv[1] : "";
if (strcmp(argsin[0], "macvlan")) { if (strcmp(argv[0], "macvlan")) {
ret = setenv("LXC_NET_PARENT", parent, 1); ret = setenv("LXC_NET_PARENT", parent, 1);
if (ret < 0) { if (ret < 0) {
SYSERROR("Failed to set environment " SYSERROR("Failed to set environment "
@ -445,7 +445,7 @@ int run_script_argv(const char *name, unsigned int hook_version,
goto on_error; goto on_error;
} }
TRACE("Set environment variable: LXC_NET_PARENT=%s", parent); TRACE("Set environment variable: LXC_NET_PARENT=%s", parent);
} else if (strcmp(argsin[0], "phys")) { } else if (strcmp(argv[0], "phys")) {
ret = setenv("LXC_NET_PARENT", parent, 1); ret = setenv("LXC_NET_PARENT", parent, 1);
if (ret < 0) { if (ret < 0) {
SYSERROR("Failed to set environment " SYSERROR("Failed to set environment "
@ -453,8 +453,8 @@ int run_script_argv(const char *name, unsigned int hook_version,
goto on_error; goto on_error;
} }
TRACE("Set environment variable: LXC_NET_PARENT=%s", parent); TRACE("Set environment variable: LXC_NET_PARENT=%s", parent);
} else if (strcmp(argsin[0], "veth")) { } else if (strcmp(argv[0], "veth")) {
char *peer = argsin[2] ? argsin[2] : ""; char *peer = argv[2] ? argv[2] : "";
ret = setenv("LXC_NET_PEER", peer, 1); ret = setenv("LXC_NET_PEER", peer, 1);
if (ret < 0) { if (ret < 0) {
@ -475,10 +475,10 @@ int run_script_argv(const char *name, unsigned int hook_version,
} }
} }
for (i = 0; argsin && argsin[i]; i++) { for (i = 0; argv && argv[i]; i++) {
size_t len = size - buf_pos; size_t len = size - buf_pos;
ret = snprintf(buffer + buf_pos, len, " %s", argsin[i]); ret = snprintf(buffer + buf_pos, len, " %s", argv[i]);
if (ret < 0 || (size_t)ret >= len) { if (ret < 0 || (size_t)ret >= len) {
ERROR("Failed to create command line for script \"%s\"", script); ERROR("Failed to create command line for script \"%s\"", script);
goto on_error; goto on_error;