vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

conmon: Add add_argv() helper

Browse source 
This makes adding the arguments to runtime_argv somewhat nicer.

Signed-off-by: Alexander Larsson <alexl@redhat.com>
This commit is contained in:
Alexander Larsson 2017-06-22 11:30:19 +02:00
parent 6aa1075ab6
commit 215ef485df
1 changed files with 41 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
conmon/conmon.c
View file

@ -459,6 +459,24 @@ static int get_pipe_fd_from_env(const char *envname)
return pipe_fd; return pipe_fd;
} }
static void add_argv(GPtrArray *argv_array, ...) G_GNUC_NULL_TERMINATED;
static void add_argv(GPtrArray *argv_array, ...)
{
va_list args;
char *arg;
va_start (args, argv_array);
while ((arg = va_arg (args, char *)))
g_ptr_array_add (argv_array, arg);
va_end (args);
}
static void end_argv(GPtrArray *argv_array)
{
g_ptr_array_add(argv_array, NULL);
}
/* Global state */ /* Global state */
static int runtime_status = -1; static int runtime_status = -1;
@ -977,39 +995,45 @@ int main(int argc, char *argv[])
slavefd_stderr = fds[1]; slavefd_stderr = fds[1];
runtime_argv = g_ptr_array_new(); runtime_argv = g_ptr_array_new();
g_ptr_array_add(runtime_argv, opt_runtime_path); add_argv(runtime_argv,
opt_runtime_path,
NULL);
/* Generate the cmdline. */ /* Generate the cmdline. */
if (!opt_exec && opt_systemd_cgroup) if (!opt_exec && opt_systemd_cgroup)
g_ptr_array_add(runtime_argv, "--systemd-cgroup"); add_argv(runtime_argv,
"--systemd-cgroup",
NULL);
if (opt_exec) { if (opt_exec) {
g_ptr_array_add (runtime_argv, "exec"); add_argv(runtime_argv,
g_ptr_array_add (runtime_argv, "-d"); "exec", "-d",
g_ptr_array_add (runtime_argv, "--pid-file"); "--pid-file", opt_pid_file,
g_ptr_array_add (runtime_argv, opt_pid_file); NULL);
} else { } else {
g_ptr_array_add (runtime_argv, "create"); add_argv(runtime_argv,
g_ptr_array_add (runtime_argv, "--bundle"); "create",
g_ptr_array_add (runtime_argv, opt_bundle_path); "--bundle", opt_bundle_path,
g_ptr_array_add (runtime_argv, "--pid-file"); "--pid-file", opt_pid_file,
g_ptr_array_add (runtime_argv, opt_pid_file); NULL);
} }
if (opt_terminal) { if (opt_terminal) {
g_ptr_array_add(runtime_argv, "--console-socket"); add_argv(runtime_argv,
g_ptr_array_add(runtime_argv, csname); "--console-socket", csname,
NULL);
} }
/* Set the exec arguments. */ /* Set the exec arguments. */
if (opt_exec) { if (opt_exec) {
g_ptr_array_add(runtime_argv, "--process"); add_argv(runtime_argv,
g_ptr_array_add(runtime_argv, opt_exec_process_spec); "--process", opt_exec_process_spec,
NULL);
} }
/* Container name comes last. */ /* Container name comes last. */
g_ptr_array_add(runtime_argv, opt_cid); add_argv(runtime_argv, opt_cid, NULL);
g_ptr_array_add(runtime_argv, NULL); end_argv(runtime_argv);
/* /*
* We have to fork here because the current runC API dups the stdio of the * We have to fork here because the current runC API dups the stdio of the